[iOS] Fix build of SubframeLoader.cpp
authorddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 11 Jan 2014 07:05:31 +0000 (07:05 +0000)
committerddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 11 Jan 2014 07:05:31 +0000 (07:05 +0000)
* loader/SubframeLoader.cpp:
(WebCore::SubframeLoader::loadMediaPlayerProxyPlugin):
(WebCore::SubframeLoader::loadPlugin):
* platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@161749 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/loader/SubframeLoader.cpp

index 7254b6a0a5e8bac03541f6036eb3d14e92113a2c..96317594a6a4b9dd9bcd62abb1b9519de6e2f3a9 100644 (file)
@@ -1,3 +1,12 @@
+2014-01-10  David Kilzer  <ddkilzer@apple.com>
+
+        [iOS] Fix build of SubframeLoader.cpp
+
+        * loader/SubframeLoader.cpp:
+        (WebCore::SubframeLoader::loadMediaPlayerProxyPlugin):
+        (WebCore::SubframeLoader::loadPlugin):
+        * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
+
 2014-01-10  Joseph Pecoraro  <pecoraro@apple.com>
 
         Fix Mac after r161747. One part of that is iOS specific.
index b06f70d58ad757674f08085ebfa27c04e716c010..53000ae9e2b082f4636b13901b2de17b30071c39 100644 (file)
@@ -41,6 +41,7 @@
 #include "FrameLoader.h"
 #include "FrameLoaderClient.h"
 #include "HTMLAppletElement.h"
+#include "HTMLAudioElement.h"
 #include "HTMLFrameElementBase.h"
 #include "HTMLNames.h"
 #include "HTMLObjectElement.h"
@@ -242,7 +243,7 @@ PassRefPtr<Widget> SubframeLoader::loadMediaPlayerProxyPlugin(HTMLMediaElement&
         completedURL = completeURL(url);
 
     if (!m_frame.document()->securityOrigin()->canDisplay(completedURL)) {
-        FrameLoader::reportLocalLoadFailed(m_frame, completedURL.string());
+        FrameLoader::reportLocalLoadFailed(&m_frame, completedURL.string());
         return nullptr;
     }
 
@@ -264,7 +265,7 @@ PassRefPtr<Widget> SubframeLoader::loadMediaPlayerProxyPlugin(HTMLMediaElement&
 
     if (widget && renderer) {
         renderer->setWidget(widget);
-        renderer->node()->setNeedsStyleRecalc(SyntheticStyleChange);
+        renderer->frameOwnerElement().setNeedsStyleRecalc(SyntheticStyleChange);
     }
     m_containsPlugins = true;
 
@@ -452,7 +453,7 @@ bool SubframeLoader::loadPlugin(HTMLPlugInImageElement& pluginElement, const URL
     m_containsPlugins = true;
  
 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    pluginElement->setNeedsStyleRecalc(SyntheticStyleChange);
+    pluginElement.setNeedsStyleRecalc(SyntheticStyleChange);
 #endif
     return true;
 }