Skip to content

GitLab

T
tangled
Commit 0c06ca8c authored by sigbjornf@opera.com's avatar sigbjornf@opera.com
Browse files
Options

Oilpan: move TextFinder to the heap. 

With WebLocalFrameImpl on the heap, this object no longer needs to use
persistent (or untraced) references.

R=haraken
BUG=340522

Review URL: https://codereview.chromium.org/674773003

git-svn-id: svn://svn.chromium.org/blink/trunk@184332 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent d67f46f4
Hide whitespace changes
Inline Side-by-side
Showing with 125 additions and 80 deletions
third_party/WebKit/Source/web/TextFinder.cpp
View file @ 0c06ca8c
...@@ -65,8 +65,25 @@ void TextFinder::FindMatch::trace(Visitor* visitor) ...@@ -65,8 +65,25 @@ void TextFinder::FindMatch::trace(Visitor* visitor)
visitor->trace(m_range); visitor->trace(m_range);
} }
class TextFinder::DeferredScopeStringMatches { class TextFinder::DeferredScopeStringMatches : public NoBaseWillBeGarbageCollectedFinalized<TextFinder::DeferredScopeStringMatches> {
public: public:
static PassOwnPtrWillBeRawPtr<DeferredScopeStringMatches> create(TextFinder* textFinder, int identifier, const WebString& searchText, const WebFindOptions& options, bool reset)
{
return adoptPtrWillBeNoop(new DeferredScopeStringMatches(textFinder, identifier, searchText, options, reset));
}
void trace(Visitor* visitor)
{
visitor->trace(m_textFinder);
}
void dispose()
{
if (m_timer.isActive())
m_timer.stop();
}
private:
DeferredScopeStringMatches(TextFinder* textFinder, int identifier, const WebString& searchText, const WebFindOptions& options, bool reset) DeferredScopeStringMatches(TextFinder* textFinder, int identifier, const WebString& searchText, const WebFindOptions& options, bool reset)
: m_timer(this, &DeferredScopeStringMatches::doTimeout) : m_timer(this, &DeferredScopeStringMatches::doTimeout)
, m_textFinder(textFinder) , m_textFinder(textFinder)
...@@ -78,14 +95,13 @@ public: ...@@ -78,14 +95,13 @@ public:
m_timer.startOneShot(0.0, FROM_HERE); m_timer.startOneShot(0.0, FROM_HERE);
} }
private:
void doTimeout(Timer<DeferredScopeStringMatches>*) void doTimeout(Timer<DeferredScopeStringMatches>*)
{ {
m_textFinder->callScopeStringMatches(this, m_identifier, m_searchText, m_options, m_reset); m_textFinder->callScopeStringMatches(this, m_identifier, m_searchText, m_options, m_reset);
} }
Timer<DeferredScopeStringMatches> m_timer; Timer<DeferredScopeStringMatches> m_timer;
TextFinder* m_textFinder; RawPtrWillBeMember<TextFinder> m_textFinder;
const int m_identifier; const int m_identifier;
const WebString m_searchText; const WebString m_searchText;
const WebFindOptions m_options; const WebFindOptions m_options;
...@@ -94,37 +110,37 @@ private: ...@@ -94,37 +110,37 @@ private:
bool TextFinder::find(int identifier, const WebString& searchText, const WebFindOptions& options, bool wrapWithinFrame, WebRect* selectionRect) bool TextFinder::find(int identifier, const WebString& searchText, const WebFindOptions& options, bool wrapWithinFrame, WebRect* selectionRect)
{ {
if (!m_ownerFrame.frame() || !m_ownerFrame.frame()->page()) if (!ownerFrame().frame() || !ownerFrame().frame()->page())
return false; return false;
WebLocalFrameImpl* mainFrameImpl = m_ownerFrame.viewImpl()->mainFrameImpl(); WebLocalFrameImpl* mainFrameImpl = ownerFrame().viewImpl()->mainFrameImpl();
if (!options.findNext) if (!options.findNext)
m_ownerFrame.frame()->page()->unmarkAllTextMatches(); ownerFrame().frame()->page()->unmarkAllTextMatches();
else else
setMarkerActive(m_activeMatch.get(), false); setMarkerActive(m_activeMatch.get(), false);
if (m_activeMatch && &m_activeMatch->ownerDocument() != m_ownerFrame.frame()->document()) if (m_activeMatch && &m_activeMatch->ownerDocument() != ownerFrame().frame()->document())
m_activeMatch = nullptr; m_activeMatch = nullptr;
// If the user has selected something since the last Find operation we want // If the user has selected something since the last Find operation we want
// to start from there. Otherwise, we start searching from where the last Find // to start from there. Otherwise, we start searching from where the last Find
// operation left off (either a Find or a FindNext operation). // operation left off (either a Find or a FindNext operation).
VisibleSelection selection(m_ownerFrame.frame()->selection().selection()); VisibleSelection selection(ownerFrame().frame()->selection().selection());
bool activeSelection = !selection.isNone(); bool activeSelection = !selection.isNone();
if (activeSelection) { if (activeSelection) {
m_activeMatch = selection.firstRange().get(); m_activeMatch = selection.firstRange().get();
m_ownerFrame.frame()->selection().clear(); ownerFrame().frame()->selection().clear();
} }
ASSERT(m_ownerFrame.frame() && m_ownerFrame.frame()->view()); ASSERT(ownerFrame().frame() && ownerFrame().frame()->view());
const FindOptions findOptions = (options.forward ? 0 : Backwards) const FindOptions findOptions = (options.forward ? 0 : Backwards)
| (options.matchCase ? 0 : CaseInsensitive) | (options.matchCase ? 0 : CaseInsensitive)
| (wrapWithinFrame ? WrapAround : 0) | (wrapWithinFrame ? WrapAround : 0)
| (options.wordStart ? AtWordStarts : 0) | (options.wordStart ? AtWordStarts : 0)
| (options.medialCapitalAsWordStart ? TreatMedialCapitalAsWordStart : 0) | (options.medialCapitalAsWordStart ? TreatMedialCapitalAsWordStart : 0)
| (options.findNext ? 0 : StartInSelection); | (options.findNext ? 0 : StartInSelection);
m_activeMatch = m_ownerFrame.frame()->editor().findStringAndScrollToVisible(searchText, m_activeMatch.get(), findOptions); m_activeMatch = ownerFrame().frame()->editor().findStringAndScrollToVisible(searchText, m_activeMatch.get(), findOptions);
if (!m_activeMatch) { if (!m_activeMatch) {
// If we're finding next the next active match might not be in the current frame. // If we're finding next the next active match might not be in the current frame.
...@@ -132,20 +148,20 @@ bool TextFinder::find(int identifier, const WebString& searchText, const WebFind ...@@ -132,20 +148,20 @@ bool TextFinder::find(int identifier, const WebString& searchText, const WebFind
if (!options.findNext) if (!options.findNext)
clearFindMatchesCache(); clearFindMatchesCache();
m_ownerFrame.invalidateAll(); ownerFrame().invalidateAll();
return false; return false;
} }
#if OS(ANDROID) #if OS(ANDROID)
m_ownerFrame.viewImpl()->zoomToFindInPageRect(m_ownerFrame.frameView()->contentsToWindow(enclosingIntRect(RenderObject::absoluteBoundingBoxRectForRange(m_activeMatch.get())))); ownerFrame().viewImpl()->zoomToFindInPageRect(ownerFrame().frameView()->contentsToWindow(enclosingIntRect(RenderObject::absoluteBoundingBoxRectForRange(m_activeMatch.get()))));
#endif #endif
setMarkerActive(m_activeMatch.get(), true); setMarkerActive(m_activeMatch.get(), true);
WebLocalFrameImpl* oldActiveFrame = mainFrameImpl->ensureTextFinder().m_currentActiveMatchFrame; WebLocalFrameImpl* oldActiveFrame = mainFrameImpl->ensureTextFinder().m_currentActiveMatchFrame;
mainFrameImpl->ensureTextFinder().m_currentActiveMatchFrame = &m_ownerFrame; mainFrameImpl->ensureTextFinder().m_currentActiveMatchFrame = &ownerFrame();
// Make sure no node is focused. See http://crbug.com/38700. // Make sure no node is focused. See http://crbug.com/38700.
m_ownerFrame.frame()->document()->setFocusedElement(nullptr); ownerFrame().frame()->document()->setFocusedElement(nullptr);
if (!options.findNext || activeSelection) { if (!options.findNext || activeSelection) {
// This is either a Find operation or a Find-next from a new start point // This is either a Find operation or a Find-next from a new start point
...@@ -153,7 +169,7 @@ bool TextFinder::find(int identifier, const WebString& searchText, const WebFind ...@@ -153,7 +169,7 @@ bool TextFinder::find(int identifier, const WebString& searchText, const WebFind
// to find the active rect for us and report it back to the UI. // to find the active rect for us and report it back to the UI.
m_locatingActiveRect = true; m_locatingActiveRect = true;
} else { } else {
if (oldActiveFrame != &m_ownerFrame) { if (oldActiveFrame != &ownerFrame()) {
if (options.forward) if (options.forward)
m_activeMatchIndexInCurrentFrame = 0; m_activeMatchIndexInCurrentFrame = 0;
else else
...@@ -170,7 +186,7 @@ bool TextFinder::find(int identifier, const WebString& searchText, const WebFind ...@@ -170,7 +186,7 @@ bool TextFinder::find(int identifier, const WebString& searchText, const WebFind
m_activeMatchIndexInCurrentFrame = m_lastMatchCount - 1; m_activeMatchIndexInCurrentFrame = m_lastMatchCount - 1;
} }
if (selectionRect) { if (selectionRect) {
*selectionRect = m_ownerFrame.frameView()->contentsToWindow(m_activeMatch->boundingBox()); *selectionRect = ownerFrame().frameView()->contentsToWindow(m_activeMatch->boundingBox());
reportFindInPageSelection(*selectionRect, m_activeMatchIndexInCurrentFrame + 1, identifier); reportFindInPageSelection(*selectionRect, m_activeMatchIndexInCurrentFrame + 1, identifier);
} }
} }
...@@ -183,12 +199,12 @@ void TextFinder::stopFindingAndClearSelection() ...@@ -183,12 +199,12 @@ void TextFinder::stopFindingAndClearSelection()
cancelPendingScopingEffort(); cancelPendingScopingEffort();
// Remove all markers for matches found and turn off the highlighting. // Remove all markers for matches found and turn off the highlighting.
m_ownerFrame.frame()->document()->markers().removeMarkers(DocumentMarker::TextMatch); ownerFrame().frame()->document()->markers().removeMarkers(DocumentMarker::TextMatch);
m_ownerFrame.frame()->editor().setMarkedTextMatchesAreHighlighted(false); ownerFrame().frame()->editor().setMarkedTextMatchesAreHighlighted(false);
clearFindMatchesCache(); clearFindMatchesCache();
// Let the frame know that we don't want tickmarks or highlighting anymore. // Let the frame know that we don't want tickmarks or highlighting anymore.
m_ownerFrame.invalidateAll(); ownerFrame().invalidateAll();
} }
void TextFinder::scopeStringMatches(int identifier, const WebString& searchText, const WebFindOptions& options, bool reset) void TextFinder::scopeStringMatches(int identifier, const WebString& searchText, const WebFindOptions& options, bool reset)
...@@ -203,7 +219,7 @@ void TextFinder::scopeStringMatches(int identifier, const WebString& searchText, ...@@ -203,7 +219,7 @@ void TextFinder::scopeStringMatches(int identifier, const WebString& searchText,
m_findRequestIdentifier = identifier; m_findRequestIdentifier = identifier;
// Clear highlighting for this frame. // Clear highlighting for this frame.
LocalFrame* frame = m_ownerFrame.frame(); LocalFrame* frame = ownerFrame().frame();
if (frame && frame->page() && frame->editor().markedTextMatchesAreHighlighted()) if (frame && frame->page() && frame->editor().markedTextMatchesAreHighlighted())
frame->page()->unmarkAllTextMatches(); frame->page()->unmarkAllTextMatches();
...@@ -217,7 +233,7 @@ void TextFinder::scopeStringMatches(int identifier, const WebString& searchText, ...@@ -217,7 +233,7 @@ void TextFinder::scopeStringMatches(int identifier, const WebString& searchText,
// The view might be null on detached frames. // The view might be null on detached frames.
if (frame && frame->page()) if (frame && frame->page())
m_ownerFrame.viewImpl()->mainFrameImpl()->ensureTextFinder().m_framesScopingCount++; ownerFrame().viewImpl()->mainFrameImpl()->ensureTextFinder().m_framesScopingCount++;
// Now, defer scoping until later to allow find operation to finish quickly. // Now, defer scoping until later to allow find operation to finish quickly.
scopeStringMatchesSoon(identifier, searchText, options, false); // false means just reset, so don't do it again. scopeStringMatchesSoon(identifier, searchText, options, false); // false means just reset, so don't do it again.
...@@ -232,9 +248,9 @@ void TextFinder::scopeStringMatches(int identifier, const WebString& searchText, ...@@ -232,9 +248,9 @@ void TextFinder::scopeStringMatches(int identifier, const WebString& searchText,
return; return;
} }
WebLocalFrameImpl* mainFrameImpl = m_ownerFrame.viewImpl()->mainFrameImpl(); WebLocalFrameImpl* mainFrameImpl = ownerFrame().viewImpl()->mainFrameImpl();
Position searchStart = firstPositionInNode(m_ownerFrame.frame()->document()); Position searchStart = firstPositionInNode(ownerFrame().frame()->document());
Position searchEnd = lastPositionInNode(m_ownerFrame.frame()->document()); Position searchEnd = lastPositionInNode(ownerFrame().frame()->document());
ASSERT(searchStart.document() == searchEnd.document()); ASSERT(searchStart.document() == searchEnd.document());
if (m_resumeScopingFromRange) { if (m_resumeScopingFromRange) {
...@@ -295,7 +311,7 @@ void TextFinder::scopeStringMatches(int identifier, const WebString& searchText, ...@@ -295,7 +311,7 @@ void TextFinder::scopeStringMatches(int identifier, const WebString& searchText,
bool foundActiveMatch = false; bool foundActiveMatch = false;
if (m_locatingActiveRect && (activeSelectionRect == resultBounds)) { if (m_locatingActiveRect && (activeSelectionRect == resultBounds)) {
// We have found the active tickmark frame. // We have found the active tickmark frame.
mainFrameImpl->ensureTextFinder().m_currentActiveMatchFrame = &m_ownerFrame; mainFrameImpl->ensureTextFinder().m_currentActiveMatchFrame = &ownerFrame();
foundActiveMatch = true; foundActiveMatch = true;
// We also know which tickmark is active now. // We also know which tickmark is active now.
m_activeMatchIndexInCurrentFrame = matchCount - 1; m_activeMatchIndexInCurrentFrame = matchCount - 1;
...@@ -304,7 +320,7 @@ void TextFinder::scopeStringMatches(int identifier, const WebString& searchText, ...@@ -304,7 +320,7 @@ void TextFinder::scopeStringMatches(int identifier, const WebString& searchText,
// Notify browser of new location for the selected rectangle. // Notify browser of new location for the selected rectangle.
reportFindInPageSelection( reportFindInPageSelection(
m_ownerFrame.frameView()->contentsToWindow(resultBounds), ownerFrame().frameView()->contentsToWindow(resultBounds),
m_activeMatchIndexInCurrentFrame + 1, m_activeMatchIndexInCurrentFrame + 1,
identifier); identifier);
} }
...@@ -328,7 +344,7 @@ void TextFinder::scopeStringMatches(int identifier, const WebString& searchText, ...@@ -328,7 +344,7 @@ void TextFinder::scopeStringMatches(int identifier, const WebString& searchText,
m_lastSearchString = searchText; m_lastSearchString = searchText;
if (matchCount > 0) { if (matchCount > 0) {
m_ownerFrame.frame()->editor().setMarkedTextMatchesAreHighlighted(true); ownerFrame().frame()->editor().setMarkedTextMatchesAreHighlighted(true);
m_lastMatchCount += matchCount; m_lastMatchCount += matchCount;
...@@ -357,10 +373,10 @@ void TextFinder::scopeStringMatches(int identifier, const WebString& searchText, ...@@ -357,10 +373,10 @@ void TextFinder::scopeStringMatches(int identifier, const WebString& searchText,
void TextFinder::flushCurrentScopingEffort(int identifier) void TextFinder::flushCurrentScopingEffort(int identifier)
{ {
if (!m_ownerFrame.frame() || !m_ownerFrame.frame()->page()) if (!ownerFrame().frame() || !ownerFrame().frame()->page())
return; return;
WebLocalFrameImpl* mainFrameImpl = m_ownerFrame.viewImpl()->mainFrameImpl(); WebLocalFrameImpl* mainFrameImpl = ownerFrame().viewImpl()->mainFrameImpl();
mainFrameImpl->ensureTextFinder().decrementFramesScopingCount(identifier); mainFrameImpl->ensureTextFinder().decrementFramesScopingCount(identifier);
} }
...@@ -372,12 +388,15 @@ void TextFinder::finishCurrentScopingEffort(int identifier) ...@@ -372,12 +388,15 @@ void TextFinder::finishCurrentScopingEffort(int identifier)
m_lastFindRequestCompletedWithNoMatches = !m_lastMatchCount; m_lastFindRequestCompletedWithNoMatches = !m_lastMatchCount;
// This frame is done, so show any scrollbar tickmarks we haven't drawn yet. // This frame is done, so show any scrollbar tickmarks we haven't drawn yet.
m_ownerFrame.invalidateScrollbar(); ownerFrame().invalidateScrollbar();
} }
void TextFinder::cancelPendingScopingEffort() void TextFinder::cancelPendingScopingEffort()
{ {
deleteAllValues(m_deferredScopingWork); #if ENABLE(OILPAN)
for (DeferredScopeStringMatches* deferredWork : m_deferredScopingWork)
deferredWork->dispose();
#endif
m_deferredScopingWork.clear(); m_deferredScopingWork.clear();
m_activeMatchIndexInCurrentFrame = -1; m_activeMatchIndexInCurrentFrame = -1;
...@@ -397,15 +416,15 @@ void TextFinder::increaseMatchCount(int identifier, int count) ...@@ -397,15 +416,15 @@ void TextFinder::increaseMatchCount(int identifier, int count)
m_totalMatchCount += count; m_totalMatchCount += count;
// Update the UI with the latest findings. // Update the UI with the latest findings.
if (m_ownerFrame.client()) if (ownerFrame().client())
m_ownerFrame.client()->reportFindInPageMatchCount(identifier, m_totalMatchCount, !m_framesScopingCount); ownerFrame().client()->reportFindInPageMatchCount(identifier, m_totalMatchCount, !m_framesScopingCount);
} }
void TextFinder::reportFindInPageSelection(const WebRect& selectionRect, int activeMatchOrdinal, int identifier) void TextFinder::reportFindInPageSelection(const WebRect& selectionRect, int activeMatchOrdinal, int identifier)
{ {
// Update the UI with the latest selection rect. // Update the UI with the latest selection rect.
if (m_ownerFrame.client()) if (ownerFrame().client())
m_ownerFrame.client()->reportFindInPageSelection(identifier, ordinalOfFirstMatch() + activeMatchOrdinal, selectionRect); ownerFrame().client()->reportFindInPageSelection(identifier, ordinalOfFirstMatch() + activeMatchOrdinal, selectionRect);
} }
void TextFinder::resetMatchCount() void TextFinder::resetMatchCount()
...@@ -420,7 +439,7 @@ void TextFinder::resetMatchCount() ...@@ -420,7 +439,7 @@ void TextFinder::resetMatchCount()
void TextFinder::clearFindMatchesCache() void TextFinder::clearFindMatchesCache()
{ {
if (!m_findMatchesCache.isEmpty()) if (!m_findMatchesCache.isEmpty())
m_ownerFrame.viewImpl()->mainFrameImpl()->ensureTextFinder().m_findMatchMarkersVersion++; ownerFrame().viewImpl()->mainFrameImpl()->ensureTextFinder().m_findMatchMarkersVersion++;
m_findMatchesCache.clear(); m_findMatchesCache.clear();
m_findMatchRectsAreValid = false; m_findMatchRectsAreValid = false;
...@@ -428,14 +447,14 @@ void TextFinder::clearFindMatchesCache() ...@@ -428,14 +447,14 @@ void TextFinder::clearFindMatchesCache()
bool TextFinder::isActiveMatchFrameValid() const bool TextFinder::isActiveMatchFrameValid() const
{ {
WebLocalFrameImpl* mainFrameImpl = m_ownerFrame.viewImpl()->mainFrameImpl(); WebLocalFrameImpl* mainFrameImpl = ownerFrame().viewImpl()->mainFrameImpl();
WebLocalFrameImpl* activeMatchFrame = mainFrameImpl->activeMatchFrame(); WebLocalFrameImpl* activeMatchFrame = mainFrameImpl->activeMatchFrame();
return activeMatchFrame && activeMatchFrame->activeMatch() && activeMatchFrame->frame()->tree().isDescendantOf(mainFrameImpl->frame()); return activeMatchFrame && activeMatchFrame->activeMatch() && activeMatchFrame->frame()->tree().isDescendantOf(mainFrameImpl->frame());
} }
void TextFinder::updateFindMatchRects() void TextFinder::updateFindMatchRects()
{ {
IntSize currentContentsSize = m_ownerFrame.contentsSize(); IntSize currentContentsSize = ownerFrame().contentsSize();
if (m_contentsSizeForCurrentFindMatchRects != currentContentsSize) { if (m_contentsSizeForCurrentFindMatchRects != currentContentsSize) {
m_contentsSizeForCurrentFindMatchRects = currentContentsSize; m_contentsSizeForCurrentFindMatchRects = currentContentsSize;
m_findMatchRectsAreValid = false; m_findMatchRectsAreValid = false;
...@@ -467,7 +486,7 @@ void TextFinder::updateFindMatchRects() ...@@ -467,7 +486,7 @@ void TextFinder::updateFindMatchRects()
// Invalidate the rects in child frames. Will be updated later during traversal. // Invalidate the rects in child frames. Will be updated later during traversal.
if (!m_findMatchRectsAreValid) if (!m_findMatchRectsAreValid)
for (WebFrame* child = m_ownerFrame.firstChild(); child; child = child->nextSibling()) for (WebFrame* child = ownerFrame().firstChild(); child; child = child->nextSibling())
toWebLocalFrameImpl(child)->ensureTextFinder().m_findMatchRectsAreValid = false; toWebLocalFrameImpl(child)->ensureTextFinder().m_findMatchRectsAreValid = false;
m_findMatchRectsAreValid = true; m_findMatchRectsAreValid = true;
...@@ -484,7 +503,7 @@ WebFloatRect TextFinder::activeFindMatchRect() ...@@ -484,7 +503,7 @@ WebFloatRect TextFinder::activeFindMatchRect()
void TextFinder::findMatchRects(WebVector<WebFloatRect>& outputRects) void TextFinder::findMatchRects(WebVector<WebFloatRect>& outputRects)
{ {
Vector<WebFloatRect> matchRects; Vector<WebFloatRect> matchRects;
for (WebLocalFrameImpl* frame = &m_ownerFrame; frame; frame = toWebLocalFrameImpl(frame->traverseNext(false))) for (WebLocalFrameImpl* frame = &ownerFrame(); frame; frame = toWebLocalFrameImpl(frame->traverseNext(false)))
frame->ensureTextFinder().appendFindMatchRects(matchRects); frame->ensureTextFinder().appendFindMatchRects(matchRects);
outputRects = matchRects; outputRects = matchRects;
...@@ -506,7 +525,7 @@ int TextFinder::selectNearestFindMatch(const WebFloatPoint& point, WebRect* sele ...@@ -506,7 +525,7 @@ int TextFinder::selectNearestFindMatch(const WebFloatPoint& point, WebRect* sele
int indexInBestFrame = -1; int indexInBestFrame = -1;
float distanceInBestFrame = FLT_MAX; float distanceInBestFrame = FLT_MAX;
for (WebLocalFrameImpl* frame = &m_ownerFrame; frame; frame = toWebLocalFrameImpl(frame->traverseNext(false))) { for (WebLocalFrameImpl* frame = &ownerFrame(); frame; frame = toWebLocalFrameImpl(frame->traverseNext(false))) {
float distanceInFrame; float distanceInFrame;
TextFinder& finder = frame->ensureTextFinder(); TextFinder& finder = frame->ensureTextFinder();
int indexInFrame = finder.nearestFindMatch(point, distanceInFrame); int indexInFrame = finder.nearestFindMatch(point, distanceInFrame);
...@@ -552,26 +571,26 @@ int TextFinder::selectFindMatch(unsigned index, WebRect* selectionRect) ...@@ -552,26 +571,26 @@ int TextFinder::selectFindMatch(unsigned index, WebRect* selectionRect)
return -1; return -1;
// Check if the match is already selected. // Check if the match is already selected.
TextFinder& mainFrameTextFinder = m_ownerFrame.viewImpl()->mainFrameImpl()->ensureTextFinder(); TextFinder& mainFrameTextFinder = ownerFrame().viewImpl()->mainFrameImpl()->ensureTextFinder();
WebLocalFrameImpl* activeMatchFrame = mainFrameTextFinder.m_currentActiveMatchFrame; WebLocalFrameImpl* activeMatchFrame = mainFrameTextFinder.m_currentActiveMatchFrame;
if (&m_ownerFrame != activeMatchFrame || !m_activeMatch || !areRangesEqual(m_activeMatch.get(), range.get())) { if (&ownerFrame() != activeMatchFrame || !m_activeMatch || !areRangesEqual(m_activeMatch.get(), range.get())) {
if (isActiveMatchFrameValid()) if (isActiveMatchFrameValid())
activeMatchFrame->ensureTextFinder().setMatchMarkerActive(false); activeMatchFrame->ensureTextFinder().setMatchMarkerActive(false);
m_activeMatchIndexInCurrentFrame = m_findMatchesCache[index].m_ordinal - 1; m_activeMatchIndexInCurrentFrame = m_findMatchesCache[index].m_ordinal - 1;
// Set this frame as the active frame (the one with the active highlight). // Set this frame as the active frame (the one with the active highlight).
mainFrameTextFinder.m_currentActiveMatchFrame = &m_ownerFrame; mainFrameTextFinder.m_currentActiveMatchFrame = &ownerFrame();
m_ownerFrame.viewImpl()->setFocusedFrame(&m_ownerFrame); ownerFrame().viewImpl()->setFocusedFrame(&ownerFrame());
m_activeMatch = range.release(); m_activeMatch = range.release();
setMarkerActive(m_activeMatch.get(), true); setMarkerActive(m_activeMatch.get(), true);
// Clear any user selection, to make sure Find Next continues on from the match we just activated. // Clear any user selection, to make sure Find Next continues on from the match we just activated.
m_ownerFrame.frame()->selection().clear(); ownerFrame().frame()->selection().clear();
// Make sure no node is focused. See http://crbug.com/38700. // Make sure no node is focused. See http://crbug.com/38700.
m_ownerFrame.frame()->document()->setFocusedElement(nullptr); ownerFrame().frame()->document()->setFocusedElement(nullptr);
} }
IntRect activeMatchRect; IntRect activeMatchRect;
...@@ -584,8 +603,8 @@ int TextFinder::selectFindMatch(unsigned index, WebRect* selectionRect) ...@@ -584,8 +603,8 @@ int TextFinder::selectFindMatch(unsigned index, WebRect* selectionRect)
} }
// Zoom to the active match. // Zoom to the active match.
activeMatchRect = m_ownerFrame.frameView()->contentsToWindow(activeMatchBoundingBox); activeMatchRect = ownerFrame().frameView()->contentsToWindow(activeMatchBoundingBox);
m_ownerFrame.viewImpl()->zoomToFindInPageRect(activeMatchRect); ownerFrame().viewImpl()->zoomToFindInPageRect(activeMatchRect);
} }
if (selectionRect) if (selectionRect)
...@@ -594,13 +613,13 @@ int TextFinder::selectFindMatch(unsigned index, WebRect* selectionRect) ...@@ -594,13 +613,13 @@ int TextFinder::selectFindMatch(unsigned index, WebRect* selectionRect)
return ordinalOfFirstMatch() + m_activeMatchIndexInCurrentFrame + 1; return ordinalOfFirstMatch() + m_activeMatchIndexInCurrentFrame + 1;
} }
PassOwnPtr<TextFinder> TextFinder::create(WebLocalFrameImpl& ownerFrame) PassOwnPtrWillBeRawPtr<TextFinder> TextFinder::create(WebLocalFrameImpl& ownerFrame)
{ {
return adoptPtr(new TextFinder(ownerFrame)); return adoptPtrWillBeNoop(new TextFinder(ownerFrame));
} }
TextFinder::TextFinder(WebLocalFrameImpl& ownerFrame) TextFinder::TextFinder(WebLocalFrameImpl& ownerFrame)
: m_ownerFrame(ownerFrame) : m_ownerFrame(&ownerFrame)
, m_currentActiveMatchFrame(nullptr) , m_currentActiveMatchFrame(nullptr)
, m_activeMatchIndexInCurrentFrame(-1) , m_activeMatchIndexInCurrentFrame(-1)
, m_resumeScopingFromRange(nullptr) , m_resumeScopingFromRange(nullptr)
...@@ -619,25 +638,27 @@ TextFinder::TextFinder(WebLocalFrameImpl& ownerFrame) ...@@ -619,25 +638,27 @@ TextFinder::TextFinder(WebLocalFrameImpl& ownerFrame)
TextFinder::~TextFinder() TextFinder::~TextFinder()
{ {
#if !ENABLE(OILPAN)
cancelPendingScopingEffort(); cancelPendingScopingEffort();
#endif
} }
void TextFinder::addMarker(Range* range, bool activeMatch) void TextFinder::addMarker(Range* range, bool activeMatch)
{ {
m_ownerFrame.frame()->document()->markers().addTextMatchMarker(range, activeMatch); ownerFrame().frame()->document()->markers().addTextMatchMarker(range, activeMatch);
} }
void TextFinder::setMarkerActive(Range* range, bool active) void TextFinder::setMarkerActive(Range* range, bool active)
{ {
if (!range || range->collapsed()) if (!range || range->collapsed())
return; return;
m_ownerFrame.frame()->document()->markers().setMarkersActive(range, active); ownerFrame().frame()->document()->markers().setMarkersActive(range, active);
} }
int TextFinder::ordinalOfFirstMatchForFrame(WebLocalFrameImpl* frame) const int TextFinder::ordinalOfFirstMatchForFrame(WebLocalFrameImpl* frame) const
{ {
int ordinal = 0; int ordinal = 0;
WebLocalFrameImpl* mainFrameImpl = m_ownerFrame.viewImpl()->mainFrameImpl(); WebLocalFrameImpl* mainFrameImpl = ownerFrame().viewImpl()->mainFrameImpl();
// Iterate from the main frame up to (but not including) |frame| and // Iterate from the main frame up to (but not including) |frame| and
// add up the number of matches found so far. // add up the number of matches found so far.
for (WebLocalFrameImpl* it = mainFrameImpl; it != frame; it = toWebLocalFrameImpl(it->traverseNext(true))) { for (WebLocalFrameImpl* it = mainFrameImpl; it != frame; it = toWebLocalFrameImpl(it->traverseNext(true))) {
...@@ -653,8 +674,8 @@ bool TextFinder::shouldScopeMatches(const String& searchText) ...@@ -653,8 +674,8 @@ bool TextFinder::shouldScopeMatches(const String& searchText)
// Don't scope if we can't find a frame or a view. // Don't scope if we can't find a frame or a view.
// The user may have closed the tab/application, so abort. // The user may have closed the tab/application, so abort.
// Also ignore detached frames, as many find operations report to the main frame. // Also ignore detached frames, as many find operations report to the main frame.
LocalFrame* frame = m_ownerFrame.frame(); LocalFrame* frame = ownerFrame().frame();
if (!frame || !frame->view() || !frame->page() || !m_ownerFrame.hasVisibleContent()) if (!frame || !frame->view() || !frame->page() || !ownerFrame().hasVisibleContent())
return false; return false;
ASSERT(frame->document() && frame->view()); ASSERT(frame->document() && frame->view());
...@@ -676,16 +697,19 @@ bool TextFinder::shouldScopeMatches(const String& searchText) ...@@ -676,16 +697,19 @@ bool TextFinder::shouldScopeMatches(const String& searchText)
void TextFinder::scopeStringMatchesSoon(int identifier, const WebString& searchText, const WebFindOptions& options, bool reset) void TextFinder::scopeStringMatchesSoon(int identifier, const WebString& searchText, const WebFindOptions& options, bool reset)
{ {
m_deferredScopingWork.append(new DeferredScopeStringMatches(this, identifier, searchText, options, reset)); m_deferredScopingWork.append(DeferredScopeStringMatches::create(this, identifier, searchText, options, reset));
} }
void TextFinder::callScopeStringMatches(DeferredScopeStringMatches* caller, int identifier, const WebString& searchText, const WebFindOptions& options, bool reset) void TextFinder::callScopeStringMatches(DeferredScopeStringMatches* caller, int identifier, const WebString& searchText, const WebFindOptions& options, bool reset)
{ {
m_deferredScopingWork.remove(m_deferredScopingWork.find(caller)); size_t index = m_deferredScopingWork.find(caller);
scopeStringMatches(identifier, searchText, options, reset); #if !ENABLE(OILPAN)
// Finalization needs to be delayed as (m_)searchText is passed by reference.
OwnPtr<DeferredScopeStringMatches> item = index != kNotFound ? m_deferredScopingWork[index].release() : nullptr;
#endif
m_deferredScopingWork.remove(index);
// This needs to happen last since searchText is passed by reference. scopeStringMatches(identifier, searchText, options, reset);
delete caller;
} }
void TextFinder::invalidateIfNecessary() void TextFinder::invalidateIfNecessary()
...@@ -705,7 +729,7 @@ void TextFinder::invalidateIfNecessary() ...@@ -705,7 +729,7 @@ void TextFinder::invalidateIfNecessary()
int i = m_lastMatchCount / startSlowingDownAfter; int i = m_lastMatchCount / startSlowingDownAfter;
m_nextInvalidateAfter += i * slowdown; m_nextInvalidateAfter += i * slowdown;
m_ownerFrame.invalidateScrollbar(); ownerFrame().invalidateScrollbar();
} }
void TextFinder::flushCurrentScoping() void TextFinder::flushCurrentScoping()
...@@ -727,12 +751,22 @@ void TextFinder::decrementFramesScopingCount(int identifier) ...@@ -727,12 +751,22 @@ void TextFinder::decrementFramesScopingCount(int identifier)
// If this is the last frame to finish scoping we need to trigger the final // If this is the last frame to finish scoping we need to trigger the final
// update to be sent. // update to be sent.
if (!m_framesScopingCount) if (!m_framesScopingCount)
m_ownerFrame.increaseMatchCount(0, identifier); ownerFrame().increaseMatchCount(0, identifier);
} }
int TextFinder::ordinalOfFirstMatch() const int TextFinder::ordinalOfFirstMatch() const
{ {
return ordinalOfFirstMatchForFrame(&m_ownerFrame); return ordinalOfFirstMatchForFrame(m_ownerFrame.get());
}
void TextFinder::trace(Visitor* visitor)
{
visitor->trace(m_ownerFrame);
visitor->trace(m_currentActiveMatchFrame);
visitor->trace(m_activeMatch);
visitor->trace(m_resumeScopingFromRange);
visitor->trace(m_deferredScopingWork);
visitor->trace(m_findMatchesCache);
} }
} // namespace blink } // namespace blink
third_party/WebKit/Source/web/TextFinder.h
View file @ 0c06ca8c
...@@ -50,9 +50,9 @@ class WebLocalFrameImpl; ...@@ -50,9 +50,9 @@ class WebLocalFrameImpl;
template <typename T> class WebVector; template <typename T> class WebVector;
class TextFinder { class TextFinder final : public NoBaseWillBeGarbageCollectedFinalized<TextFinder> {
public: public:
static PassOwnPtr<TextFinder> create(WebLocalFrameImpl& ownerFrame); static PassOwnPtrWillBeRawPtr<TextFinder> create(WebLocalFrameImpl& ownerFrame);
bool find( bool find(
int identifier, const WebString& searchText, const WebFindOptions&, int identifier, const WebString& searchText, const WebFindOptions&,
...@@ -91,6 +91,10 @@ public: ...@@ -91,6 +91,10 @@ public:
class FindMatch { class FindMatch {
ALLOW_ONLY_INLINE_ALLOCATION(); ALLOW_ONLY_INLINE_ALLOCATION();
public: public:
FindMatch(PassRefPtrWillBeRawPtr<Range>, int ordinal);
void trace(Visitor*);
RefPtrWillBeMember<Range> m_range; RefPtrWillBeMember<Range> m_range;
// 1-based index within this frame. // 1-based index within this frame.
...@@ -99,12 +103,10 @@ public: ...@@ -99,12 +103,10 @@ public:
// In find-in-page coordinates. // In find-in-page coordinates.
// Lazily calculated by updateFindMatchRects. // Lazily calculated by updateFindMatchRects.
FloatRect m_rect; FloatRect m_rect;
FindMatch(PassRefPtrWillBeRawPtr<Range>, int ordinal);
void trace(Visitor*);
}; };
void trace(Visitor*);
private: private:
class DeferredScopeStringMatches; class DeferredScopeStringMatches;
friend class DeferredScopeStringMatches; friend class DeferredScopeStringMatches;
...@@ -185,17 +187,23 @@ private: ...@@ -185,17 +187,23 @@ private:
void decrementFramesScopingCount(int identifier); void decrementFramesScopingCount(int identifier);
WebLocalFrameImpl& ownerFrame() const
{
ASSERT(m_ownerFrame);
return *m_ownerFrame;
}
// Returns the ordinal of the first match in the owner frame. // Returns the ordinal of the first match in the owner frame.
int ordinalOfFirstMatch() const; int ordinalOfFirstMatch() const;
WebLocalFrameImpl& m_ownerFrame; RawPtrWillBeMember<WebLocalFrameImpl> m_ownerFrame;
// A way for the main frame to keep track of which frame has an active // A way for the main frame to keep track of which frame has an active
// match. Should be 0 for all other frames. // match. Should be 0 for all other frames.
WebLocalFrameImpl* m_currentActiveMatchFrame; RawPtrWillBeMember<WebLocalFrameImpl> m_currentActiveMatchFrame;
// The range of the active match for the current frame. // The range of the active match for the current frame.
RefPtrWillBePersistent<Range> m_activeMatch; RefPtrWillBeMember<Range> m_activeMatch;
// The index of the active match for the current frame. // The index of the active match for the current frame.
int m_activeMatchIndexInCurrentFrame; int m_activeMatchIndexInCurrentFrame;
...@@ -205,7 +213,7 @@ private: ...@@ -205,7 +213,7 @@ private:
// //
// This range is collapsed to the end position of the last successful // This range is collapsed to the end position of the last successful
// search; the new search should start from this position. // search; the new search should start from this position.
RefPtrWillBePersistent<Range> m_resumeScopingFromRange; RefPtrWillBeMember<Range> m_resumeScopingFromRange;
// Keeps track of the last string this frame searched for. This is used for // Keeps track of the last string this frame searched for. This is used for
// short-circuiting searches in the following scenarios: When a frame has // short-circuiting searches in the following scenarios: When a frame has
...@@ -237,14 +245,14 @@ private: ...@@ -237,14 +245,14 @@ private:
int m_nextInvalidateAfter; int m_nextInvalidateAfter;
// A list of all of the pending calls to scopeStringMatches. // A list of all of the pending calls to scopeStringMatches.
Vector<DeferredScopeStringMatches*> m_deferredScopingWork; WillBeHeapVector<OwnPtrWillBeMember<DeferredScopeStringMatches> > m_deferredScopingWork;
// Version number incremented on the main frame only whenever the document // Version number incremented on the main frame only whenever the document
// find-in-page match markers change. It should be 0 for all other frames. // find-in-page match markers change. It should be 0 for all other frames.
int m_findMatchMarkersVersion; int m_findMatchMarkersVersion;
// Local cache of the find match markers currently displayed for this frame. // Local cache of the find match markers currently displayed for this frame.
WillBePersistentHeapVector<FindMatch> m_findMatchesCache; WillBeHeapVector<FindMatch> m_findMatchesCache;
// Contents size when find-in-page match rects were last computed for this // Contents size when find-in-page match rects were last computed for this
// frame's cache. // frame's cache.
...@@ -271,4 +279,4 @@ private: ...@@ -271,4 +279,4 @@ private:
WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::TextFinder::FindMatch); WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::TextFinder::FindMatch);
#endif #endif // TextFinder_h
third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
View file @ 0c06ca8c
...@@ -1554,13 +1554,16 @@ WebLocalFrameImpl::~WebLocalFrameImpl() ...@@ -1554,13 +1554,16 @@ WebLocalFrameImpl::~WebLocalFrameImpl()
Platform::current()->decrementStatsCounter(webFrameActiveCount); Platform::current()->decrementStatsCounter(webFrameActiveCount);
frameCount--; frameCount--;
#if !ENABLE(OILPAN)
cancelPendingScopingEffort(); cancelPendingScopingEffort();
#endif
} }
#if ENABLE(OILPAN) #if ENABLE(OILPAN)
void WebLocalFrameImpl::trace(Visitor* visitor) void WebLocalFrameImpl::trace(Visitor* visitor)
{ {
visitor->trace(m_frame); visitor->trace(m_frame);
visitor->trace(m_textFinder);
visitor->trace(m_printContext); visitor->trace(m_printContext);
visitor->trace(m_geolocationClientProxy); visitor->trace(m_geolocationClientProxy);
visitor->registerWeakMembers<WebFrame, &WebFrame::clearWeakFrames>(this); visitor->registerWeakMembers<WebFrame, &WebFrame::clearWeakFrames>(this);
......
third_party/WebKit/Source/web/WebLocalFrameImpl.h
View file @ 0c06ca8c
...@@ -343,7 +343,7 @@ private: ...@@ -343,7 +343,7 @@ private:
OwnPtr<SharedWorkerRepositoryClientImpl> m_sharedWorkerRepositoryClient; OwnPtr<SharedWorkerRepositoryClientImpl> m_sharedWorkerRepositoryClient;
// Will be initialized after first call to find() or scopeStringMatches(). // Will be initialized after first call to find() or scopeStringMatches().
OwnPtr<TextFinder> m_textFinder; OwnPtrWillBeMember<TextFinder> m_textFinder;
// Valid between calls to BeginPrint() and EndPrint(). Containts the print // Valid between calls to BeginPrint() and EndPrint(). Containts the print
// information. Is used by PrintPage(). // information. Is used by PrintPage().
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment