Changeset 87043 in webkit


Ignore:
Timestamp:
May 22, 2011 12:33:39 PM (13 years ago)
Author:
robert@webkit.org
Message:

2011-05-22 Robert Hogan <​robert@webkit.org>

Reviewed by Kenneth Rohde Christiansen.

Fix policyDelegate in Qt DRT
​https://bugs.webkit.org/show_bug.cgi?id=61247

  • platform/qt/Skipped: Unskip fast/encoding/mailto-always-utf-8.html
  • platform/qt/fast/forms/mailto/formenctype-attribute-button-html-expected.txt: Removed.
  • platform/qt/fast/forms/mailto/formenctype-attribute-input-html-expected.txt: Removed.

2011-05-22 Robert Hogan <​robert@webkit.org>

Reviewed by Kenneth Rohde Christiansen.

Fix policyDelegate in Qt DRT

​https://bugs.webkit.org/show_bug.cgi?id=61247

Use the 'policy delegate' implemented in FrameLoaderClient
for layout tests. The partial implementation in DumpRenderTreeQt
is redundant.

  • WebCoreSupport/FrameLoaderClientQt.cpp: (WebCore::FrameLoaderClientQt::dispatchDecidePolicyForNavigationAction):

2011-05-22 Robert Hogan <​robert@webkit.org>

Reviewed by Kenneth Rohde Christiansen.

Fix policyDelegate in Qt DRT
​https://bugs.webkit.org/show_bug.cgi?id=61247

Use the 'policy delegate' implemented in FrameLoaderClient
for layout tests. The partial implementation in DumpRenderTreeQt
is redundant, so remove it.

  • DumpRenderTree/qt/DumpRenderTreeQt.cpp: (WebCore::WebPage::acceptNavigationRequest):
  • DumpRenderTree/qt/LayoutTestControllerQt.cpp: (LayoutTestController::waitForPolicyDelegate):
Location:
trunk
Files:
2 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r87029 r87043  
     12011-05-22  Robert Hogan  <robert@webkit.org>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        Fix policyDelegate in Qt DRT
     6        https://bugs.webkit.org/show_bug.cgi?id=61247
     7
     8        * platform/qt/Skipped: Unskip fast/encoding/mailto-always-utf-8.html
     9        * platform/qt/fast/forms/mailto/formenctype-attribute-button-html-expected.txt: Removed.
     10        * platform/qt/fast/forms/mailto/formenctype-attribute-input-html-expected.txt: Removed.
     11
    1122011-05-22  Dominic Cooney  <dominicc@chromium.org>
    213

  • trunk/LayoutTests/platform/qt/Skipped

    r87020 r87043  
    616616# Missing layoutTestController.findString() http://webkit.org/b/50236
    617617editing/text-iterator/findString.html
    618 
    619 # layoutTestController.waitForPolicyDelegate() does not report the origin node
    620 fast/encoding/mailto-always-utf-8.html
    621618
    622619# Missing layoutTestController.setAlwaysAcceptCookies()

  • trunk/Source/WebKit/qt/ChangeLog

    r87032 r87043  
     12011-05-22  Robert Hogan  <robert@webkit.org>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        Fix policyDelegate in Qt DRT
     6
     7        https://bugs.webkit.org/show_bug.cgi?id=61247
     8       
     9        Use the 'policy delegate' implemented in FrameLoaderClient
     10        for layout tests. The partial implementation in DumpRenderTreeQt
     11        is redundant.
     12
     13        * WebCoreSupport/FrameLoaderClientQt.cpp:
     14        (WebCore::FrameLoaderClientQt::dispatchDecidePolicyForNavigationAction):
     15
    1162011-05-22  Andrew Wason  <rectalogic@rectalogic.com>
    217

  • trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

    r86013 r87043  
    12641264            result = PolicyIgnore;
    12651265
     1266        page->d->acceptNavigationRequest(m_webFrame, r, QWebPage::NavigationType(action.type()));
    12661267        callPolicyFunction(function, result);
    12671268        return;

  • trunk/Tools/ChangeLog

    r87040 r87043  
     12011-05-22  Robert Hogan  <robert@webkit.org>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        Fix policyDelegate in Qt DRT
     6        https://bugs.webkit.org/show_bug.cgi?id=61247
     7
     8        Use the 'policy delegate' implemented in FrameLoaderClient
     9        for layout tests. The partial implementation in DumpRenderTreeQt
     10        is redundant, so remove it.
     11
     12        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
     13        (WebCore::WebPage::acceptNavigationRequest):
     14        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
     15        (LayoutTestController::waitForPolicyDelegate):
     16
    1172011-05-22  Patrick Gansterer  <paroga@webkit.org>
    218

  • trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp

    r86841 r87043  
    325325bool WebPage::acceptNavigationRequest(QWebFrame* frame, const QNetworkRequest& request, NavigationType type)
    326326{
    327     if (m_drt->layoutTestController()->waitForPolicy()) {
    328         QString url = QString::fromUtf8(request.url().toEncoded());
    329         QString typeDescription;
    330 
    331         switch (type) {
    332         case NavigationTypeLinkClicked:
    333             typeDescription = "link clicked";
    334             break;
    335         case NavigationTypeFormSubmitted:
    336             typeDescription = "form submitted";
    337             break;
    338         case NavigationTypeBackOrForward:
    339             typeDescription = "back/forward";
    340             break;
    341         case NavigationTypeReload:
    342             typeDescription = "reload";
    343             break;
    344         case NavigationTypeFormResubmitted:
    345             typeDescription = "form resubmitted";
    346             break;
    347         case NavigationTypeOther:
    348             typeDescription = "other";
    349             break;
    350         default:
    351             typeDescription = "illegal value";
    352         }
    353 
    354         if (isTextOutputEnabled())
    355             fprintf(stdout, "Policy delegate: attempt to load %s with navigation type '%s'\n",
    356                     url.toUtf8().constData(), typeDescription.toUtf8().constData());
    357 
     327    if (m_drt->layoutTestController()->waitForPolicy())
    358328        m_drt->layoutTestController()->notifyDone();
    359     }
     329
    360330    return QWebPage::acceptNavigationRequest(frame, request, type);
    361331}

  • trunk/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp

    r86742 r87043  
    629629void LayoutTestController::waitForPolicyDelegate()
    630630{
     631    setCustomPolicyDelegate(true);
    631632    m_waitForPolicy = true;
    632633    waitUntilDone();
Note: See TracChangeset for help on using the changeset viewer.