Changeset 112088 in webkit
- Timestamp:
- Mar 26, 2012 7:16:12 AM (12 years ago)
- Location:
- trunk/Source/WebKit/chromium
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/chromium/ChangeLog
r112059 r112088 1 2012-03-26 Terry Anderson <tdanderson@chromium.org> 2 3 [chromium] Allow the viewport meta tag to be disabled for testing purposes 4 https://bugs.webkit.org/show_bug.cgi?id=81940 5 6 Reviewed by Adam Barth. 7 8 * public/WebSettings.h: 9 * src/ChromeClientImpl.cpp: 10 (WebKit::ChromeClientImpl::dispatchViewportPropertiesDidChange): 11 * src/WebSettingsImpl.cpp: 12 (WebKit::WebSettingsImpl::WebSettingsImpl): 13 (WebKit::WebSettingsImpl::setViewportEnabled): 14 (WebKit): 15 * src/WebSettingsImpl.h: 16 (WebSettingsImpl): 17 (WebKit::WebSettingsImpl::viewportEnabled): 18 1 19 2012-03-25 Nat Duca <nduca@chromium.org> 2 20 -
trunk/Source/WebKit/chromium/public/WebSettings.h
r111610 r112088 146 146 virtual void setPartialSwapEnabled(bool) = 0; 147 147 virtual void setThreadedAnimationEnabled(bool) = 0; 148 virtual void setViewportEnabled(bool) = 0; 149 virtual bool viewportEnabled() const = 0; 148 150 149 151 protected: -
trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp
r110595 r112088 640 640 { 641 641 #if ENABLE(VIEWPORT) 642 if (!m_webView-> isFixedLayoutModeEnabled() || !m_webView->client() || !m_webView->page())642 if (!m_webView->settings()->viewportEnabled() || !m_webView->isFixedLayoutModeEnabled() || !m_webView->client() || !m_webView->page()) 643 643 return; 644 644 -
trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp
r111610 r112088 51 51 , m_showFPSCounter(false) 52 52 , m_showPlatformLayerTree(false) 53 , m_viewportEnabled(false) 53 54 { 54 55 ASSERT(settings); … … 559 560 } 560 561 562 void WebSettingsImpl::setViewportEnabled(bool enabled) 563 { 564 m_viewportEnabled = enabled; 565 } 566 561 567 } // namespace WebKit -
trunk/Source/WebKit/chromium/src/WebSettingsImpl.h
r111610 r112088 141 141 virtual void setPartialSwapEnabled(bool); 142 142 virtual void setThreadedAnimationEnabled(bool); 143 virtual void setViewportEnabled(bool); 144 virtual bool viewportEnabled() const { return m_viewportEnabled; } 143 145 144 146 private: … … 147 149 bool m_showFPSCounter; 148 150 bool m_showPlatformLayerTree; 151 bool m_viewportEnabled; 149 152 }; 150 153
Note: See TracChangeset
for help on using the changeset viewer.