Title: [112088] trunk/Source/WebKit/chromium
- Revision
- 112088
- Author
- [email protected]
- Date
- 2012-03-26 07:16:12 -0700 (Mon, 26 Mar 2012)
Log Message
[chromium] Allow the viewport meta tag to be disabled for testing purposes
https://bugs.webkit.org/show_bug.cgi?id=81940
Patch by Terry Anderson <[email protected]> on 2012-03-26
Reviewed by Adam Barth.
* public/WebSettings.h:
* src/ChromeClientImpl.cpp:
(WebKit::ChromeClientImpl::dispatchViewportPropertiesDidChange):
* src/WebSettingsImpl.cpp:
(WebKit::WebSettingsImpl::WebSettingsImpl):
(WebKit::WebSettingsImpl::setViewportEnabled):
(WebKit):
* src/WebSettingsImpl.h:
(WebSettingsImpl):
(WebKit::WebSettingsImpl::viewportEnabled):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (112087 => 112088)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-03-26 14:04:50 UTC (rev 112087)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-03-26 14:16:12 UTC (rev 112088)
@@ -1,3 +1,21 @@
+2012-03-26 Terry Anderson <[email protected]>
+
+ [chromium] Allow the viewport meta tag to be disabled for testing purposes
+ https://bugs.webkit.org/show_bug.cgi?id=81940
+
+ Reviewed by Adam Barth.
+
+ * public/WebSettings.h:
+ * src/ChromeClientImpl.cpp:
+ (WebKit::ChromeClientImpl::dispatchViewportPropertiesDidChange):
+ * src/WebSettingsImpl.cpp:
+ (WebKit::WebSettingsImpl::WebSettingsImpl):
+ (WebKit::WebSettingsImpl::setViewportEnabled):
+ (WebKit):
+ * src/WebSettingsImpl.h:
+ (WebSettingsImpl):
+ (WebKit::WebSettingsImpl::viewportEnabled):
+
2012-03-25 Nat Duca <[email protected]>
[chromium] Route willBeginFrame from compositor to WebWidget
Modified: trunk/Source/WebKit/chromium/public/WebSettings.h (112087 => 112088)
--- trunk/Source/WebKit/chromium/public/WebSettings.h 2012-03-26 14:04:50 UTC (rev 112087)
+++ trunk/Source/WebKit/chromium/public/WebSettings.h 2012-03-26 14:16:12 UTC (rev 112088)
@@ -145,6 +145,8 @@
virtual void setPerTilePaintingEnabled(bool) = 0;
virtual void setPartialSwapEnabled(bool) = 0;
virtual void setThreadedAnimationEnabled(bool) = 0;
+ virtual void setViewportEnabled(bool) = 0;
+ virtual bool viewportEnabled() const = 0;
protected:
~WebSettings() { }
Modified: trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp (112087 => 112088)
--- trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp 2012-03-26 14:04:50 UTC (rev 112087)
+++ trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp 2012-03-26 14:16:12 UTC (rev 112088)
@@ -639,7 +639,7 @@
void ChromeClientImpl::dispatchViewportPropertiesDidChange(const ViewportArguments& arguments) const
{
#if ENABLE(VIEWPORT)
- if (!m_webView->isFixedLayoutModeEnabled() || !m_webView->client() || !m_webView->page())
+ if (!m_webView->settings()->viewportEnabled() || !m_webView->isFixedLayoutModeEnabled() || !m_webView->client() || !m_webView->page())
return;
ViewportArguments args;
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp (112087 => 112088)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2012-03-26 14:04:50 UTC (rev 112087)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2012-03-26 14:16:12 UTC (rev 112088)
@@ -50,6 +50,7 @@
, m_compositeToTextureEnabled(false)
, m_showFPSCounter(false)
, m_showPlatformLayerTree(false)
+ , m_viewportEnabled(false)
{
ASSERT(settings);
}
@@ -558,4 +559,9 @@
m_settings->setThreadedAnimationEnabled(enabled);
}
+void WebSettingsImpl::setViewportEnabled(bool enabled)
+{
+ m_viewportEnabled = enabled;
+}
+
} // namespace WebKit
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.h (112087 => 112088)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2012-03-26 14:04:50 UTC (rev 112087)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2012-03-26 14:16:12 UTC (rev 112088)
@@ -140,12 +140,15 @@
virtual void setPerTilePaintingEnabled(bool);
virtual void setPartialSwapEnabled(bool);
virtual void setThreadedAnimationEnabled(bool);
+ virtual void setViewportEnabled(bool);
+ virtual bool viewportEnabled() const { return m_viewportEnabled; }
private:
WebCore::Settings* m_settings;
bool m_compositeToTextureEnabled;
bool m_showFPSCounter;
bool m_showPlatformLayerTree;
+ bool m_viewportEnabled;
};
} // namespace WebKit
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
