Changeset 98104 in webkit


Ignore:
Timestamp:
Oct 21, 2011, 9:42:19 AM (13 years ago)
Author:
zmo@google.com
Message:

Implement mechanism to enable privileged webgl extensions
​https://bugs.webkit.org/show_bug.cgi?id=70538

Reviewed by Darin Fisher.

Source/WebCore:

  • html/canvas/WebGLRenderingContext.cpp:

(WebCore::WebGLRenderingContext::allowPrivilegedExtensions): check page/Settings flag.

  • page/Settings.cpp: Add the flag.

(WebCore::Settings::Settings):
(WebCore::Settings::setPrivilegedWebGLExtensionsEnabled):

  • page/Settings.h: Ditto.

(WebCore::Settings::privilegedWebGLExtensionsEnabled):

Source/WebKit/chromium:

  • public/WebSettings.h: Add the flag.
  • src/WebSettingsImpl.cpp: Ditto.

(WebKit::WebSettingsImpl::setPrivilegedWebGLExtensionsEnabled):

  • src/WebSettingsImpl.h: Ditto.
Location:
trunk/Source
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r98103 r98104  
     12011-10-20  Zhenyao Mo  <zmo@google.com>
     2
     3        Implement mechanism to enable privileged webgl extensions
     4        https://bugs.webkit.org/show_bug.cgi?id=70538
     5
     6        Reviewed by Darin Fisher.
     7
     8        * html/canvas/WebGLRenderingContext.cpp:
     9        (WebCore::WebGLRenderingContext::allowPrivilegedExtensions): check page/Settings flag.
     10        * page/Settings.cpp: Add the flag.
     11        (WebCore::Settings::Settings):
     12        (WebCore::Settings::setPrivilegedWebGLExtensionsEnabled):
     13        * page/Settings.h: Ditto.
     14        (WebCore::Settings::privilegedWebGLExtensionsEnabled):
     15
    1162011-10-20  Pavel Podivilov  <podivilov@chromium.org>
    217

  • trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp

    r97896 r98104  
    478478bool WebGLRenderingContext::allowPrivilegedExtensions() const
    479479{
    480     // FIXME: implement this function.
     480    Page* p = canvas()->document()->page();
     481    if (p && p->settings())
     482        return p->settings()->privilegedWebGLExtensionsEnabled();
    481483    return false;
    482484}

  • trunk/Source/WebCore/page/Settings.cpp

    r98016 r98104  
    186186    , m_webGLEnabled(false)
    187187    , m_openGLMultisamplingEnabled(true)
     188    , m_privilegedWebGLExtensionsEnabled(false)
    188189    , m_webAudioEnabled(false)
    189190    , m_acceleratedCanvas2dEnabled(false)
    … …  
    791792}
    792793
     794void Settings::setPrivilegedWebGLExtensionsEnabled(bool enabled)
     795{
     796    m_privilegedWebGLExtensionsEnabled = enabled;
     797}
     798
    793799void Settings::setAccelerated2dCanvasEnabled(bool enabled)
    794800{

  • trunk/Source/WebCore/page/Settings.h

    r98016 r98104  
    342342        void setOpenGLMultisamplingEnabled(bool);
    343343        bool openGLMultisamplingEnabled() const { return m_openGLMultisamplingEnabled; }
     344
     345        void setPrivilegedWebGLExtensionsEnabled(bool);
     346        bool privilegedWebGLExtensionsEnabled() const { return m_privilegedWebGLExtensionsEnabled; }
    344347
    345348        void setAccelerated2dCanvasEnabled(bool);
    … …  
    566569        bool m_webGLEnabled : 1;
    567570        bool m_openGLMultisamplingEnabled : 1;
     571        bool m_privilegedWebGLExtensionsEnabled : 1;
    568572        bool m_webAudioEnabled : 1;
    569573        bool m_acceleratedCanvas2dEnabled : 1;

  • trunk/Source/WebKit/chromium/ChangeLog

    r98095 r98104  
     12011-10-20  Zhenyao Mo  <zmo@google.com>
     2
     3        Implement mechanism to enable privileged webgl extensions
     4        https://bugs.webkit.org/show_bug.cgi?id=70538
     5
     6        Reviewed by Darin Fisher.
     7
     8        * public/WebSettings.h: Add the flag.
     9        * src/WebSettingsImpl.cpp: Ditto.
     10        (WebKit::WebSettingsImpl::setPrivilegedWebGLExtensionsEnabled):
     11        * src/WebSettingsImpl.h: Ditto.
     12
    1132011-10-21  Yury Semikhatsky  <yurys@chromium.org>
    214

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

    r98016 r98104  
    9696    virtual void setExperimentalWebGLEnabled(bool) = 0;
    9797    virtual void setOpenGLMultisamplingEnabled(bool) = 0;
     98    virtual void setPrivilegedWebGLExtensionsEnabled(bool) = 0;
    9899    virtual void setShowDebugBorders(bool) = 0;
    99100    virtual void setShowFPSCounter(bool) = 0;

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

    r98016 r98104  
    285285}
    286286
     287void WebSettingsImpl::setPrivilegedWebGLExtensionsEnabled(bool enabled)
     288{
     289    m_settings->setPrivilegedWebGLExtensionsEnabled(enabled);
     290}
     291
    287292void WebSettingsImpl::setShowDebugBorders(bool show)
    288293{

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

    r98016 r98104  
    8888    virtual void setExperimentalWebGLEnabled(bool);
    8989    virtual void setOpenGLMultisamplingEnabled(bool);
     90    virtual void setPrivilegedWebGLExtensionsEnabled(bool);
    9091    virtual void setShowDebugBorders(bool);
    9192    virtual void setShowFPSCounter(bool);
Note: See TracChangeset for help on using the changeset viewer.