Changeset 70385 in webkit


Ignore:
Timestamp:
Oct 23, 2010 12:44:19 AM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2010-10-23 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r70367.
​http://trac.webkit.org/changeset/70367
​https://bugs.webkit.org/show_bug.cgi?id=48176

It made 8-10 tests crash on Qt bot (Requested by Ossy on
#webkit).

  • fast/loader/decide-policy-for-mime-type-async-expected.txt: Removed.
  • fast/loader/decide-policy-for-mime-type-async.html: Removed.
  • platform/gtk/Skipped:
  • platform/mac-wk2/Skipped:
  • platform/qt-wk2/Skipped:
  • platform/qt/Skipped:
  • platform/win/Skipped:

2010-10-23 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r70367.
​http://trac.webkit.org/changeset/70367
​https://bugs.webkit.org/show_bug.cgi?id=48176

It made 8-10 tests crash on Qt bot (Requested by Ossy on
#webkit).

  • loader/MainResourceLoader.cpp: (WebCore::MainResourceLoader::MainResourceLoader): (WebCore::MainResourceLoader::continueAfterContentPolicy): (WebCore::MainResourceLoader::didReceiveResponse): (WebCore::MainResourceLoader::setDefersLoading):
  • loader/MainResourceLoader.h:

2010-10-23 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r70367.
​http://trac.webkit.org/changeset/70367
​https://bugs.webkit.org/show_bug.cgi?id=48176

It made 8-10 tests crash on Qt bot (Requested by Ossy on
#webkit).

  • DumpRenderTree/LayoutTestController.cpp: (setCustomPolicyDelegateCallback):
  • DumpRenderTree/LayoutTestController.h:
  • DumpRenderTree/gtk/LayoutTestControllerGtk.cpp: (LayoutTestController::setCustomPolicyDelegate):
  • DumpRenderTree/mac/LayoutTestControllerMac.mm: (LayoutTestController::setCustomPolicyDelegate):
  • DumpRenderTree/mac/PolicyDelegate.h:
  • DumpRenderTree/mac/PolicyDelegate.mm: (-[PolicyDelegate webView:decidePolicyForNavigationAction:request:frame:decisionListener:]): (-[PolicyDelegate setPermissive:]): (-[PolicyDelegate setControllerToNotifyDone:]):
  • DumpRenderTree/win/LayoutTestControllerWin.cpp: (LayoutTestController::setCustomPolicyDelegate):
  • DumpRenderTree/wx/LayoutTestControllerWx.cpp: (LayoutTestController::setCustomPolicyDelegate):
Location:
trunk
Files:
2 deleted
18 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r70384 r70385  
     12010-10-23  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r70367.
     4        http://trac.webkit.org/changeset/70367
     5        https://bugs.webkit.org/show_bug.cgi?id=48176
     6
     7        It made 8-10 tests crash on Qt bot (Requested by Ossy on
     8        #webkit).
     9
     10        * fast/loader/decide-policy-for-mime-type-async-expected.txt: Removed.
     11        * fast/loader/decide-policy-for-mime-type-async.html: Removed.
     12        * platform/gtk/Skipped:
     13        * platform/mac-wk2/Skipped:
     14        * platform/qt-wk2/Skipped:
     15        * platform/qt/Skipped:
     16        * platform/win/Skipped:
     17
    1182010-10-23  Sheriff Bot  <webkit.review.bot@gmail.com>
    219

  • trunk/LayoutTests/platform/gtk/Skipped

    r70384 r70385  
    11481148fast/history/window-open.html
    11491149fast/html/tab-order.html
    1150 fast/loader/decide-policy-for-mime-type-async.html
    11511150fast/loader/main-document-url-for-non-http-loads.html
    11521151fast/loader/onload-policy-ignore-for-frame.html

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

    r70367 r70385  
    15251525# WebKitTestRunner needs layoutTestController.setCustomPolicyDelegate
    15261526# <https://bugs.webkit.org/show_bug.cgi?id=42546>
    1527 fast/loader/decide-policy-for-mime-type-async.html
    15281527fast/loader/javascript-url-hierarchical-execution.html
    15291528fast/loader/onload-policy-ignore-for-frame.html

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

    r70367 r70385  
    14731473# WebKitTestRunner needs layoutTestController.setCustomPolicyDelegate
    14741474# <https://bugs.webkit.org/show_bug.cgi?id=42546>
    1475 fast/loader/decide-policy-for-mime-type-async.html
    14761475fast/loader/javascript-url-hierarchical-execution.html
    14771476fast/loader/onload-policy-ignore-for-frame.html

  • trunk/LayoutTests/platform/qt/Skipped

    r70367 r70385  
    101101compositing
    102102
    103 fast/loader/decide-policy-for-mime-type-async.html
    104103fast/loader/subframe-navigate-during-main-frame-load.html
    105104

  • trunk/LayoutTests/platform/win/Skipped

    r70376 r70385  
    10391039# Requires WebP support.
    10401040fast/images/webp-image-decoding.html
    1041 
    1042 # Needs ovelroad of setCustomPolicyDelegate
    1043 fast/loader/decide-policy-for-mime-type-async.html

  • trunk/WebCore/ChangeLog

    r70379 r70385  
     12010-10-23  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r70367.
     4        http://trac.webkit.org/changeset/70367
     5        https://bugs.webkit.org/show_bug.cgi?id=48176
     6
     7        It made 8-10 tests crash on Qt bot (Requested by Ossy on
     8        #webkit).
     9
     10        * loader/MainResourceLoader.cpp:
     11        (WebCore::MainResourceLoader::MainResourceLoader):
     12        (WebCore::MainResourceLoader::continueAfterContentPolicy):
     13        (WebCore::MainResourceLoader::didReceiveResponse):
     14        (WebCore::MainResourceLoader::setDefersLoading):
     15        * loader/MainResourceLoader.h:
     16
    1172010-10-22  Andy Estes  <aestes@apple.com>
    218

  • trunk/WebCore/loader/MainResourceLoader.cpp

    r70367 r70385  
    5858    , m_loadingMultipartContent(false)
    5959    , m_waitingForContentPolicy(false)
    60     , m_deferLoadingCount(0)
    6160{
    6261}
    … …  
    233232    KURL url = request().url();
    234233    const String& mimeType = r.mimeType();
    235 
    236     // This is balanced by a call to setDefersLoading(true) in didReceiveResponse.
    237     setDefersLoading(false);
    238 
     234   
    239235    switch (contentPolicy) {
    240236    case PolicyUse: {
    … …  
    378374    RefPtr<MainResourceLoader> protect(this);
    379375
    380     // Defer loading while we're waiting for a response.
    381     // This is balanced by a setDefersLoading(false) call in continueAfterContentPolicy.
    382     setDefersLoading(true);
    383    
    384376    m_documentLoader->setResponse(r);
    385377
    … …  
    604596void MainResourceLoader::setDefersLoading(bool defers)
    605597{
    606     if (defers) {
    607         m_deferLoadingCount++;
    608         if (m_deferLoadingCount > 1)
    609             return;
    610     } else {
    611         ASSERT(m_deferLoadingCount);
    612         m_deferLoadingCount--;
    613         if (m_deferLoadingCount > 0)
    614             return;
    615     }
    616598    ResourceLoader::setDefersLoading(defers);
    617599

  • trunk/WebCore/loader/MainResourceLoader.h

    r70367 r70385  
    109109        bool m_waitingForContentPolicy;
    110110        double m_timeOfLastDataReceived;
    111         unsigned m_deferLoadingCount;
    112111    };
    113112

  • trunk/WebKitTools/ChangeLog

    r70382 r70385  
     12010-10-23  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r70367.
     4        http://trac.webkit.org/changeset/70367
     5        https://bugs.webkit.org/show_bug.cgi?id=48176
     6
     7        It made 8-10 tests crash on Qt bot (Requested by Ossy on
     8        #webkit).
     9
     10        * DumpRenderTree/LayoutTestController.cpp:
     11        (setCustomPolicyDelegateCallback):
     12        * DumpRenderTree/LayoutTestController.h:
     13        * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
     14        (LayoutTestController::setCustomPolicyDelegate):
     15        * DumpRenderTree/mac/LayoutTestControllerMac.mm:
     16        (LayoutTestController::setCustomPolicyDelegate):
     17        * DumpRenderTree/mac/PolicyDelegate.h:
     18        * DumpRenderTree/mac/PolicyDelegate.mm:
     19        (-[PolicyDelegate webView:decidePolicyForNavigationAction:request:frame:decisionListener:]):
     20        (-[PolicyDelegate setPermissive:]):
     21        (-[PolicyDelegate setControllerToNotifyDone:]):
     22        * DumpRenderTree/win/LayoutTestControllerWin.cpp:
     23        (LayoutTestController::setCustomPolicyDelegate):
     24        * DumpRenderTree/wx/LayoutTestControllerWx.cpp:
     25        (LayoutTestController::setCustomPolicyDelegate):
     26
    1272010-10-22  Eric Seidel  <eric@webkit.org>
    228

  • trunk/WebKitTools/DumpRenderTree/LayoutTestController.cpp

    r70367 r70385  
    972972        permissive = JSValueToBoolean(context, arguments[1]);
    973973
    974     bool callIgnoreInDecidePolicyForMIMETypeAfterOneSecond = false;
    975     if (argumentCount >= 3)
    976         callIgnoreInDecidePolicyForMIMETypeAfterOneSecond = JSValueToBoolean(context, arguments[2]);
    977    
    978     LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
    979     controller->setCustomPolicyDelegate(JSValueToBoolean(context, arguments[0]), permissive, callIgnoreInDecidePolicyForMIMETypeAfterOneSecond);
     974    LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
     975    controller->setCustomPolicyDelegate(JSValueToBoolean(context, arguments[0]), permissive);
    980976
    981977    return JSValueMakeUndefined(context);

  • trunk/WebKitTools/DumpRenderTree/LayoutTestController.h

    r70367 r70385  
    8585    void setAuthorAndUserStylesEnabled(bool);
    8686    void setCacheModel(int);
    87     void setCustomPolicyDelegate(bool setDelegate, bool permissive, bool callIgnoreInDecidePolicyForMIMETypeAfterOneSecond);
     87    void setCustomPolicyDelegate(bool setDelegate, bool permissive);
    8888    void setDatabaseQuota(unsigned long long quota);
    8989    void setDomainRelaxationForbiddenForURLScheme(bool forbidden, JSStringRef scheme);

  • trunk/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp

    r70367 r70385  
    269269}
    270270
    271 void LayoutTestController::setCustomPolicyDelegate(bool setDelegate, bool permissive, bool callIgnoreInDecidePolicyForMIMETypeAfterOneSecond)
     271void LayoutTestController::setCustomPolicyDelegate(bool setDelegate, bool permissive)
    272272{
    273273    // FIXME: implement

  • trunk/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm

    r70367 r70385  
    320320}
    321321
    322 void LayoutTestController::setCustomPolicyDelegate(bool setDelegate, bool permissive, bool callIgnoreInDecidePolicyForMIMETypeAfterOneSecond)
     322void LayoutTestController::setCustomPolicyDelegate(bool setDelegate, bool permissive)
    323323{
    324324    if (setDelegate) {
    325         [policyDelegate setCallIgnoreInDecidePolicyForMIMETypeAfterOneSecond:callIgnoreInDecidePolicyForMIMETypeAfterOneSecond];
    326325        [policyDelegate setPermissive:permissive];
    327326        [[mainFrame webView] setPolicyDelegate:policyDelegate];

  • trunk/WebKitTools/DumpRenderTree/mac/PolicyDelegate.h

    r70367 r70385  
    3232
    3333@interface PolicyDelegate : NSObject {
    34     BOOL _permissiveDelegate;
    35     BOOL _callIgnoreInDecidePolicyForMIMETypeAfterOneSecond;
    36     LayoutTestController* _controllerToNotifyDone;
     34    BOOL permissiveDelegate;
     35    LayoutTestController* controllerToNotifyDone;
    3736}
    3837
    3938- (void)setPermissive:(BOOL)permissive;
    40 - (void)setCallIgnoreInDecidePolicyForMIMETypeAfterOneSecond:(BOOL)callIgnoreInDecidePolicyForMIMETypeAfterOneSecond;
    4139- (void)setControllerToNotifyDone:(LayoutTestController*)controller;
    4240

  • trunk/WebKitTools/DumpRenderTree/mac/PolicyDelegate.mm

    r70367 r70385  
    8484    printf("%s\n", [message UTF8String]);
    8585
    86     if (_permissiveDelegate)
     86    if (permissiveDelegate)
    8787        [listener use];
    8888    else
    8989        [listener ignore];
    9090
    91     if (_controllerToNotifyDone) {
    92         _controllerToNotifyDone->notifyDone();
    93         _controllerToNotifyDone = 0;
     91    if (controllerToNotifyDone) {
     92        controllerToNotifyDone->notifyDone();
     93        controllerToNotifyDone = 0;
    9494    }
    95 }
    96 
    97 - (void)webView:(WebView *)webView decidePolicyForMIMEType:(NSString *)type
    98                                                    request:(NSURLRequest *)request
    99                                                      frame:(WebFrame *)frame
    100                                           decisionListener:(id<WebPolicyDecisionListener>)listener
    101 {
    102     if (!_callIgnoreInDecidePolicyForMIMETypeAfterOneSecond) {
    103         [listener use];
    104         return;
    105     }
    106 
    107     [(NSObject *)listener performSelector:@selector(ignore) withObject:nil afterDelay:1.0];
    10895}
    10996
    … …  
    114101}
    115102
    116 - (void)setCallIgnoreInDecidePolicyForMIMETypeAfterOneSecond:(BOOL)callIgnoreInDecidePolicyForMIMETypeAfterOneSecond
    117 {
    118     _callIgnoreInDecidePolicyForMIMETypeAfterOneSecond = callIgnoreInDecidePolicyForMIMETypeAfterOneSecond;
    119 }
    120 
    121103- (void)setPermissive:(BOOL)permissive
    122104{
    123     _permissiveDelegate = permissive;
     105    permissiveDelegate = permissive;
    124106}
    125107
    126108- (void)setControllerToNotifyDone:(LayoutTestController*)controller
    127109{
    128     _controllerToNotifyDone = controller;
     110    controllerToNotifyDone = controller;
    129111}
    130112

  • trunk/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp

    r70367 r70385  
    369369}
    370370
    371 void LayoutTestController::setCustomPolicyDelegate(bool setDelegate, bool permissive , bool callIgnoreInDecidePolicyForMIMETypeAfterOneSecond)
     371void LayoutTestController::setCustomPolicyDelegate(bool setDelegate, bool permissive)
    372372{
    373373    COMPtr<IWebView> webView;

  • trunk/WebKitTools/DumpRenderTree/wx/LayoutTestControllerWx.cpp

    r70367 r70385  
    108108}
    109109
    110 void LayoutTestController::setCustomPolicyDelegate(bool, bool, bool)
     110void LayoutTestController::setCustomPolicyDelegate(bool, bool)
    111111{
    112112    // FIXME: implement
Note: See TracChangeset for help on using the changeset viewer.