Changeset 112088 in webkit


Ignore:
Timestamp:
Mar 26, 2012 7:16:12 AM (12 years ago)
Author:
commit-queue@webkit.org
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 <tdanderson@chromium.org> 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):

Location:
trunk/Source/WebKit/chromium
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/chromium/ChangeLog

    r112059 r112088  
     12012-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
    1192012-03-25  Nat Duca  <nduca@chromium.org>
    220
  • trunk/Source/WebKit/chromium/public/WebSettings.h

    r111610 r112088  
    146146    virtual void setPartialSwapEnabled(bool) = 0;
    147147    virtual void setThreadedAnimationEnabled(bool) = 0;
     148    virtual void setViewportEnabled(bool) = 0;
     149    virtual bool viewportEnabled() const = 0;
    148150
    149151protected:
  • trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp

    r110595 r112088  
    640640{
    641641#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())
    643643        return;
    644644
  • trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp

    r111610 r112088  
    5151    , m_showFPSCounter(false)
    5252    , m_showPlatformLayerTree(false)
     53    , m_viewportEnabled(false)
    5354{
    5455    ASSERT(settings);
     
    559560}
    560561
     562void WebSettingsImpl::setViewportEnabled(bool enabled)
     563{
     564    m_viewportEnabled = enabled;
     565}
     566
    561567} // namespace WebKit
  • trunk/Source/WebKit/chromium/src/WebSettingsImpl.h

    r111610 r112088  
    141141    virtual void setPartialSwapEnabled(bool);
    142142    virtual void setThreadedAnimationEnabled(bool);
     143    virtual void setViewportEnabled(bool);
     144    virtual bool viewportEnabled() const { return m_viewportEnabled; }
    143145
    144146private:
     
    147149    bool m_showFPSCounter;
    148150    bool m_showPlatformLayerTree;
     151    bool m_viewportEnabled;
    149152};
    150153
Note: See TracChangeset for help on using the changeset viewer.