third_party/WebKit/Source/core/html/ImageDocument.cpp - Issue 2290233007: Move convertViewportToWindow and convertWindowToViewport from

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: third_party/WebKit/Source/core/html/ImageDocument.cpp

Issue 2290233007: Move convertViewportToWindow and convertWindowToViewport from (Closed)

Patch Set: add client to WebSharedWorkerImpl Created 4 years, 3 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:

Index: third_party/WebKit/Source/core/html/ImageDocument.cpp

diff --git a/third_party/WebKit/Source/core/html/ImageDocument.cpp b/third_party/WebKit/Source/core/html/ImageDocument.cpp

index c2b1cf0c0a6ee0cb47c1d96d688fd866d990ebd3..23ef102c3b40cc58805bdf982d1ed6d89cb9f5aa 100644

--- a/third_party/WebKit/Source/core/html/ImageDocument.cpp

+++ b/third_party/WebKit/Source/core/html/ImageDocument.cpp

@@ -262,7 +262,7 @@ float ImageDocument::scale() const

// We want to pretend the viewport is larger when the user has zoomed the

// page in (but not when the zoom is coming from device scale).

- const float manualZoom = zoom / view->getHostWindow()->windowToViewportScalar(1.f);

+ const float manualZoom = zoom / view->getHostWindow()->windowToViewportScalar(*frame()->view(), 1.f);

float widthScale = view->width() * manualZoom / imageSize.width().toFloat();

float heightScale = view->height() * manualZoom / imageSize.height().toFloat();