Changeset 53253 in webkit


Ignore:
Timestamp:
Jan 14, 2010 2:47:59 AM (14 years ago)
Author:
eric@webkit.org
Message:

2010-01-14 Eric Seidel <​eric@webkit.org>

No review, rolling out r53249.
​http://trac.webkit.org/changeset/53249
​https://bugs.webkit.org/show_bug.cgi?id=33617

This caused http/tests/security/local-user-CSS-from-
remote.html to fail on the Qt Release Build Bot.

  • platform/qt/Skipped:

2010-01-14 Eric Seidel <​eric@webkit.org>

No review, rolling out r53249.
​http://trac.webkit.org/changeset/53249
​https://bugs.webkit.org/show_bug.cgi?id=33617

This caused http/tests/security/local-user-CSS-from-
remote.html to fail on the Qt Release Build Bot.

  • DumpRenderTree/qt/DumpRenderTreeQt.cpp: (WebCore::WebPage::resetSettings):
  • DumpRenderTree/qt/LayoutTestControllerQt.cpp: (LayoutTestController::overridePreference):
  • DumpRenderTree/qt/LayoutTestControllerQt.h:
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r53252 r53253  
     12010-01-14  Eric Seidel  <eric@webkit.org>
     2
     3        No review, rolling out r53249.
     4        http://trac.webkit.org/changeset/53249
     5        https://bugs.webkit.org/show_bug.cgi?id=33617
     6
     7        This caused http/tests/security/local-user-CSS-from-
     8        remote.html to fail on the Qt Release Build Bot.
     9
     10        * platform/qt/Skipped:
     11
    1122010-01-14  Eric Seidel  <eric@webkit.org>
    213

  • trunk/LayoutTests/platform/qt/Skipped

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

  • trunk/WebKitTools/ChangeLog

    r53251 r53253  
     12010-01-14  Eric Seidel  <eric@webkit.org>
     2
     3        No review, rolling out r53249.
     4        http://trac.webkit.org/changeset/53249
     5        https://bugs.webkit.org/show_bug.cgi?id=33617
     6
     7        This caused http/tests/security/local-user-CSS-from-
     8        remote.html to fail on the Qt Release Build Bot.
     9
     10        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
     11        (WebCore::WebPage::resetSettings):
     12        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
     13        (LayoutTestController::overridePreference):
     14        * DumpRenderTree/qt/LayoutTestControllerQt.h:
     15
    1162010-01-14  Chris Jerdonek  <chris.jerdonek@gmail.com>
    217

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

    r53249 r53253  
    172172
    173173    QWebSettings::setMaximumPagesInCache(0); // reset to default
    174     settings()->setUserStyleSheetUrl(QUrl()); // reset to default
    175174}
    176175

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

    r53249 r53253  
    392392        QWebSettings::setMaximumPagesInCache(value.toInt());
    393393}
    394 
    395 void LayoutTestController::setUserStyleSheetLocation(const QString& url)
    396 {
    397     m_userStyleSheetLocation = QUrl(url);
    398 }
    399 
    400 void 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

    r53249 r53253  
    134134    void waitForPolicyDelegate();
    135135    void overridePreference(const QString& name, const QVariant& value);
    136     void setUserStyleSheetLocation(const QString& url);
    137     void setUserStyleSheetEnabled(bool enabled);
    138136
    139137private slots:
    … …  
    154152    bool m_loadFinished;
    155153
    156     QUrl m_userStyleSheetLocation;
    157154    QBasicTimer m_timeoutTimer;
    158155    QWebFrame* m_topLoadingFrame;
Note: See TracChangeset for help on using the changeset viewer.