diff options
author | Neil <nyamatongwe@gmail.com> | 2014-06-22 13:44:46 +1000 |
---|---|---|
committer | Neil <nyamatongwe@gmail.com> | 2014-06-22 13:44:46 +1000 |
commit | 47ac30dfae520dd56e0c4cd20827d65bae25e073 (patch) | |
tree | b032e0dc0eda28a8e64977298dcc04e884f5ce5e /src/PositionCache.h | |
parent | 93c33490b77157f2e5422f4962ac4b88f4aea7c5 (diff) | |
download | scintilla-mirror-47ac30dfae520dd56e0c4cd20827d65bae25e073.tar.gz |
Stop storing a pointer to the selection on LineLayout objects where it may have
a lifetime that is too long. Instead provide it as an argument to BreakFinder
where it is only needed during intialisation.
Diffstat (limited to 'src/PositionCache.h')
-rw-r--r-- | src/PositionCache.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/PositionCache.h b/src/PositionCache.h index e26b4b273..64ccfda34 100644 --- a/src/PositionCache.h +++ b/src/PositionCache.h @@ -34,7 +34,6 @@ public: enum validLevel { llInvalid, llCheckTextAndStyle, llPositions, llLines } validity; int xHighlightGuide; bool highlightColumn; - Selection *psel; bool containsCaret; int edgeColumn; char *chars; @@ -170,7 +169,7 @@ public: enum { lengthStartSubdivision = 300 }; // Try to make each subdivided run lengthEachSubdivision or shorter. enum { lengthEachSubdivision = 100 }; - BreakFinder(const LineLayout *ll_, int lineStart_, int lineEnd_, int posLineStart_, + BreakFinder(const LineLayout *ll_, const Selection *psel, int lineStart_, int lineEnd_, int posLineStart_, int xStart, bool breakForSelection, const Document *pdoc_, const SpecialRepresentations *preprs_); ~BreakFinder(); TextSegment Next(); |