Changeset 87860 in webkit


Ignore:
Timestamp:
Jun 1, 2011 3:57:33 PM (13 years ago)
Author:
jochen@chromium.org
Message:

2011-06-01 Jochen Eisinger <​jochen@chromium.org>

Reviewed by Adam Barth.

Add a test for FrameLoaderClient::allowImages
​https://bugs.webkit.org/show_bug.cgi?id=34314

  • platform/chromium/permissionclient/image-permissions-expected.txt: Added.
  • platform/chromium/permissionclient/image-permissions.html: Added.
  • platform/chromium/permissionclient/resources/boston.gif: Added.
  • platform/chromium/permissionclient/resources/image.html: Added.

2011-06-01 Jochen Eisinger <​jochen@chromium.org>

Reviewed by Adam Barth.

Implement layoutTestController.setImagesAllowed for controlling the respective behavior of the WebPermissionClient
​https://bugs.webkit.org/show_bug.cgi?id=34314

  • DumpRenderTree/DumpRenderTree.gypi:
  • DumpRenderTree/chromium/LayoutTestController.cpp: (LayoutTestController::LayoutTestController): (LayoutTestController::setImagesAllowed): (LayoutTestController::setStorageAllowed):
  • DumpRenderTree/chromium/LayoutTestController.h:
  • DumpRenderTree/chromium/WebPermissions.cpp: Copied from Tools/DumpRenderTree/chromium/WebPermissions.h. (WebPermissions::WebPermissions): (WebPermissions::~WebPermissions): (WebPermissions::allowImages): (WebPermissions::allowStorage): (WebPermissions::setImagesAllowed): (WebPermissions::setStorageAllowed): (WebPermissions::reset):
  • DumpRenderTree/chromium/WebPermissions.h:
Location:
trunk
Files:
5 added
6 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r87859 r87860  
     12011-06-01  Jochen Eisinger  <jochen@chromium.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Add a test for FrameLoaderClient::allowImages
     6        https://bugs.webkit.org/show_bug.cgi?id=34314
     7
     8        * platform/chromium/permissionclient/image-permissions-expected.txt: Added.
     9        * platform/chromium/permissionclient/image-permissions.html: Added.
     10        * platform/chromium/permissionclient/resources/boston.gif: Added.
     11        * platform/chromium/permissionclient/resources/image.html: Added.
     12
    1132011-06-01  Adam Barth  <abarth@webkit.org>
    214

  • trunk/Tools/ChangeLog

    r87855 r87860  
     12011-06-01  Jochen Eisinger  <jochen@chromium.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Implement layoutTestController.setImagesAllowed for controlling the respective behavior of the WebPermissionClient
     6        https://bugs.webkit.org/show_bug.cgi?id=34314
     7
     8        * DumpRenderTree/DumpRenderTree.gypi:
     9        * DumpRenderTree/chromium/LayoutTestController.cpp:
     10        (LayoutTestController::LayoutTestController):
     11        (LayoutTestController::setImagesAllowed):
     12        (LayoutTestController::setStorageAllowed):
     13        * DumpRenderTree/chromium/LayoutTestController.h:
     14        * DumpRenderTree/chromium/WebPermissions.cpp: Copied from Tools/DumpRenderTree/chromium/WebPermissions.h.
     15        (WebPermissions::WebPermissions):
     16        (WebPermissions::~WebPermissions):
     17        (WebPermissions::allowImages):
     18        (WebPermissions::allowStorage):
     19        (WebPermissions::setImagesAllowed):
     20        (WebPermissions::setStorageAllowed):
     21        (WebPermissions::reset):
     22        * DumpRenderTree/chromium/WebPermissions.h:
     23
    1242011-06-01  Noel Gordon  <noel.gordon@gmail.com>
    225

  • trunk/Tools/DumpRenderTree/DumpRenderTree.gypi

    r86487 r87860  
    3838            'chromium/TextInputController.cpp',
    3939            'chromium/TextInputController.h',
     40            'chromium/WebPermissions.cpp',
     41            'chromium/WebPermissions.h',
    4042            'chromium/WebPreferences.cpp',
    4143            'chromium/WebPreferences.h',

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

    r87770 r87860  
    192192    bindMethod("windowCount", &LayoutTestController::windowCount);
    193193    bindMethod("setTextDirection", &LayoutTestController::setTextDirection);
     194    bindMethod("setImagesAllowed", &LayoutTestController::setImagesAllowed);
     195    bindMethod("setStorageAllowed", &LayoutTestController::setStorageAllowed);
    194196
    195197    // The following are stubs.
    … …  
    217219    bindMethod("observeStorageTrackerNotifications", &LayoutTestController::observeStorageTrackerNotifications);
    218220    bindMethod("syncLocalStorage", &LayoutTestController::syncLocalStorage);
    219     bindMethod("setStorageAllowed", &LayoutTestController::setStorageAllowed);
    220221   
    221222    // The fallback method is called when an unknown method is invoked.
    … …  
    819820        m_shell->applyPreferences();
    820821    }
     822    result->setNull();
     823}
     824
     825void LayoutTestController::setImagesAllowed(const CppArgumentList& arguments, CppVariant* result)
     826{
     827    if (arguments.size() > 0 && arguments[0].isBool())
     828        m_shell->webPermissions()->setImagesAllowed(arguments[0].toBoolean());
     829    result->setNull();
     830}
     831
     832void LayoutTestController::setStorageAllowed(const CppArgumentList& arguments, CppVariant* result)
     833{
     834    if (arguments.size() > 0 && arguments[0].isBool())
     835        m_shell->webPermissions()->setStorageAllowed(arguments[0].toBoolean());
    821836    result->setNull();
    822837}
    … …  
    18241839}
    18251840
    1826 void LayoutTestController::setStorageAllowed(const CppArgumentList& arguments, CppVariant* result)
    1827 {
    1828     if (arguments.size() > 0 && arguments[0].isBool())
    1829         m_shell->webPermissions()->setStorageAllowed(arguments[0].toBoolean());
    1830     result->setNull();
    1831 }
    1832 
    18331841void LayoutTestController::setPluginsEnabled(const CppArgumentList& arguments, CppVariant* result)
    18341842{

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

    r87770 r87860  
    370370    void observeStorageTrackerNotifications(const CppArgumentList&, CppVariant*);
    371371    void syncLocalStorage(const CppArgumentList&, CppVariant*);
     372
     373    // WebPermissionClient related.
     374    void setImagesAllowed(const CppArgumentList&, CppVariant*);
    372375    void setStorageAllowed(const CppArgumentList&, CppVariant*);
    373376

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

    r87859 r87860  
    2929 */
    3030
    31 #ifndef WebPermissions_h
    32 #define WebPermissions_h
     31#include "config.h"
     32#include "WebPermissions.h"
    3333
    34 #include "WebPermissionClient.h"
     34WebPermissions::WebPermissions()
     35{
     36    reset();
     37}
    3538
    36 class WebPermissions : public WebKit::WebPermissionClient {
    37 public:
    38     WebPermissions() : m_storageAllowed(true) { }
     39WebPermissions::~WebPermissions()
     40{
     41}
    3942
    40     virtual bool allowStorage(WebKit::WebFrame*, bool local) { return m_storageAllowed; }
     43bool WebPermissions::allowImages(WebKit::WebFrame*, bool enabledPerSettings)
     44{
     45    return enabledPerSettings && m_imagesAllowed;
     46}
    4147
    42     // Sets the policy whether to allow storage or not.
    43     void setStorageAllowed(bool storageAllowed) { m_storageAllowed = storageAllowed; }
     48bool WebPermissions::allowStorage(WebKit::WebFrame*, bool)
     49{
     50    return m_storageAllowed;
     51}
    4452
    45     // Resets the policy to allow all access.
    46     void reset() { m_storageAllowed = true; }
     53void WebPermissions::setImagesAllowed(bool imagesAllowed)
     54{
     55    m_imagesAllowed = imagesAllowed;
     56}
    4757
    48 private:
    49     bool m_storageAllowed;
    50 };
     58void WebPermissions::setStorageAllowed(bool storageAllowed)
     59{
     60    m_storageAllowed = storageAllowed;
     61}
    5162
    52 #endif
     63void WebPermissions::reset()
     64{
     65    m_imagesAllowed = true;
     66    m_storageAllowed = true;
     67}

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

    r87597 r87860  
    3636class WebPermissions : public WebKit::WebPermissionClient {
    3737public:
    38     WebPermissions() : m_storageAllowed(true) { }
     38    WebPermissions();
     39    virtual ~WebPermissions();
    3940
    40     virtual bool allowStorage(WebKit::WebFrame*, bool local) { return m_storageAllowed; }
     41    virtual bool allowImages(WebKit::WebFrame*, bool enabledPerSettings);
     42    virtual bool allowStorage(WebKit::WebFrame*, bool local);
    4143
    42     // Sets the policy whether to allow storage or not.
    43     void setStorageAllowed(bool storageAllowed) { m_storageAllowed = storageAllowed; }
     44    // Sets the different policies.
     45    void setImagesAllowed(bool);
     46    void setStorageAllowed(bool);
    4447
    4548    // Resets the policy to allow all access.
    46     void reset() { m_storageAllowed = true; }
     49    void reset();
    4750
    4851private:
     52    bool m_imagesAllowed;
    4953    bool m_storageAllowed;
    5054};
Note: See TracChangeset for help on using the changeset viewer.