Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1385)

Unified Diff: Source/web/TextFinder.cpp

Issue 967213004: Removed FrameView's windowToContents and contentsToWindow methods. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/web/PopupListBox.cpp ('k') | Source/web/ValidationMessageClientImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/TextFinder.cpp
diff --git a/Source/web/TextFinder.cpp b/Source/web/TextFinder.cpp
index d0675c933898c183ca0de5568d75ff9c0802fcc5..d699197d69d088b04bde8bbca0a238e657ea24b5 100644
--- a/Source/web/TextFinder.cpp
+++ b/Source/web/TextFinder.cpp
@@ -156,7 +156,7 @@ bool TextFinder::find(int identifier, const WebString& searchText, const WebFind
}
#if OS(ANDROID)
- ownerFrame().viewImpl()->zoomToFindInPageRect(ownerFrame().frameView()->contentsToWindow(enclosingIntRect(LayoutObject::absoluteBoundingBoxRectForRange(m_activeMatch.get()))));
+ ownerFrame().viewImpl()->zoomToFindInPageRect(ownerFrame().frameView()->contentsToRootFrame(enclosingIntRect(LayoutObject::absoluteBoundingBoxRectForRange(m_activeMatch.get()))));
#endif
setMarkerActive(m_activeMatch.get(), true);
@@ -189,7 +189,7 @@ bool TextFinder::find(int identifier, const WebString& searchText, const WebFind
m_activeMatchIndexInCurrentFrame = m_lastMatchCount - 1;
}
if (selectionRect) {
- *selectionRect = ownerFrame().frameView()->contentsToWindow(m_activeMatch->boundingBox());
+ *selectionRect = ownerFrame().frameView()->contentsToRootFrame(m_activeMatch->boundingBox());
reportFindInPageSelection(*selectionRect, m_activeMatchIndexInCurrentFrame + 1, identifier);
}
}
@@ -343,7 +343,7 @@ void TextFinder::scopeStringMatches(int identifier, const WebString& searchText,
// Notify browser of new location for the selected rectangle.
reportFindInPageSelection(
- ownerFrame().frameView()->contentsToWindow(resultBounds),
+ ownerFrame().frameView()->contentsToRootFrame(resultBounds),
m_activeMatchIndexInCurrentFrame + 1,
identifier);
}
@@ -630,7 +630,7 @@ int TextFinder::selectFindMatch(unsigned index, WebRect* selectionRect)
}
// Zoom to the active match.
- activeMatchRect = ownerFrame().frameView()->contentsToWindow(activeMatchBoundingBox);
+ activeMatchRect = ownerFrame().frameView()->contentsToRootFrame(activeMatchBoundingBox);
ownerFrame().viewImpl()->zoomToFindInPageRect(activeMatchRect);
}
« no previous file with comments | « Source/web/PopupListBox.cpp ('k') | Source/web/ValidationMessageClientImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698