[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[commit-queue at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit 6de04dae3bd4ec5d022f0d93f3c59200ace80844
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 20 18:24:11 2011 +0000

    2011-01-20  Dawit Alemayehu  <adawit at kde.org>
    
            Reviewed by Andreas Kling.
    
            [Qt] Fix Layering violation in MediaPlayerPrivateQt.
            https://bugs.webkit.org/show_bug.cgi?id=52733
    
            No new tests. no behavioral change.
    
           * platform/graphics/qt/MediaPlayerPrivateQt.cpp:
            (WebCore::MediaPlayerPrivateQt::commitLoad):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76265 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 674f589..ed1c6c7 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-20  Dawit Alemayehu  <adawit at kde.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Fix Layering violation in MediaPlayerPrivateQt.
+        https://bugs.webkit.org/show_bug.cgi?id=52733
+
+        No new tests. no behavioral change.
+
+       * platform/graphics/qt/MediaPlayerPrivateQt.cpp:
+        (WebCore::MediaPlayerPrivateQt::commitLoad):
+
 2011-01-20  Nate Chapin  <japhet at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp b/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp
index be6f732..0a4c0f6 100644
--- a/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp
+++ b/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp
@@ -20,7 +20,6 @@
 #include "config.h"
 #include "MediaPlayerPrivateQt.h"
 
-#include "FrameLoaderClientQt.h"
 #include "FrameView.h"
 #include "GraphicsContext.h"
 #include "HTMLMediaElement.h"
@@ -205,10 +204,10 @@ void MediaPlayerPrivateQt::commitLoad(const String& url)
 
         // Grab the frame and network manager
         Frame* frame = document ? document->frame() : 0;
-        QNetworkAccessManager* manager = frame ? frame->loader()->networkingContext()->networkAccessManager() : 0;
-        FrameLoaderClientQt* frameLoader =  frame ? static_cast<FrameLoaderClientQt*>(frame->loader()->client()) : 0;
+        FrameLoader* frameLoader = frame ? frame->loader() : 0;
+        QNetworkAccessManager* manager = frameLoader ? frameLoader->networkingContext()->networkAccessManager() : 0;
 
-        if (document && manager) {
+        if (manager) {
             // Set the cookies
             QtNAMThreadSafeProxy managerProxy(manager);
             QList<QNetworkCookie> cookies = managerProxy.cookiesForUrl(rUrl);

-- 
WebKit Debian packaging