Changeset 83550 in webkit


Ignore:
Timestamp:
Apr 11, 2011 7:10:14 PM (13 years ago)
Author:
weinig@apple.com
Message:

2011-04-11 Sam Weinig <​sam@webkit.org>

Reviewed by Anders Carlsson.

REGRESSION(r77974): http/tests/security/aboutBlank/security-context-window-open.html is failing
<rdar://problem/8981346>
​https://bugs.webkit.org/show_bug.cgi?id=54159

  • platform/mac-wk2/Skipped: Remove http/tests/security/aboutBlank/security-context-window-open.html from the skipped list.

2011-04-11 Sam Weinig <​sam@webkit.org>

Reviewed by Anders Carlsson.

REGRESSION(r77974): http/tests/security/aboutBlank/security-context-window-open.html is failing
<rdar://problem/8981346>
​https://bugs.webkit.org/show_bug.cgi?id=54159

  • WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp: (WTR::InjectedBundlePage::InjectedBundlePage): (WTR::InjectedBundlePage::decidePolicyForNavigationAction): (WTR::InjectedBundlePage::decidePolicyForNewWindowAction): (WTR::InjectedBundlePage::decidePolicyForResponse): (WTR::InjectedBundlePage::unableToImplementPolicy):
  • WebKitTestRunner/InjectedBundle/InjectedBundlePage.h: Add short-circuited policy client which matches WebKit1.
  • WebKitTestRunner/TestController.cpp: (WTR::TestController::resetStateToConsistentValues): Clear the cache between tests to ensure consistent results.
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r83548 r83550  
     12011-04-11  Sam Weinig  <sam@webkit.org>
     2
     3        Reviewed by Anders Carlsson.
     4
     5        REGRESSION(r77974): http/tests/security/aboutBlank/security-context-window-open.html is failing
     6        <rdar://problem/8981346>
     7        https://bugs.webkit.org/show_bug.cgi?id=54159
     8
     9        * platform/mac-wk2/Skipped:
     10        Remove http/tests/security/aboutBlank/security-context-window-open.html from the skipped list.
     11
    1122011-04-11  Ryosuke Niwa  <rniwa@webkit.org>
    213

  • trunk/LayoutTests/platform/mac-wk2/Skipped

    r83481 r83550  
    14931493compositing/tiling/huge-layer-resize.html
    14941494
    1495 # REGRESSION(r77974): http/tests/security/aboutBlank/security-context-window-open.html is failing
    1496 # <https://bugs.webkit.org/show_bug.cgi?id=54159>
    1497 http/tests/security/aboutBlank/security-context-window-open.html
    1498 
    14991495# transitions/default-timing-function.html failing on WebKit2 since it was added
    15001496# <https://bugs.webkit.org/show_bug.cgi?id=56531>

  • trunk/Tools/ChangeLog

    r83546 r83550  
     12011-04-11  Sam Weinig  <sam@webkit.org>
     2
     3        Reviewed by Anders Carlsson.
     4
     5        REGRESSION(r77974): http/tests/security/aboutBlank/security-context-window-open.html is failing
     6        <rdar://problem/8981346>
     7        https://bugs.webkit.org/show_bug.cgi?id=54159
     8
     9        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
     10        (WTR::InjectedBundlePage::InjectedBundlePage):
     11        (WTR::InjectedBundlePage::decidePolicyForNavigationAction):
     12        (WTR::InjectedBundlePage::decidePolicyForNewWindowAction):
     13        (WTR::InjectedBundlePage::decidePolicyForResponse):
     14        (WTR::InjectedBundlePage::unableToImplementPolicy):
     15        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.h:
     16        Add short-circuited policy client which matches WebKit1.
     17
     18        * WebKitTestRunner/TestController.cpp:
     19        (WTR::TestController::resetStateToConsistentValues):
     20        Clear the cache between tests to ensure consistent results.
     21
    1222011-04-11  George Guo  <George.Guo@nokia.com>
    223

  • trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp

    r82780 r83550  
    203203    WKBundlePageSetResourceLoadClient(m_page, &resourceLoadClient);
    204204
     205    WKBundlePagePolicyClient policyClient = {
     206        0,
     207        this,
     208        decidePolicyForNavigationAction,
     209        decidePolicyForNewWindowAction,
     210        decidePolicyForResponse,
     211        unableToImplementPolicy
     212    };
     213    WKBundlePageSetPolicyClient(m_page, &policyClient);
     214
    205215    WKBundlePageUIClient uiClient = {
    206216        0,
    … …  
    670680}
    671681
     682
     683// Policy Client Callbacks
     684
     685WKBundlePagePolicyAction InjectedBundlePage::decidePolicyForNavigationAction(WKBundlePageRef page, WKBundleFrameRef frame, WKBundleNavigationActionRef navigationAction, WKURLRequestRef request, WKTypeRef* userData, const void* clientInfo)
     686{
     687    return static_cast<InjectedBundlePage*>(const_cast<void*>(clientInfo))->decidePolicyForNavigationAction(page, frame, navigationAction, request, userData);
     688}
     689
     690WKBundlePagePolicyAction InjectedBundlePage::decidePolicyForNewWindowAction(WKBundlePageRef page, WKBundleFrameRef frame, WKBundleNavigationActionRef navigationAction, WKURLRequestRef request, WKStringRef frameName, WKTypeRef* userData, const void* clientInfo)
     691{
     692    return static_cast<InjectedBundlePage*>(const_cast<void*>(clientInfo))->decidePolicyForNewWindowAction(page, frame, navigationAction, request, frameName, userData);
     693}
     694
     695WKBundlePagePolicyAction InjectedBundlePage::decidePolicyForResponse(WKBundlePageRef page, WKBundleFrameRef frame, WKURLResponseRef response, WKURLRequestRef request, WKTypeRef* userData, const void* clientInfo)
     696{
     697    return static_cast<InjectedBundlePage*>(const_cast<void*>(clientInfo))->decidePolicyForResponse(page, frame, response, request, userData);
     698}
     699
     700void InjectedBundlePage::unableToImplementPolicy(WKBundlePageRef page, WKBundleFrameRef frame, WKErrorRef error, WKTypeRef* userData, const void* clientInfo)
     701{
     702    static_cast<InjectedBundlePage*>(const_cast<void*>(clientInfo))->unableToImplementPolicy(page, frame, error, userData);
     703}
     704
     705WKBundlePagePolicyAction InjectedBundlePage::decidePolicyForNavigationAction(WKBundlePageRef, WKBundleFrameRef, WKBundleNavigationActionRef, WKURLRequestRef request, WKTypeRef*)
     706{
     707    return WKBundlePagePolicyActionUse;
     708}
     709
     710WKBundlePagePolicyAction InjectedBundlePage::decidePolicyForNewWindowAction(WKBundlePageRef, WKBundleFrameRef, WKBundleNavigationActionRef, WKURLRequestRef, WKStringRef, WKTypeRef*)
     711{
     712    return WKBundlePagePolicyActionUse;
     713}
     714
     715WKBundlePagePolicyAction InjectedBundlePage::decidePolicyForResponse(WKBundlePageRef, WKBundleFrameRef, WKURLResponseRef, WKURLRequestRef, WKTypeRef*)
     716{
     717    return WKBundlePagePolicyActionUse;
     718}
     719
     720void InjectedBundlePage::unableToImplementPolicy(WKBundlePageRef, WKBundleFrameRef, WKErrorRef, WKTypeRef*)
     721{
     722}
     723
    672724// UI Client Callbacks
    673725

  • trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.h

    r77908 r83550  
    9595    void didFailLoadForResource(WKBundlePageRef, WKBundleFrameRef, uint64_t identifier, WKErrorRef);
    9696
     97    // WKBundlePagePolicyClient
     98    static WKBundlePagePolicyAction decidePolicyForNavigationAction(WKBundlePageRef, WKBundleFrameRef, WKBundleNavigationActionRef, WKURLRequestRef, WKTypeRef*, const void*);
     99    static WKBundlePagePolicyAction decidePolicyForNewWindowAction(WKBundlePageRef, WKBundleFrameRef, WKBundleNavigationActionRef, WKURLRequestRef, WKStringRef frameName, WKTypeRef*, const void*);
     100    static WKBundlePagePolicyAction decidePolicyForResponse(WKBundlePageRef, WKBundleFrameRef, WKURLResponseRef, WKURLRequestRef, WKTypeRef*, const void*);
     101    static void unableToImplementPolicy(WKBundlePageRef, WKBundleFrameRef, WKErrorRef, WKTypeRef*, const void*);
     102    WKBundlePagePolicyAction decidePolicyForNavigationAction(WKBundlePageRef, WKBundleFrameRef, WKBundleNavigationActionRef, WKURLRequestRef, WKTypeRef*);
     103    WKBundlePagePolicyAction decidePolicyForNewWindowAction(WKBundlePageRef, WKBundleFrameRef, WKBundleNavigationActionRef, WKURLRequestRef, WKStringRef frameName, WKTypeRef*);
     104    WKBundlePagePolicyAction decidePolicyForResponse(WKBundlePageRef, WKBundleFrameRef, WKURLResponseRef, WKURLRequestRef, WKTypeRef*);
     105    void unableToImplementPolicy(WKBundlePageRef, WKBundleFrameRef, WKErrorRef, WKTypeRef*);
     106
    97107    // UI Client
    98108    static void willAddMessageToConsole(WKBundlePageRef, WKStringRef message, uint32_t lineNumber, const void* clientInfo);

  • trunk/Tools/WebKitTestRunner/TestController.cpp

    r83531 r83550  
    3434#include <WebKit2/WKPageGroup.h>
    3535#include <WebKit2/WKPreferencesPrivate.h>
     36#include <WebKit2/WKResourceCacheManager.h>
    3637#include <WebKit2/WKRetainPtr.h>
    3738#include <wtf/PassOwnPtr.h>
    … …  
    378379    WKPreferencesSetSerifFontFamily(preferences, serifFontFamily);
    379380
     381    WKResourceCacheManagerRef cacheManager = WKContextGetResourceCacheManager(m_context.get());
     382    WKResourceCacheManagerClearCacheForAllOrigins(cacheManager, WKResourceCachesToClearAll);
     383
    380384    m_mainWebView->focus();
    381385
Note: See TracChangeset for help on using the changeset viewer.