Changeset 152081 in webkit


Ignore:
Timestamp:
Jun 27, 2013 12:00:00 AM (11 years ago)
Author:
Carlos Garcia Campos
Message:

[BlackBerry] Handle testRunner.setCustomPolicyDelegate()
https://bugs.webkit.org/show_bug.cgi?id=117982

Patch by Carlos Garcia Campos <cargarcia@blackberry.com> on 2013-06-26
Reviewed by Rob Buis.

Source/WebKit/blackberry:

Take custom policy into account when deciding the policy for
navigation actions.

Fixes test fast/loader/onload-policy-ignore-for-frame.html.

  • Api/DumpRenderTreeClient.h:
  • WebCoreSupport/FrameLoaderClientBlackBerry.cpp:

(WebCore::FrameLoaderClientBlackBerry::dispatchDecidePolicyForNavigationAction):
If custom policy is enabled ignore the navigation action when it's
not permissive.

Tools:

  • DumpRenderTree/blackberry/DumpRenderTree.cpp:

(BlackBerry::WebKit::DumpRenderTree::DumpRenderTree): Initialize
m_policyDelegateIsPermissive.
(BlackBerry::WebKit::DumpRenderTree::resetToConsistentStateBeforeTesting):
Reset m_policyDelegateIsPermissive.
(BlackBerry::WebKit::DumpRenderTree::setCustomPolicyDelegate): Set
m_policyDelegateIsPermissive.

  • DumpRenderTree/blackberry/DumpRenderTreeBlackBerry.h:

(BlackBerry::WebKit::DumpRenderTree::policyDelegateEnabled):
Return whether custom policy is enabled.
(BlackBerry::WebKit::DumpRenderTree::policyDelegateIsPermissive):
Return whether custom policy is permissive.

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/blackberry/Api/DumpRenderTreeClient.h

    r151780 r152081  
    6161    virtual void didDispatchWillPerformClientRedirect() = 0;
    6262    virtual void didHandleOnloadEventsForFrame(WebCore::Frame*) = 0;
     63    virtual bool policyDelegateIsPermissive() const = 0;
     64    virtual bool policyDelegateEnabled() const = 0;
    6365
    6466    // ChromeClient delegates
  • trunk/Source/WebKit/blackberry/ChangeLog

    r151996 r152081  
     12013-06-26  Carlos Garcia Campos  <cargarcia@blackberry.com>
     2
     3        [BlackBerry] Handle testRunner.setCustomPolicyDelegate()
     4        https://bugs.webkit.org/show_bug.cgi?id=117982
     5
     6        Reviewed by Rob Buis.
     7
     8        Take custom policy into account when deciding the policy for
     9        navigation actions.
     10
     11        Fixes test fast/loader/onload-policy-ignore-for-frame.html.
     12
     13        * Api/DumpRenderTreeClient.h:
     14        * WebCoreSupport/FrameLoaderClientBlackBerry.cpp:
     15        (WebCore::FrameLoaderClientBlackBerry::dispatchDecidePolicyForNavigationAction):
     16        If custom policy is enabled ignore the navigation action when it's
     17        not permissive.
     18
    1192013-06-26  Kangil Han  <kangil.han@samsung.com>
    220
  • trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp

    r151780 r152081  
    223223        dispatchDidCancelClientRedirect();
    224224
    225     if (m_webPagePrivate->m_dumpRenderTree)
     225    if (m_webPagePrivate->m_dumpRenderTree) {
    226226        m_webPagePrivate->m_dumpRenderTree->didDecidePolicyForNavigationAction(action, request, m_frame);
     227        if (m_webPagePrivate->m_dumpRenderTree->policyDelegateEnabled())
     228            decision = m_webPagePrivate->m_dumpRenderTree->policyDelegateIsPermissive() ? PolicyUse : PolicyIgnore;
     229    }
    227230
    228231    (m_frame->loader()->policyChecker()->*function)(decision);
  • trunk/Tools/ChangeLog

    r152069 r152081  
     12013-06-26  Carlos Garcia Campos  <cargarcia@blackberry.com>
     2
     3        [BlackBerry] Handle testRunner.setCustomPolicyDelegate()
     4        https://bugs.webkit.org/show_bug.cgi?id=117982
     5
     6        Reviewed by Rob Buis.
     7
     8        * DumpRenderTree/blackberry/DumpRenderTree.cpp:
     9        (BlackBerry::WebKit::DumpRenderTree::DumpRenderTree): Initialize
     10        m_policyDelegateIsPermissive.
     11        (BlackBerry::WebKit::DumpRenderTree::resetToConsistentStateBeforeTesting):
     12        Reset m_policyDelegateIsPermissive.
     13        (BlackBerry::WebKit::DumpRenderTree::setCustomPolicyDelegate): Set
     14        m_policyDelegateIsPermissive.
     15        * DumpRenderTree/blackberry/DumpRenderTreeBlackBerry.h:
     16        (BlackBerry::WebKit::DumpRenderTree::policyDelegateEnabled):
     17        Return whether custom policy is enabled.
     18        (BlackBerry::WebKit::DumpRenderTree::policyDelegateIsPermissive):
     19        Return whether custom policy is permissive.
     20
    1212013-06-26  Anders Carlsson  <andersca@apple.com>
    222
  • trunk/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp

    r151780 r152081  
    184184    , m_acceptsEditing(true)
    185185    , m_policyDelegateEnabled(false)
     186    , m_policyDelegateIsPermissive(false)
    186187{
    187188    const char* workerNumber = getenv("WORKER_NUMBER") ? getenv("WORKER_NUMBER") : "0";
     
    299300    m_loadFinished = false;
    300301    m_policyDelegateEnabled = false;
     302    m_policyDelegateIsPermissive = false;
    301303    waitForPolicy = false;
    302304    testDone = false;
     
    970972{
    971973    m_policyDelegateEnabled = setDelegate;
    972     UNUSED_PARAM(permissive);
     974    m_policyDelegateIsPermissive = permissive;
    973975}
    974976}
  • trunk/Tools/DumpRenderTree/blackberry/DumpRenderTreeBlackBerry.h

    r151780 r152081  
    7878    void didHandleOnloadEventsForFrame(WebCore::Frame*);
    7979    void didReceiveResponseForFrame(WebCore::Frame*, const WebCore::ResourceResponse&);
     80    bool policyDelegateEnabled() const { return m_policyDelegateEnabled; }
     81    bool policyDelegateIsPermissive() const { return m_policyDelegateIsPermissive; }
    8082
    8183    // ChromeClient delegates
     
    149151    bool m_loadFinished;
    150152    bool m_policyDelegateEnabled;
     153    bool m_policyDelegateIsPermissive;
    151154};
    152155}
Note: See TracChangeset for help on using the changeset viewer.