Title: [161749] trunk/Source/WebCore
- Revision
- 161749
- Author
- [email protected]
- Date
- 2014-01-10 23:05:31 -0800 (Fri, 10 Jan 2014)
Log Message
[iOS] Fix build of SubframeLoader.cpp
* loader/SubframeLoader.cpp:
(WebCore::SubframeLoader::loadMediaPlayerProxyPlugin):
(WebCore::SubframeLoader::loadPlugin):
* platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (161748 => 161749)
--- trunk/Source/WebCore/ChangeLog 2014-01-11 06:56:36 UTC (rev 161748)
+++ trunk/Source/WebCore/ChangeLog 2014-01-11 07:05:31 UTC (rev 161749)
@@ -1,3 +1,12 @@
+2014-01-10 David Kilzer <[email protected]>
+
+ [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 <[email protected]>
Fix Mac after r161747. One part of that is iOS specific.
Modified: trunk/Source/WebCore/loader/SubframeLoader.cpp (161748 => 161749)
--- trunk/Source/WebCore/loader/SubframeLoader.cpp 2014-01-11 06:56:36 UTC (rev 161748)
+++ trunk/Source/WebCore/loader/SubframeLoader.cpp 2014-01-11 07:05:31 UTC (rev 161749)
@@ -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 @@
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 @@
if (widget && renderer) {
renderer->setWidget(widget);
- renderer->node()->setNeedsStyleRecalc(SyntheticStyleChange);
+ renderer->frameOwnerElement().setNeedsStyleRecalc(SyntheticStyleChange);
}
m_containsPlugins = true;
@@ -452,7 +453,7 @@
m_containsPlugins = true;
#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- pluginElement->setNeedsStyleRecalc(SyntheticStyleChange);
+ pluginElement.setNeedsStyleRecalc(SyntheticStyleChange);
#endif
return true;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
