Changeset 76451 in webkit


Ignore:
Timestamp:
Jan 22, 2011 9:27:34 AM (13 years ago)
Author:
robert@webkit.org
Message:

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

Reviewed by Andreas Kling.

[Qt] Support layoutTestController.addURLToRedirect()
​https://bugs.webkit.org/show_bug.cgi?id=52956

  • platform/qt/Skipped:

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

Reviewed by Andreas Kling.

[Qt] Support layoutTestController.addURLToRedirect()
​https://bugs.webkit.org/show_bug.cgi?id=52956

  • WebCoreSupport/DumpRenderTreeSupportQt.cpp: (DumpRenderTreeSupportQt::addURLToRedirect):
  • WebCoreSupport/DumpRenderTreeSupportQt.h:
  • WebCoreSupport/FrameLoaderClientQt.cpp: (WebCore::FrameLoaderClientQt::dispatchWillSendRequest):
  • WebCoreSupport/FrameLoaderClientQt.h:

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

Reviewed by Andreas Kling.

[Qt] Support layoutTestController.addURLToRedirect()
​https://bugs.webkit.org/show_bug.cgi?id=52956

  • DumpRenderTree/qt/LayoutTestControllerQt.cpp: (LayoutTestController::addURLToRedirect):
  • DumpRenderTree/qt/LayoutTestControllerQt.h:
Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r76450 r76451  
     12011-01-22  Robert Hogan  <robert@webkit.org>
     2
     3        Reviewed by Andreas Kling.
     4
     5        [Qt] Support layoutTestController.addURLToRedirect()
     6        https://bugs.webkit.org/show_bug.cgi?id=52956
     7
     8        * platform/qt/Skipped:
     9
    1102011-01-22  Nikolas Zimmermann  <nzimmermann@rim.com>
    211

  • trunk/LayoutTests/platform/qt/Skipped

    r76446 r76451  
    784784fast/ruby/rubyDOM-remove-text1.html
    785785fast/ruby/rubyDOM-remove-text2.html
    786 
    787 # ------- not obeying layoutTestController.addURLToRedirect()
    788 http/tests/loading/cross-origin-XHR-willLoadRequest.html
    789786
    790787# ============================================================================= #

  • trunk/Source/WebKit/qt/ChangeLog

    r76378 r76451  
     12011-01-22  Robert Hogan  <robert@webkit.org>
     2
     3        Reviewed by Andreas Kling.
     4
     5        [Qt] Support layoutTestController.addURLToRedirect()
     6        https://bugs.webkit.org/show_bug.cgi?id=52956
     7
     8        * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
     9        (DumpRenderTreeSupportQt::addURLToRedirect):
     10        * WebCoreSupport/DumpRenderTreeSupportQt.h:
     11        * WebCoreSupport/FrameLoaderClientQt.cpp:
     12        (WebCore::FrameLoaderClientQt::dispatchWillSendRequest):
     13        * WebCoreSupport/FrameLoaderClientQt.h:
     14
    1152011-01-21  Sam Weinig  <sam@webkit.org>
    216

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

    r76079 r76451  
    894894}
    895895
     896void DumpRenderTreeSupportQt::addURLToRedirect(const QString& origin, const QString& destination)
     897{
     898    FrameLoaderClientQt::URLsToRedirect[origin] = destination;
     899}
     900
    896901// Provide a backward compatibility with previously exported private symbols as of QtWebKit 4.6 release
    897902

  • trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h

    r76079 r76451  
    186186    static QVariantList nodesFromRect(const QWebElement& document, int x, int y, unsigned top, unsigned right, unsigned bottom, unsigned left, bool ignoreClipping);
    187187    static QString responseMimeType(QWebFrame*);
     188    static void addURLToRedirect(const QString& origin, const QString& destination);
    188189};
    189190

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

    r75878 r76451  
    181181bool FrameLoaderClientQt::policyDelegateEnabled = false;
    182182bool FrameLoaderClientQt::policyDelegatePermissive = false;
     183QMap<QString, QString> FrameLoaderClientQt::URLsToRedirect = QMap<QString, QString>();
    183184
    184185// Taken from DumpRenderTree/chromium/WebViewHost.cpp
    … …  
    10221023          newRequest.setHTTPHeaderField(sendRequestClearHeaders.at(i).toLocal8Bit().constData(), QString());
    10231024
     1025    if (QWebPagePrivate::drtRun) {
     1026        QString url = newRequest.url().string();
     1027        if (URLsToRedirect.contains(url))
     1028            newRequest.setURL(QUrl(URLsToRedirect[url]));
     1029    }
    10241030    // seems like the Mac code doesn't do anything here by default neither
    10251031    //qDebug() << "FrameLoaderClientQt::dispatchWillSendRequest" << request.isNull() << request.url().string`();

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

    r74571 r76451  
    251251    static bool deferMainResourceDataLoad;
    252252    static bool dumpHistoryCallbacks;
     253    static QMap<QString, QString> URLsToRedirect;
    253254
    254255private:

  • trunk/Tools/ChangeLog

    r76446 r76451  
     12011-01-22  Robert Hogan  <robert@webkit.org>
     2
     3        Reviewed by Andreas Kling.
     4
     5        [Qt] Support layoutTestController.addURLToRedirect()
     6        https://bugs.webkit.org/show_bug.cgi?id=52956
     7
     8        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
     9        (LayoutTestController::addURLToRedirect):
     10        * DumpRenderTree/qt/LayoutTestControllerQt.h:
     11
    1122011-01-22  Robert Hogan  <robert@webkit.org>
    213

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

    r75908 r76451  
    831831}
    832832
     833void LayoutTestController::addURLToRedirect(const QString& origin, const QString& destination)
     834{
     835    DumpRenderTreeSupportQt::addURLToRedirect(origin, destination);
     836}
     837
    833838const unsigned LayoutTestController::maxViewWidth = 800;
    834839const unsigned LayoutTestController::maxViewHeight = 600;

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

    r73886 r76451  
    231231    QVariantList nodesFromRect(const QWebElement& document, int x, int y, unsigned top, unsigned right, unsigned bottom, unsigned left, bool ignoreClipping);
    232232
     233    void addURLToRedirect(const QString& origin, const QString& destination);
     234
    233235    /*
    234236        Policy values: 'on', 'auto' or 'off'.
Note: See TracChangeset for help on using the changeset viewer.