Changeset 53281 in webkit


Ignore:
Timestamp:
Jan 14, 2010 11:47:55 AM (14 years ago)
Author:
tonikitoo@webkit.org
Message:

[Qt] DRT missing setUserStyleSheetLocation and setUserStyleSheetEnabled in LayoutTestController
​https://bugs.webkit.org/show_bug.cgi?id=33617

Patch by Diego Gonzalez <​diego.gonzalez@openbossa.org> on 2010-01-13
Reviewed by Kenneth Christiansen.

WebKitTools:

  • DumpRenderTree/qt/DumpRenderTreeQt.cpp:

(WebCore::WebPage::resetSettings):

  • DumpRenderTree/qt/LayoutTestControllerQt.cpp:

(LayoutTestController::setUserStyleSheetLocation):
(LayoutTestController::setUserStyleSheetEnabled):

  • DumpRenderTree/qt/LayoutTestControllerQt.h:

LayoutTests:

  • platform/qt/Skipped:
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r53277 r53281  
     12010-01-13  Diego Gonzalez  <diego.gonzalez@openbossa.org>
     2
     3        Reviewed by Kenneth Christiansen.
     4
     5        [Qt] DRT missing setUserStyleSheetLocation and setUserStyleSheetEnabled in LayoutTestController
     6        https://bugs.webkit.org/show_bug.cgi?id=33617
     7
     8        * platform/qt/Skipped:
     9
    1102010-01-13  Alexey Proskuryakov  <ap@apple.com>
    211

  • trunk/LayoutTests/platform/qt/Skipped

    r53253 r53281  
    204204http/tests/security/mixedContent
    205205http/tests/cache/subresource-failover-to-network.html
    206 
    207 # Missing layoutTestController.setUserStyleSheetLocation() and layoutTestController.setUserStyleSheetEnabled()
    208 http/tests/security/local-user-CSS-from-remote.html
    209206
    210207# Missing layoutTestController.evaluateInWebInspector()

  • trunk/WebKitTools/ChangeLog

    r53277 r53281  
     12010-01-13  Diego Gonzalez  <diego.gonzalez@openbossa.org>
     2
     3        Reviewed by Kenneth Christiansen.
     4
     5        [Qt] DRT missing setUserStyleSheetLocation and setUserStyleSheetEnabled in LayoutTestController
     6        https://bugs.webkit.org/show_bug.cgi?id=33617
     7
     8        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
     9        (WebCore::WebPage::resetSettings):
     10        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
     11        (LayoutTestController::setUserStyleSheetLocation):
     12        (LayoutTestController::setUserStyleSheetEnabled):
     13        * DumpRenderTree/qt/LayoutTestControllerQt.h:
     14
    1152010-01-14  Adam Roben  <aroben@apple.com>
    216

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

    r53253 r53281  
    172172
    173173    QWebSettings::setMaximumPagesInCache(0); // reset to default
     174    settings()->setUserStyleSheetUrl(QUrl()); // reset to default
    174175}
    175176

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

    r53253 r53281  
    392392        QWebSettings::setMaximumPagesInCache(value.toInt());
    393393}
     394
     395void LayoutTestController::setUserStyleSheetLocation(const QString& url)
     396{
     397    m_userStyleSheetLocation = QUrl(url);
     398}
     399
     400void LayoutTestController::setUserStyleSheetEnabled(bool enabled)
     401{
     402    if (enabled)
     403        m_drt->webPage()->settings()->setUserStyleSheetUrl(m_userStyleSheetLocation);
     404    else
     405        m_drt->webPage()->settings()->setUserStyleSheetUrl(QUrl());
     406}

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

    r53253 r53281  
    134134    void waitForPolicyDelegate();
    135135    void overridePreference(const QString& name, const QVariant& value);
     136    void setUserStyleSheetLocation(const QString& url);
     137    void setUserStyleSheetEnabled(bool enabled);
    136138
    137139private slots:
    … …  
    152154    bool m_loadFinished;
    153155
     156    QUrl m_userStyleSheetLocation;
    154157    QBasicTimer m_timeoutTimer;
    155158    QWebFrame* m_topLoadingFrame;
Note: See TracChangeset for help on using the changeset viewer.