Changeset 73055 in webkit


Ignore:
Timestamp:
Dec 1, 2010 12:04:05 PM (13 years ago)
Author:
vangelis@chromium.org
Message:

2010-11-30 Vangelis Kokkevis <​vangelis@chromium.org>

Reviewed by Darin Fisher.

Get the value of the accelerated compositing triggers from the Settings
class. This allows setting the triggers via command line flags.
​https://bugs.webkit.org/show_bug.cgi?id=50301

  • public/WebSettings.h:
  • src/ChromeClientImpl.cpp: (WebKit::ChromeClientImpl::allowedCompositingTriggers):
  • src/WebSettingsImpl.cpp: (WebKit::WebSettingsImpl::setAcceleratedCompositingFor3DTransformsEnabled): (WebKit::WebSettingsImpl::setAcceleratedCompositingForVideoEnabled): (WebKit::WebSettingsImpl::setAcceleratedCompositingForPluginsEnabled): (WebKit::WebSettingsImpl::setAcceleratedCompositingForCanvasEnabled): (WebKit::WebSettingsImpl::setAcceleratedCompositingForAnimationEnabled):
  • src/WebSettingsImpl.h:

2010-11-30 Vangelis Kokkevis <​vangelis@chromium.org>

Reviewed by Darin Fisher.

Adds accelerated compositing trigger flags to Settings to allow
ports to set them via command line flags, etc.
​https://bugs.webkit.org/show_bug.cgi?id=50301

  • page/Settings.cpp: (WebCore::Settings::Settings): (WebCore::Settings::setAcceleratedCompositingFor3DTransformsEnabled): (WebCore::Settings::setAcceleratedCompositingForVideoEnabled): (WebCore::Settings::setAcceleratedCompositingForPluginsEnabled): (WebCore::Settings::setAcceleratedCompositingForCanvasEnabled): (WebCore::Settings::setAcceleratedCompositingForAnimationEnabled):
  • page/Settings.h: (WebCore::Settings::acceleratedCompositingFor3DTransformsEnabled): (WebCore::Settings::acceleratedCompositingForVideoEnabled): (WebCore::Settings::acceleratedCompositingForPluginsEnabled): (WebCore::Settings::acceleratedCompositingForCanvasEnabled): (WebCore::Settings::acceleratedCompositingForAnimationEnabled):
Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r73053 r73055  
     12010-11-30  Vangelis Kokkevis  <vangelis@chromium.org>
     2
     3        Reviewed by Darin Fisher.
     4
     5        Adds accelerated compositing trigger flags to Settings to allow
     6        ports to set them via command line flags, etc.
     7        https://bugs.webkit.org/show_bug.cgi?id=50301
     8
     9        * page/Settings.cpp:
     10        (WebCore::Settings::Settings):
     11        (WebCore::Settings::setAcceleratedCompositingFor3DTransformsEnabled):
     12        (WebCore::Settings::setAcceleratedCompositingForVideoEnabled):
     13        (WebCore::Settings::setAcceleratedCompositingForPluginsEnabled):
     14        (WebCore::Settings::setAcceleratedCompositingForCanvasEnabled):
     15        (WebCore::Settings::setAcceleratedCompositingForAnimationEnabled):
     16        * page/Settings.h:
     17        (WebCore::Settings::acceleratedCompositingFor3DTransformsEnabled):
     18        (WebCore::Settings::acceleratedCompositingForVideoEnabled):
     19        (WebCore::Settings::acceleratedCompositingForPluginsEnabled):
     20        (WebCore::Settings::acceleratedCompositingForCanvasEnabled):
     21        (WebCore::Settings::acceleratedCompositingForAnimationEnabled):
     22
    1232010-12-01  Darin Adler  <darin@apple.com>
    224
    … …  
    469491        * html/TextFieldInputType.h:
    470492
     493>>>>>>> .r73054
    4714942010-11-30  Patrick Gansterer  <paroga@webkit.org>
    472495

  • trunk/WebCore/page/Settings.cpp

    r72612 r73055  
    148148    , m_xssAuditorEnabled(false)
    149149    , m_acceleratedCompositingEnabled(true)
     150    , m_acceleratedCompositingFor3DTransformsEnabled(true)
     151    , m_acceleratedCompositingForVideoEnabled(true)
     152    , m_acceleratedCompositingForPluginsEnabled(true)
     153    , m_acceleratedCompositingForCanvasEnabled(true)
     154    , m_acceleratedCompositingForAnimationEnabled(true)
    150155    , m_showDebugBorders(false)
    151156    , m_showRepaintCounter(false)
    … …  
    585590}
    586591
     592void Settings::setAcceleratedCompositingFor3DTransformsEnabled(bool enabled)
     593{
     594    m_acceleratedCompositingFor3DTransformsEnabled = enabled;
     595}
     596
     597void Settings::setAcceleratedCompositingForVideoEnabled(bool enabled)
     598{
     599    m_acceleratedCompositingForVideoEnabled = enabled;
     600}
     601
     602void Settings::setAcceleratedCompositingForPluginsEnabled(bool enabled)
     603{
     604    m_acceleratedCompositingForPluginsEnabled = enabled;
     605}
     606
     607void Settings::setAcceleratedCompositingForCanvasEnabled(bool enabled)
     608{
     609    m_acceleratedCompositingForCanvasEnabled = enabled;
     610}
     611
     612void Settings::setAcceleratedCompositingForAnimationEnabled(bool enabled)
     613{
     614    m_acceleratedCompositingForAnimationEnabled = enabled;
     615}
     616
    587617void Settings::setShowDebugBorders(bool enabled)
    588618{

  • trunk/WebCore/page/Settings.h

    r72612 r73055  
    279279        void setAcceleratedCompositingEnabled(bool);
    280280        bool acceleratedCompositingEnabled() const { return m_acceleratedCompositingEnabled; }
     281
     282        void setAcceleratedCompositingFor3DTransformsEnabled(bool);
     283        bool acceleratedCompositingFor3DTransformsEnabled() const { return m_acceleratedCompositingFor3DTransformsEnabled; }
     284
     285        void setAcceleratedCompositingForVideoEnabled(bool);
     286        bool acceleratedCompositingForVideoEnabled() const { return m_acceleratedCompositingForVideoEnabled; }
     287
     288        void setAcceleratedCompositingForPluginsEnabled(bool);
     289        bool acceleratedCompositingForPluginsEnabled() const { return m_acceleratedCompositingForPluginsEnabled; }
     290
     291        void setAcceleratedCompositingForCanvasEnabled(bool);
     292        bool acceleratedCompositingForCanvasEnabled() const { return m_acceleratedCompositingForCanvasEnabled; }
     293
     294        void setAcceleratedCompositingForAnimationEnabled(bool);
     295        bool acceleratedCompositingForAnimationEnabled() const { return m_acceleratedCompositingForAnimationEnabled; }
    281296
    282297        void setShowDebugBorders(bool);
    … …  
    407422        bool m_xssAuditorEnabled : 1;
    408423        bool m_acceleratedCompositingEnabled : 1;
     424        bool m_acceleratedCompositingFor3DTransformsEnabled : 1;
     425        bool m_acceleratedCompositingForVideoEnabled : 1;
     426        bool m_acceleratedCompositingForPluginsEnabled : 1;
     427        bool m_acceleratedCompositingForCanvasEnabled : 1;
     428        bool m_acceleratedCompositingForAnimationEnabled : 1;
    409429        bool m_showDebugBorders : 1;
    410430        bool m_showRepaintCounter : 1;

  • trunk/WebKit/chromium/ChangeLog

    r73038 r73055  
     12010-11-30  Vangelis Kokkevis  <vangelis@chromium.org>
     2
     3        Reviewed by Darin Fisher.
     4
     5        Get the value of the accelerated compositing triggers from the Settings
     6        class.  This allows setting the triggers via command line flags.
     7        https://bugs.webkit.org/show_bug.cgi?id=50301
     8
     9        * public/WebSettings.h:
     10        * src/ChromeClientImpl.cpp:
     11        (WebKit::ChromeClientImpl::allowedCompositingTriggers):
     12        * src/WebSettingsImpl.cpp:
     13        (WebKit::WebSettingsImpl::setAcceleratedCompositingFor3DTransformsEnabled):
     14        (WebKit::WebSettingsImpl::setAcceleratedCompositingForVideoEnabled):
     15        (WebKit::WebSettingsImpl::setAcceleratedCompositingForPluginsEnabled):
     16        (WebKit::WebSettingsImpl::setAcceleratedCompositingForCanvasEnabled):
     17        (WebKit::WebSettingsImpl::setAcceleratedCompositingForAnimationEnabled):
     18        * src/WebSettingsImpl.h:
     19
    1202010-12-01  Tony Chang  <tony@chromium.org>
    221

  • trunk/WebKit/chromium/public/WebSettings.h

    r72196 r73055  
    9494    virtual void setEditingBehavior(EditingBehavior) = 0;
    9595    virtual void setAcceleratedCompositingEnabled(bool) = 0;
     96    virtual void setAcceleratedCompositingFor3DTransformsEnabled(bool) = 0;
     97    virtual void setAcceleratedCompositingForVideoEnabled(bool) = 0;
     98    virtual void setAcceleratedCompositingForCanvasEnabled(bool) = 0;
     99    virtual void setAcceleratedCompositingForPluginsEnabled(bool) = 0;
     100    virtual void setAcceleratedCompositingForAnimationEnabled(bool) = 0;
    96101    virtual void setAccelerated2dCanvasEnabled(bool) = 0;
    97102    virtual void setMemoryInfoEnabled(bool) = 0;

  • trunk/WebKit/chromium/src/ChromeClientImpl.cpp

    r72954 r73055  
    6262#include "SearchPopupMenuChromium.h"
    6363#include "SecurityOrigin.h"
     64#include "Settings.h"
    6465#if USE(V8)
    6566#include "V8Proxy.h"
    … …  
    813814        return 0;
    814815
    815     return ChromeClient::AllTriggers;
     816    CompositingTriggerFlags flags = 0;
     817    Settings* settings = m_webView->page()->settings();
     818    if (settings->acceleratedCompositingFor3DTransformsEnabled())
     819        flags |= ThreeDTransformTrigger;
     820    if (settings->acceleratedCompositingForVideoEnabled())
     821        flags |= VideoTrigger;
     822    if (settings->acceleratedCompositingForPluginsEnabled())
     823        flags |= PluginTrigger;
     824    if (settings->acceleratedCompositingForAnimationEnabled())
     825        flags |= AnimationTrigger;
     826    if (settings->acceleratedCompositingForCanvasEnabled())
     827        flags |= CanvasTrigger;
     828
     829    return flags;
    816830}
    817831#endif

  • trunk/WebKit/chromium/src/WebSettingsImpl.cpp

    r72196 r73055  
    285285}
    286286
     287void WebSettingsImpl::setAcceleratedCompositingFor3DTransformsEnabled(bool enabled)
     288{
     289    m_settings->setAcceleratedCompositingFor3DTransformsEnabled(enabled);
     290}
     291
     292void WebSettingsImpl::setAcceleratedCompositingForVideoEnabled(bool enabled)
     293{
     294    m_settings->setAcceleratedCompositingForVideoEnabled(enabled);
     295}
     296
     297void WebSettingsImpl::setAcceleratedCompositingForPluginsEnabled(bool enabled)
     298{
     299    m_settings->setAcceleratedCompositingForPluginsEnabled(enabled);
     300}
     301
     302void WebSettingsImpl::setAcceleratedCompositingForCanvasEnabled(bool enabled)
     303{
     304    m_settings->setAcceleratedCompositingForCanvasEnabled(enabled);
     305}
     306
     307void WebSettingsImpl::setAcceleratedCompositingForAnimationEnabled(bool enabled)
     308{
     309    m_settings->setAcceleratedCompositingForAnimationEnabled(enabled);
     310}
     311
    287312void WebSettingsImpl::setAccelerated2dCanvasEnabled(bool enabled)
    288313{

  • trunk/WebKit/chromium/src/WebSettingsImpl.h

    r72196 r73055  
    8989    virtual void setEditingBehavior(EditingBehavior);
    9090    virtual void setAcceleratedCompositingEnabled(bool);
     91    virtual void setAcceleratedCompositingFor3DTransformsEnabled(bool);
     92    virtual void setAcceleratedCompositingForVideoEnabled(bool);
     93    virtual void setAcceleratedCompositingForPluginsEnabled(bool);
     94    virtual void setAcceleratedCompositingForCanvasEnabled(bool);
     95    virtual void setAcceleratedCompositingForAnimationEnabled(bool);   
    9196    virtual void setAccelerated2dCanvasEnabled(bool);
    9297    virtual void setMemoryInfoEnabled(bool);
Note: See TracChangeset for help on using the changeset viewer.