[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 15f93030bd840430e2f2ecab9b09d377d3b62ed2
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 29 03:24:50 2010 +0000

    2010-07-28  Bryan Gislason  <bgislason at rim.com>
    
            Reviewed by Nate Chapin.
    
            Minor compile errors in loadMediaPlayerProxyPlugin
            https://bugs.webkit.org/show_bug.cgi?id=43141
    
            * WebCore/loader/SubframeLoader.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64262 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 67337b5..999b591 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-07-28  Bryan Gislason  <bgislason at rim.com>
+
+        Reviewed by Nate Chapin.
+
+        Minor compile errors in loadMediaPlayerProxyPlugin
+        https://bugs.webkit.org/show_bug.cgi?id=43141
+
+        * WebCore/loader/SubframeLoader.cpp:
+
 2010-07-28  Dominic Mazzoni  <dmazzoni at google.com>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebCore/loader/SubframeLoader.cpp b/WebCore/loader/SubframeLoader.cpp
index 2206b4e..2821a50 100644
--- a/WebCore/loader/SubframeLoader.cpp
+++ b/WebCore/loader/SubframeLoader.cpp
@@ -146,7 +146,7 @@ bool SubframeLoader::requestObject(RenderEmbeddedObject* renderer, const String&
 
 
 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-PassRefPtr<Widget> FrameLoader::loadMediaPlayerProxyPlugin(Node* node, const KURL& url, 
+PassRefPtr<Widget> SubframeLoader::loadMediaPlayerProxyPlugin(Node* node, const KURL& url,
     const Vector<String>& paramNames, const Vector<String>& paramValues)
 {
     ASSERT(node->hasTagName(videoTag) || node->hasTagName(audioTag));
@@ -158,7 +158,7 @@ PassRefPtr<Widget> FrameLoader::loadMediaPlayerProxyPlugin(Node* node, const KUR
     if (!url.isEmpty())
         completedURL = completeURL(url);
 
-    if (!SecurityOrigin::canLoad(completedURL, String(), frame()->document())) {
+    if (!SecurityOrigin::canLoad(completedURL, String(), m_frame->document())) {
         FrameLoader::reportLocalLoadFailed(m_frame, completedURL.string());
         return 0;
     }
@@ -181,7 +181,7 @@ PassRefPtr<Widget> FrameLoader::loadMediaPlayerProxyPlugin(Node* node, const KUR
         renderer->setWidget(widget);
         renderer->node()->setNeedsStyleRecalc(SyntheticStyleChange);
     }
-    m_containsPlugIns = true;
+    m_containsPlugins = true;
 
     return widget ? widget.release() : 0;
 }

-- 
WebKit Debian packaging