diff options
author | Neil <nyamatongwe@gmail.com> | 2018-04-26 08:19:32 +1000 |
---|---|---|
committer | Neil <nyamatongwe@gmail.com> | 2018-04-26 08:19:32 +1000 |
commit | f4fdffef1425b7a4293a90fb96219a58b2158019 (patch) | |
tree | c23cc3904df927a7b9dfb1bbddcf022228f1351d /src/Document.cxx | |
parent | 9172c913efbc014349c97740476d019690e57791 (diff) | |
download | scintilla-mirror-f4fdffef1425b7a4293a90fb96219a58b2158019.tar.gz |
Use <chrono> for platform-independent timing and remove ElapsedTime.
Also use #if for painting measurement as there are 7 sections of code to enable.
Diffstat (limited to 'src/Document.cxx')
-rw-r--r-- | src/Document.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/Document.cxx b/src/Document.cxx index e576c5db3..6efcb37fa 100644 --- a/src/Document.cxx +++ b/src/Document.cxx @@ -18,6 +18,7 @@ #include <forward_list> #include <algorithm> #include <memory> +#include <chrono> #ifndef NO_CXX11_REGEX #include <regex> @@ -43,6 +44,7 @@ #include "Document.h" #include "RESearch.h" #include "UniConversion.h" +#include "ElapsedPeriod.h" using namespace Scintilla; @@ -2108,9 +2110,9 @@ void Document::StyleToAdjustingLineDuration(Sci::Position pos) { const double alpha = 0.25; const Sci::Line lineFirst = SciLineFromPosition(GetEndStyled()); - ElapsedTime etStyling; + ElapsedPeriod epStyling; EnsureStyledTo(pos); - const double durationStyling = etStyling.Duration(); + const double durationStyling = epStyling.Duration(); const Sci::Line lineLast = SciLineFromPosition(GetEndStyled()); if (lineLast >= lineFirst + 8) { // Only adjust for styling multiple lines to avoid instability @@ -2924,7 +2926,7 @@ Sci::Position Cxx11RegexFindText(const Document *doc, Sci::Position minPos, Sci: bool caseSensitive, Sci::Position *length, RESearch &search) { const RESearchRange resr(doc, minPos, maxPos); try { - //ElapsedTime et; + //ElapsedPeriod ep; std::regex::flag_type flagsRe = std::regex::ECMAScript; // Flags that apper to have no effect: // | std::regex::collate | std::regex::extended; @@ -2969,7 +2971,7 @@ Sci::Position Cxx11RegexFindText(const Document *doc, Sci::Position minPos, Sci: // Example - search in doc/ScintillaHistory.html for // [[:upper:]]eta[[:space:]] // On MacBook, normally around 1 second but with locale imbued -> 14 seconds. - //double durSearch = et.Duration(true); + //const double durSearch = ep.Duration(true); //Platform::DebugPrintf("Search:%9.6g \n", durSearch); return posMatch; } catch (std::regex_error &) { |