Changeset 64262 in webkit

Timestamp:

Jul 28, 2010 8:24:50 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-07-28 Bryan Gislason <​bgislason@rim.com>

Reviewed by Nate Chapin.

Minor compile errors in loadMediaPlayerProxyPlugin
​https://bugs.webkit.org/show_bug.cgi?id=43141

• WebCore/loader/SubframeLoader.cpp:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/SubframeLoader.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-28  Bryan Gislason  <bgislason@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@google.com>
 

trunk/WebCore/loader/SubframeLoader.cpp

@@ -147 +147 @@
 
 #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)
 {
@@ -159 +159 @@
         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;
@@ -182 +182 @@
         renderer->node()->setNeedsStyleRecalc(SyntheticStyleChange);
     }
-    m_containsPlugIns = true;
+    m_containsPlugins = true;
 
     return widget ? widget.release() : 0;