Title: [161752] trunk/Source/WebCore
- Revision
- 161752
- Author
- [email protected]
- Date
- 2014-01-10 23:34:37 -0800 (Fri, 10 Jan 2014)
Log Message
[iOS] Fix build for RenderEmbeddedObject::canHaveChildren()
* rendering/RenderEmbeddedObject.cpp:
(WebCore::RenderEmbeddedObject::canHaveChildren):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (161751 => 161752)
--- trunk/Source/WebCore/ChangeLog 2014-01-11 07:33:48 UTC (rev 161751)
+++ trunk/Source/WebCore/ChangeLog 2014-01-11 07:34:37 UTC (rev 161752)
@@ -1,3 +1,10 @@
+2014-01-10 David Kilzer <[email protected]>
+
+ [iOS] Fix build for RenderEmbeddedObject::canHaveChildren()
+
+ * rendering/RenderEmbeddedObject.cpp:
+ (WebCore::RenderEmbeddedObject::canHaveChildren):
+
2014-01-10 Anders Carlsson <[email protected]>
Tweak ProgressTrackerClient functions
Modified: trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp (161751 => 161752)
--- trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2014-01-11 07:33:48 UTC (rev 161751)
+++ trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2014-01-11 07:34:37 UTC (rev 161752)
@@ -656,10 +656,7 @@
bool RenderEmbeddedObject::canHaveChildren() const
{
#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- if (!node())
- return false;
-
- if (toElement(node())->isMediaElement())
+ if (frameOwnerElement().isMediaElement())
return true;
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
