Use <chrono> for platform-independent timing and remove ElapsedTime.

Also use #if for painting measurement as there are 7 sections of code to enable.

3 files changed, 20 insertions, 64 deletions

diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx
index 4f7d59562..ec215bb38 100644
--- a/win32/PlatWin.cxx
+++ b/win32/PlatWin.cxx
@@ -2901,54 +2901,6 @@ void Menu::Show(Point pt, Window &w) {
 	Destroy();
 }
 
-static bool initialisedET = false;
-static bool usePerformanceCounter = false;
-static LARGE_INTEGER frequency;
-
-ElapsedTime::ElapsedTime() {
-	if (!initialisedET) {
-		usePerformanceCounter = ::QueryPerformanceFrequency(&frequency) != 0;
-		initialisedET = true;
-	}
-	if (usePerformanceCounter) {
-		LARGE_INTEGER timeVal;
-		::QueryPerformanceCounter(&timeVal);
-		bigBit = timeVal.HighPart;
-		littleBit = timeVal.LowPart;
-	} else {
-		bigBit = clock();
-		littleBit = 0;
-	}
-}
-
-double ElapsedTime::Duration(bool reset) {
-	double result;
-	long endBigBit;
-	long endLittleBit;
-
-	if (usePerformanceCounter) {
-		LARGE_INTEGER lEnd;
-		::QueryPerformanceCounter(&lEnd);
-		endBigBit = lEnd.HighPart;
-		endLittleBit = lEnd.LowPart;
-		LARGE_INTEGER lBegin;
-		lBegin.HighPart = bigBit;
-		lBegin.LowPart = littleBit;
-		const double elapsed = static_cast<double>(lEnd.QuadPart - lBegin.QuadPart);
-		result = elapsed / static_cast<double>(frequency.QuadPart);
-	} else {
-		endBigBit = clock();
-		endLittleBit = 0;
-		const double elapsed = endBigBit - bigBit;
-		result = elapsed / CLOCKS_PER_SEC;
-	}
-	if (reset) {
-		bigBit = endBigBit;
-		littleBit = endLittleBit;
-	}
-	return result;
-}
-
 class DynamicLibraryImpl : public DynamicLibrary {
 protected:
 	HMODULE h;
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index 480c82e64..c1c54b5d1 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -21,6 +21,7 @@
 #include <map>
 #include <algorithm>
 #include <memory>
+#include <chrono>
 
 #undef _WIN32_WINNT
 #define _WIN32_WINNT 0x0500
@@ -80,6 +81,7 @@
 #include "MarginView.h"
 #include "EditView.h"
 #include "Editor.h"
+#include "ElapsedPeriod.h"
 
 #include "AutoComplete.h"
 #include "ScintillaBase.h"
@@ -813,7 +815,7 @@ void ScintillaWin::AddCharUTF16(wchar_t const *wcs, unsigned int wclen) {
 }
 
 sptr_t ScintillaWin::WndPaint(uptr_t wParam) {
-	//ElapsedTime et;
+	//ElapsedPeriod ep;
 
 	// Redirect assertions to debug output and save current state
 	const bool assertsPopup = Platform::ShowAssertionPopUps(false);
@@ -878,7 +880,7 @@ sptr_t ScintillaWin::WndPaint(uptr_t wParam) {
 	// Restore debug output state
 	Platform::ShowAssertionPopUps(assertsPopup);
 
-	//Platform::DebugPrintf("Paint took %g\n", et.Duration());
+	//Platform::DebugPrintf("Paint took %g\n", ep.Duration());
 	return 0l;
 }
 
diff --git a/win32/deps.mak b/win32/deps.mak
index 9ab7bb6b1..a8e2366d4 100644
--- a/win32/deps.mak
+++ b/win32/deps.mak
@@ -1,7 +1,8 @@
 HanjaDic.o: HanjaDic.cxx ../src/UniConversion.h HanjaDic.h
 PlatWin.o: PlatWin.cxx ../include/Platform.h ../lexlib/StringCopy.h \
  ../src/XPM.h ../src/UniConversion.h ../src/DBCS.h ../src/FontQuality.h
-ScintillaDLL.o: ScintillaDLL.cxx
+ScintillaDLL.o: ScintillaDLL.cxx ../include/Scintilla.h \
+ ../include/Sci_Position.h ScintillaWin.h
 ScintillaWin.o: ScintillaWin.cxx ../include/Platform.h \
  ../include/ILoader.h ../include/Sci_Position.h ../include/ILexer.h \
  ../include/Scintilla.h ../lexlib/StringCopy.h ../src/Position.h \
@@ -12,8 +13,9 @@ ScintillaWin.o: ScintillaWin.cxx ../include/Platform.h \
  ../src/Decoration.h ../src/CaseFolder.h ../src/Document.h \
  ../src/CaseConvert.h ../src/UniConversion.h ../src/Selection.h \
  ../src/PositionCache.h ../src/EditModel.h ../src/MarginView.h \
- ../src/EditView.h ../src/Editor.h ../src/AutoComplete.h \
- ../src/ScintillaBase.h PlatWin.h HanjaDic.h
+ ../src/EditView.h ../src/Editor.h ../src/ElapsedPeriod.h \
+ ../src/AutoComplete.h ../src/ScintillaBase.h PlatWin.h HanjaDic.h \
+ ScintillaWin.h
 AutoComplete.o: ../src/AutoComplete.cxx ../include/Platform.h \
  ../include/Scintilla.h ../include/Sci_Position.h \
  ../lexlib/CharacterSet.h ../src/Position.h ../src/AutoComplete.h
@@ -48,7 +50,7 @@ Document.o: ../src/Document.cxx ../include/Platform.h \
  ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \
  ../src/PerLine.h ../src/CharClassify.h ../src/Decoration.h \
  ../src/CaseFolder.h ../src/Document.h ../src/RESearch.h \
- ../src/UniConversion.h
+ ../src/UniConversion.h ../src/ElapsedPeriod.h
 EditModel.o: ../src/EditModel.cxx ../include/Platform.h \
  ../include/ILoader.h ../include/Sci_Position.h ../include/ILexer.h \
  ../include/Scintilla.h ../lexlib/StringCopy.h ../src/Position.h \
@@ -60,14 +62,14 @@ EditModel.o: ../src/EditModel.cxx ../include/Platform.h \
  ../src/Selection.h ../src/PositionCache.h ../src/EditModel.h
 Editor.o: ../src/Editor.cxx ../include/Platform.h ../include/ILoader.h \
  ../include/Sci_Position.h ../include/ILexer.h ../include/Scintilla.h \
- ../lexlib/StringCopy.h ../src/Position.h ../src/UniqueString.h \
- ../src/SplitVector.h ../src/Partitioning.h ../src/RunStyles.h \
- ../src/ContractionState.h ../src/CellBuffer.h ../src/PerLine.h \
- ../src/KeyMap.h ../src/Indicator.h ../src/LineMarker.h ../src/Style.h \
- ../src/ViewStyle.h ../src/CharClassify.h ../src/Decoration.h \
- ../src/CaseFolder.h ../src/Document.h ../src/UniConversion.h \
- ../src/Selection.h ../src/PositionCache.h ../src/EditModel.h \
- ../src/MarginView.h ../src/EditView.h ../src/Editor.h
+ ../lexlib/StringCopy.h ../lexlib/CharacterSet.h ../src/Position.h \
+ ../src/UniqueString.h ../src/SplitVector.h ../src/Partitioning.h \
+ ../src/RunStyles.h ../src/ContractionState.h ../src/CellBuffer.h \
+ ../src/PerLine.h ../src/KeyMap.h ../src/Indicator.h ../src/LineMarker.h \
+ ../src/Style.h ../src/ViewStyle.h ../src/CharClassify.h \
+ ../src/Decoration.h ../src/CaseFolder.h ../src/Document.h \
+ ../src/UniConversion.h ../src/Selection.h ../src/PositionCache.h \
+ ../src/EditModel.h ../src/MarginView.h ../src/EditView.h ../src/Editor.h
 EditView.o: ../src/EditView.cxx ../include/Platform.h \
  ../include/ILoader.h ../include/Sci_Position.h ../include/ILexer.h \
  ../include/Scintilla.h ../lexlib/StringCopy.h ../lexlib/CharacterSet.h \
@@ -78,7 +80,7 @@ EditView.o: ../src/EditView.cxx ../include/Platform.h \
  ../src/CharClassify.h ../src/Decoration.h ../src/CaseFolder.h \
  ../src/Document.h ../src/UniConversion.h ../src/Selection.h \
  ../src/PositionCache.h ../src/EditModel.h ../src/MarginView.h \
- ../src/EditView.h
+ ../src/EditView.h ../src/ElapsedPeriod.h
 ExternalLexer.o: ../src/ExternalLexer.cxx ../include/Platform.h \
  ../include/ILexer.h ../include/Sci_Position.h ../include/Scintilla.h \
  ../include/SciLexer.h ../lexlib/LexerModule.h ../src/Catalogue.h \
@@ -146,7 +148,7 @@ Accessor.o: ../lexlib/Accessor.cxx ../include/ILexer.h \
  ../lexlib/PropSetSimple.h ../lexlib/WordList.h ../lexlib/LexAccessor.h \
  ../lexlib/Accessor.h
 CharacterCategory.o: ../lexlib/CharacterCategory.cxx \
- ../lexlib/StringCopy.h ../lexlib/CharacterCategory.h
+ ../lexlib/CharacterCategory.h
 CharacterSet.o: ../lexlib/CharacterSet.cxx ../lexlib/CharacterSet.h
 DefaultLexer.o: ../lexlib/DefaultLexer.cxx ../include/ILexer.h \
  ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \