Changeset 92219 in webkit


Ignore:
Timestamp:
Aug 2, 2011 1:00:46 PM (13 years ago)
Author:
jochen@chromium.org
Message:

Tools: Implement WebPermissionClient::allowPlugins for layout tests
​https://bugs.webkit.org/show_bug.cgi?id=33991

Reviewed by Adam Barth.

  • DumpRenderTree/chromium/LayoutTestController.cpp:

(LayoutTestController::LayoutTestController):
(LayoutTestController::setPluginsAllowed):

  • DumpRenderTree/chromium/LayoutTestController.h:
  • DumpRenderTree/chromium/WebPermissions.cpp:

(WebPermissions::allowPlugins):
(WebPermissions::setPluginsAllowed):
(WebPermissions::reset):

  • DumpRenderTree/chromium/WebPermissions.h:

LayoutTests: Add a test for FrameLoaderClient::allowPlugins
​https://bugs.webkit.org/show_bug.cgi?id=33991

Reviewed by Adam Barth.

  • platform/chromium/permissionclient/plugin-permission-expected.txt: Added.
  • platform/chromium/permissionclient/plugin-permission.html: Added.
Location:
trunk
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r92215 r92219  
     12011-08-02  Jochen Eisinger  <jochen@chromium.org>
     2
     3        Add a test for FrameLoaderClient::allowPlugins
     4        https://bugs.webkit.org/show_bug.cgi?id=33991
     5
     6        Reviewed by Adam Barth.
     7
     8        * platform/chromium/permissionclient/plugin-permission-expected.txt: Added.
     9        * platform/chromium/permissionclient/plugin-permission.html: Added.
     10
    1112011-08-02  Zhenyao Mo  <zmo@google.com>
    212

  • trunk/Tools/ChangeLog

    r92218 r92219  
     12011-08-02  Jochen Eisinger  <jochen@chromium.org>
     2
     3        Implement WebPermissionClient::allowPlugins for layout tests
     4        https://bugs.webkit.org/show_bug.cgi?id=33991
     5
     6        Reviewed by Adam Barth.
     7
     8        * DumpRenderTree/chromium/LayoutTestController.cpp:
     9        (LayoutTestController::LayoutTestController):
     10        (LayoutTestController::setPluginsAllowed):
     11        * DumpRenderTree/chromium/LayoutTestController.h:
     12        * DumpRenderTree/chromium/WebPermissions.cpp:
     13        (WebPermissions::allowPlugins):
     14        (WebPermissions::setPluginsAllowed):
     15        (WebPermissions::reset):
     16        * DumpRenderTree/chromium/WebPermissions.h:
     17
    1182011-08-02  Adam Barth  <abarth@webkit.org>
    219

  • trunk/Tools/DumpRenderTree/chromium/LayoutTestController.cpp

    r91708 r92219  
    194194    bindMethod("setImagesAllowed", &LayoutTestController::setImagesAllowed);
    195195    bindMethod("setStorageAllowed", &LayoutTestController::setStorageAllowed);
     196    bindMethod("setPluginsAllowed", &LayoutTestController::setPluginsAllowed);
    196197
    197198    // The following are stubs.
    … …  
    768769    if (arguments.size() > 0 && arguments[0].isBool())
    769770        m_shell->webPermissions()->setStorageAllowed(arguments[0].toBoolean());
     771    result->setNull();
     772}
     773
     774void LayoutTestController::setPluginsAllowed(const CppArgumentList& arguments, CppVariant* result)
     775{
     776    if (arguments.size() > 0 && arguments[0].isBool())
     777        m_shell->webPermissions()->setPluginsAllowed(arguments[0].toBoolean());
    770778    result->setNull();
    771779}

  • trunk/Tools/DumpRenderTree/chromium/LayoutTestController.h

    r91708 r92219  
    383383    void setImagesAllowed(const CppArgumentList&, CppVariant*);
    384384    void setStorageAllowed(const CppArgumentList&, CppVariant*);
     385    void setPluginsAllowed(const CppArgumentList&, CppVariant*);
    385386
    386387    // Enable or disable plugins.

  • trunk/Tools/DumpRenderTree/chromium/WebPermissions.cpp

    r88377 r92219  
    5151}
    5252
     53bool WebPermissions::allowPlugins(WebKit::WebFrame*, bool enabledPerSettings)
     54{
     55    return enabledPerSettings && m_pluginsAllowed;
     56}
     57
    5358bool WebPermissions::allowDisplayingInsecureContent(WebKit::WebFrame*, bool enabledPerSettings,
    5459                                                    const WebKit::WebSecurityOrigin&, const WebKit::WebURL&)
    … …  
    7378}
    7479
     80void WebPermissions::setPluginsAllowed(bool pluginsAllowed)
     81{
     82    m_pluginsAllowed = pluginsAllowed;
     83}
     84
    7585void WebPermissions::setDisplayingInsecureContentAllowed(bool allowed)
    7686{
    … …  
    8797    m_imagesAllowed = true;
    8898    m_storageAllowed = true;
     99    m_pluginsAllowed = true;
    89100    m_displayingInsecureContentAllowed = false;
    90101    m_runningInsecureContentAllowed = false;

  • trunk/Tools/DumpRenderTree/chromium/WebPermissions.h

    r88377 r92219  
    4242    virtual bool allowImages(WebKit::WebFrame*, bool enabledPerSettings);
    4343    virtual bool allowStorage(WebKit::WebFrame*, bool local);
     44    virtual bool allowPlugins(WebKit::WebFrame*, bool enabledPerSettings);
    4445    virtual bool allowDisplayingInsecureContent(WebKit::WebFrame*, bool enabledPerSettings,
    4546                                                const WebKit::WebSecurityOrigin&, const WebKit::WebURL&);
    … …  
    5051    void setImagesAllowed(bool);
    5152    void setStorageAllowed(bool);
     53    void setPluginsAllowed(bool);
    5254    void setDisplayingInsecureContentAllowed(bool);
    5355    void setRunningInsecureContentAllowed(bool);
    … …  
    5961    bool m_imagesAllowed;
    6062    bool m_storageAllowed;
     63    bool m_pluginsAllowed;
    6164    bool m_displayingInsecureContentAllowed;
    6265    bool m_runningInsecureContentAllowed;
Note: See TracChangeset for help on using the changeset viewer.