Changeset 78817 in webkit

Timestamp:

Feb 17, 2011 5:39:46 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-02-17 Hui Huang <​hui.2.huang@nokia.com>

Reviewed by Laszlo Gombos.

The URL of HTML5 Video Element is percent encoded at websites such as youtube.
It is percent encoded again by QUrl constructor QUrl::QUrl(QString). This causes
the HTTP GET request for the video to be rejected by the service provider.
​https://bugs.webkit.org/show_bug.cgi?id=53973.

The bug is fixed by constructing QUrl from the encoded URL.

New test function tst_QWebPage::loadHtml5Video() is added in
Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp

• platform/graphics/qt/MediaPlayerPrivateQt.cpp: (WebCore::MediaPlayerPrivateQt::commitLoad):

2011-02-17 Hui Huang <​hui.2.huang@nokia.com>

Reviewed by Laszlo Gombos.

The URL of HTML5 Video Element is percent encoded at websites such as youtube.
It is percent encoded again by QUrl constructor QUrl::QUrl(QString). This causes
the HTTP GET request for the video to be rejected by the service provider.
​https://bugs.webkit.org/show_bug.cgi?id=53973.

The bug is fixed by constructing QUrl from the encoded URL in
MediaPlayerPrivateQt::commitLoad.

New test function tst_QWebPage::loadHtml5Video() is added to load HTML content with
HTML5 Video element. A new public method DumpRenderTreeSupportQt::mediaContentUrlByElementId
is added to retrieve the URL of the media content from WebCore MediaPlayerPrivateQt.
A new macro ENABLE_QT_MULTIMEDIA is introduced in tests.pri to make sure that the test
is skipped if Qt Multimedia is not available.

• WebCoreSupport/DumpRenderTreeSupportQt.cpp: (DumpRenderTreeSupportQt::mediaContentUrlByElementId):
• WebCoreSupport/DumpRenderTreeSupportQt.h:
• tests/qwebpage/tst_qwebpage.cpp: (tst_QWebPage::loadHtml5Video):
• tests/tests.pri:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp (modified) (1 diff)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp (modified) (2 diffs)
• WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h (modified) (2 diffs)
• WebKit/qt/tests/qwebpage/tst_qwebpage.cpp (modified) (2 diffs)
• WebKit/qt/tests/tests.pri (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-17  Hui Huang  <hui.2.huang@nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        The URL of HTML5 Video Element is percent encoded at websites such as youtube.
+        It is percent encoded again by QUrl constructor QUrl::QUrl(QString). This causes
+        the HTTP GET request for the video to be rejected by the service provider. 
+        https://bugs.webkit.org/show_bug.cgi?id=53973.
+
+        The bug is fixed by constructing QUrl from the encoded URL.
+
+        New test function tst_QWebPage::loadHtml5Video() is added in 
+        Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
+
+        * platform/graphics/qt/MediaPlayerPrivateQt.cpp:
+        (WebCore::MediaPlayerPrivateQt::commitLoad):
+
 2011-02-17  Andreas Kling  <kling@webkit.org>
 

trunk/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp

@@ -188 +188 @@
     }
 
-    const QUrl rUrl = QUrl(QString(url));
+    KURL kUrl(ParsedURLString, url);
+    const QUrl rUrl = kUrl;
     const QString scheme = rUrl.scheme().toLower();
 

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2011-02-17  Hui Huang  <hui.2.huang@nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        The URL of HTML5 Video Element is percent encoded at websites such as youtube.
+        It is percent encoded again by QUrl constructor QUrl::QUrl(QString). This causes
+        the HTTP GET request for the video to be rejected by the service provider. 
+        https://bugs.webkit.org/show_bug.cgi?id=53973.
+
+        The bug is fixed by constructing QUrl from the encoded URL in 
+        MediaPlayerPrivateQt::commitLoad. 
+
+        New test function tst_QWebPage::loadHtml5Video() is added to load HTML content with
+        HTML5 Video element. A new public method DumpRenderTreeSupportQt::mediaContentUrlByElementId
+        is added to retrieve the URL of the media content from WebCore MediaPlayerPrivateQt.
+        A new macro ENABLE_QT_MULTIMEDIA is introduced in tests.pri to make sure that the test
+        is skipped if Qt Multimedia is not available.
+
+        * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
+        (DumpRenderTreeSupportQt::mediaContentUrlByElementId):
+        * WebCoreSupport/DumpRenderTreeSupportQt.h:
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::loadHtml5Video):
+        * tests/tests.pri:
+
 2011-02-17  Andreas Kling  <kling@webkit.org>
 

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

@@ -81 +81 @@
 #include "qwebscriptworld.h"
 
+#if ENABLE(VIDEO) && ENABLE(QT_MULTIMEDIA)
+#include "HTMLVideoElement.h"
+#include "MediaPlayerPrivateQt.h"
+#endif
+
 using namespace WebCore;
 
@@ -958 +963 @@
 }
 
+QUrl DumpRenderTreeSupportQt::mediaContentUrlByElementId(QWebFrame* frame, const QString& elementId)
+{
+    QUrl res;
+
+#if ENABLE(VIDEO) && ENABLE(QT_MULTIMEDIA)
+    Frame* coreFrame = QWebFramePrivate::core(frame);
+    if (!coreFrame)
+        return res;
+
+    Document* doc = coreFrame->document();
+    if (!doc)
+        return res;
+
+    Node* coreNode = doc->getElementById(elementId);
+    if (!coreNode)
+        return res;
+
+    HTMLVideoElement* videoElement = static_cast<HTMLVideoElement*>(coreNode);
+    PlatformMedia platformMedia = videoElement->platformMedia();
+    if (platformMedia.type != PlatformMedia::QtMediaPlayerType)
+        return res;
+
+    MediaPlayerPrivateQt* mediaPlayerQt = static_cast<MediaPlayerPrivateQt*>(platformMedia.media.qtMediaPlayer);
+    if (mediaPlayerQt && mediaPlayerQt->mediaPlayer())
+        res = mediaPlayerQt->mediaPlayer()->media().canonicalUrl();
+#endif
+
+    return res;
+}
+
 // Provide a backward compatibility with previously exported private symbols as of QtWebKit 4.6 release
 

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

@@ -52 +52 @@
 class QWebHistoryItem;
 class QWebScriptWorld;
+class QUrl;
 
 extern QMap<int, QWebScriptWorld*> m_worldMap;
@@ -193 +194 @@
     static double defaultMinimumTimerInterval(); // Not really tied to WebView
     static void setMinimumTimerInterval(QWebPage*, double);
+
+    static QUrl mediaContentUrlByElementId(QWebFrame*, const QString& elementId);
 };
 

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

@@ -86 +86 @@
     void acceptNavigationRequestWithNewWindow();
     void userStyleSheet();
+    void loadHtml5Video();
     void modified();
     void contextMenuCrash();
@@ -428 +429 @@
     QVERIFY(networkManager->requestedUrls.count() >= 1);
     QCOMPARE(networkManager->requestedUrls.at(0), QUrl("http://does.not/exist.png"));
+}
+
+void tst_QWebPage::loadHtml5Video()
+{
+#if defined(ENABLE_QT_MULTIMEDIA) && ENABLE_QT_MULTIMEDIA
+    QByteArray url("http://does.not/exist?a=1%2Cb=2");
+    m_view->setHtml("<p><video id ='video' src='" + url + "' autoplay/></p>");
+    QTest::qWait(2000);
+    QUrl mUrl = DumpRenderTreeSupportQt::mediaContentUrlByElementId(m_page->mainFrame(), "video");
+    QCOMPARE(mUrl.toEncoded(), url);
+#else
+    QSKIP("This test requires Qt Multimedia", SkipAll);
+#endif
 }
 

trunk/Source/WebKit/qt/tests/tests.pri

@@ -6 +6 @@
 CONFIG(QTDIR_build) { load(qttest_p4) }
 ELSE { TARGET = tst_$$TARGET }
+
+# Load mobilityconfig if Qt Mobility is available
+load(mobilityconfig, true)
+contains(MOBILITY_CONFIG, multimedia) {
+    # This define is used by tests depending on Qt Multimedia
+    DEFINES -= ENABLE_QT_MULTIMEDIA=0
+    DEFINES += ENABLE_QT_MULTIMEDIA=1
+}
+
 SOURCES += $${TARGET}.cpp
 INCLUDEPATH += \