Changeset 94906 in webkit

Timestamp:

Sep 10, 2011 6:15:49 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Source/WebCore: [Qt] QWebSettings::setUserStyleSheetUrl() does not work with windows paths that contain drive letters
​https://bugs.webkit.org/show_bug.cgi?id=34884

KURL::path() alone does not handle removing the leading slash from a windows file path.
Using QUrl::toLocalFile() will turn ​file:///C:/path into C:/path appropriately.

Patch by Jarred Nicholls <​jarred@sencha.com> on 2011-09-10
Reviewed by Andreas Kling.

• platform/qt/KURLQt.cpp:

(WebCore::KURL::fileSystemPath):

Source/WebKit/qt: [Qt] QWebSettings::setUserStyleSheetUrl() does not work with windows paths that contain drive letters
​https://bugs.webkit.org/show_bug.cgi?id=34884

KURL::path() alone does not handle removing the leading slash from a windows file path.
Using QUrl::toLocalFile() will turn ​file:///C:/path into C:/path appropriately.

New test case that ensures a user stylesheet from the file system will load correctly
on all platforms.

Patch by Jarred Nicholls <​jarred@sencha.com> on 2011-09-10
Reviewed by Andreas Kling.

• tests/qwebpage/resources/user.css: Added.

(p):

• tests/qwebpage/tst_qwebpage.cpp:

(tst_QWebPage::userStyleSheetFromFile):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/qt/KURLQt.cpp (modified) (1 diff)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/tests/qwebpage/resources/user.css (added)
• WebKit/qt/tests/qwebpage/tst_qwebpage.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-10  Jarred Nicholls  <jarred@sencha.com>
+
+        [Qt] QWebSettings::setUserStyleSheetUrl() does not work with windows paths that contain drive letters
+        https://bugs.webkit.org/show_bug.cgi?id=34884
+        
+        KURL::path() alone does not handle removing the leading slash from a windows file path.
+        Using QUrl::toLocalFile() will turn file:///C:/path into C:/path appropriately.
+
+        Reviewed by Andreas Kling.
+
+        * platform/qt/KURLQt.cpp:
+        (WebCore::KURL::fileSystemPath):
+
 2011-09-10  Ken Buchanan <kenrb@chromium.org>
 

trunk/Source/WebCore/platform/qt/KURLQt.cpp

@@ -47 +47 @@
         return String();
 
-    return String(path());
+    return static_cast<QUrl>(*this).toLocalFile();
 }
 

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2011-09-10  Jarred Nicholls  <jarred@sencha.com>
+
+        [Qt] QWebSettings::setUserStyleSheetUrl() does not work with windows paths that contain drive letters
+        https://bugs.webkit.org/show_bug.cgi?id=34884
+        
+        KURL::path() alone does not handle removing the leading slash from a windows file path.
+        Using QUrl::toLocalFile() will turn file:///C:/path into C:/path appropriately.
+        
+        New test case that ensures a user stylesheet from the file system will load correctly
+        on all platforms.
+
+        Reviewed by Andreas Kling.
+
+        * tests/qwebpage/resources/user.css: Added.
+        (p):
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::userStyleSheetFromFile):
+
 2011-09-09  Fady Samuel  <fsamuel@chromium.org>
 

trunk/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp

@@ -102 +102 @@
     void acceptNavigationRequestWithNewWindow();
     void userStyleSheet();
+    void userStyleSheetFromLocalFileUrl();
     void loadHtml5Video();
     void modified();
@@ -466 +467 @@
     TestNetworkManager* networkManager = new TestNetworkManager(m_page);
     m_page->setNetworkAccessManager(networkManager);
-    networkManager->requestedUrls.clear();
 
     m_page->settings()->setUserStyleSheetUrl(QUrl("data:text/css;charset=utf-8;base64,"
             + QByteArray("p { background-image: url('http://does.not/exist.png');}").toBase64()));
+    m_view->setHtml("<p>hello world</p>");
+    QVERIFY(::waitForSignal(m_view, SIGNAL(loadFinished(bool))));
+
+    QVERIFY(networkManager->requestedUrls.count() >= 1);
+    QCOMPARE(networkManager->requestedUrls.at(0), QUrl("http://does.not/exist.png"));
+}
+
+void tst_QWebPage::userStyleSheetFromLocalFileUrl()
+{
+    TestNetworkManager* networkManager = new TestNetworkManager(m_page);
+    m_page->setNetworkAccessManager(networkManager);
+
+    QUrl styleSheetUrl = QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("qwebpage/resources/user.css"));
+    m_page->settings()->setUserStyleSheetUrl(styleSheetUrl);
     m_view->setHtml("<p>hello world</p>");
     QVERIFY(::waitForSignal(m_view, SIGNAL(loadFinished(bool))));