[iOS] Fix build for RenderEmbeddedObject::canHaveChildren()
authorddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 11 Jan 2014 07:34:37 +0000 (07:34 +0000)
committerddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 11 Jan 2014 07:34:37 +0000 (07:34 +0000)
* rendering/RenderEmbeddedObject.cpp:
(WebCore::RenderEmbeddedObject::canHaveChildren):

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

Source/WebCore/ChangeLog
Source/WebCore/rendering/RenderEmbeddedObject.cpp

index ef0768475734e4e4f7a7ca46d99d170c9267547f..149f8c83b6dda23d497f0db0d847160a4461a572 100644 (file)
@@ -1,3 +1,10 @@
+2014-01-10  David Kilzer  <ddkilzer@apple.com>
+
+        [iOS] Fix build for RenderEmbeddedObject::canHaveChildren()
+
+        * rendering/RenderEmbeddedObject.cpp:
+        (WebCore::RenderEmbeddedObject::canHaveChildren):
+
 2014-01-10  Anders Carlsson  <andersca@apple.com>
 
         Tweak ProgressTrackerClient functions
index f7246f882fe0cdb00dde82200022626ed8ae9167..5165ef2863b89a3dd05654138acf369825613ef1 100644 (file)
@@ -656,10 +656,7 @@ CursorDirective RenderEmbeddedObject::getCursor(const LayoutPoint& point, Cursor
 bool RenderEmbeddedObject::canHaveChildren() const
 {
 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    if (!node())
-        return false;
-
-    if (toElement(node())->isMediaElement())
+    if (frameOwnerElement().isMediaElement())
         return true;
 #endif