Source/web/TextFinder.cpp - Issue 1231673007: Don't zoom in TextFinder if autosizing is disabled

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/web/TextFinder.cpp

Issue 1231673007: Don't zoom in TextFinder if autosizing is disabled (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 5 years, 5 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

Index: Source/web/TextFinder.cpp

diff --git a/Source/web/TextFinder.cpp b/Source/web/TextFinder.cpp

index b280418d0399d52adcaf9a8c97f6917700c3fce5..7c05a16c3e90ac061dd80e9c8adf7db2fea30b98 100644

--- a/Source/web/TextFinder.cpp

+++ b/Source/web/TextFinder.cpp

@@ -155,9 +155,9 @@ bool TextFinder::find(int identifier, const WebString& searchText, const WebFind

return false;

}

-#if OS(ANDROID)

- ownerFrame().viewImpl()->zoomToFindInPageRect(ownerFrame().frameView()->contentsToRootFrame(enclosingIntRect(LayoutObject::absoluteBoundingBoxRectForRange(m_activeMatch.get()))));

-#endif

+ if (ownerFrame().frame()->document()->textAutosizer()->pageNeedsAutosizing()) {

skobes 2015/07/14 17:11:27 Can you add a comment explaining why the check is

+ ownerFrame().viewImpl()->zoomToFindInPageRect(ownerFrame().frameView()->contentsToRootFrame(enclosingIntRect(LayoutObject::absoluteBoundingBoxRectForRange(m_activeMatch.get()))));

+ }

setMarkerActive(m_activeMatch.get(), true);

WebLocalFrameImpl* oldActiveFrame = mainFrameImpl->ensureTextFinder().m_currentActiveMatchFrame;

« Source/web/TextFinder.h ('K') | « Source/web/TextFinder.h ('k') | no next file » | no next file with comments »