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

Unified Diff: Source/WebKit/chromium/src/WebViewImpl.cpp

Issue 13854008: Unguard VIEWPORT (always enabled) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Repatch to ToT Created 7 years, 8 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/WebKit/chromium/src/ViewportAnchor.cpp ('k') | Source/WebKit/chromium/tests/WebFrameTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebKit/chromium/src/WebViewImpl.cpp
diff --git a/Source/WebKit/chromium/src/WebViewImpl.cpp b/Source/WebKit/chromium/src/WebViewImpl.cpp
index 0464d872cd7a6fecc39293a3232e760423582675..1834624a88b629c913abcf8af48d6d768bbb87be 100644
--- a/Source/WebKit/chromium/src/WebViewImpl.cpp
+++ b/Source/WebKit/chromium/src/WebViewImpl.cpp
@@ -1647,7 +1647,6 @@ void WebViewImpl::resize(const WebSize& newSize)
m_size = newSize;
-#if ENABLE(VIEWPORT)
bool shouldAnchorAndRescaleViewport = settings()->viewportEnabled() && oldSize.width && oldContentsWidth;
ViewportAnchor viewportAnchor(mainFrameImpl()->frame()->eventHandler());
if (shouldAnchorAndRescaleViewport) {
@@ -1657,7 +1656,6 @@ void WebViewImpl::resize(const WebSize& newSize)
ViewportArguments viewportArguments = mainFrameImpl()->frame()->document()->viewportArguments();
m_page->chrome()->client()->dispatchViewportPropertiesDidChange(viewportArguments);
-#endif
WebDevToolsAgentPrivate* agentPrivate = devToolsAgentPrivate();
if (agentPrivate)
@@ -1668,7 +1666,6 @@ void WebViewImpl::resize(const WebSize& newSize)
webFrame->frameView()->resize(m_size);
}
-#if ENABLE(VIEWPORT)
if (settings()->viewportEnabled()) {
// Relayout immediately to recalculate the minimum scale limit.
if (view->needsLayout())
@@ -1691,7 +1688,6 @@ void WebViewImpl::resize(const WebSize& newSize)
}
}
}
-#endif
sendResizeEventAndRepaint();
}
« no previous file with comments | « Source/WebKit/chromium/src/ViewportAnchor.cpp ('k') | Source/WebKit/chromium/tests/WebFrameTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698