Imported WebKit commit e65cbc5b6ac32627c797e7fc7f46eb7794410c92 (http://svn.webkit.org/repository/webkit/trunk@123308)

New snapshot with better configure tests

1 files changed, 6 insertions, 6 deletions

diff --git a/Source/WebCore/html/HTMLImageElement.cpp b/Source/WebCore/html/HTMLImageElement.cpp
index 2992b6a17..e3138e6e0 100644
--- a/Source/WebCore/html/HTMLImageElement.cpp
+++ b/Source/WebCore/html/HTMLImageElement.cpp
@@ -96,7 +96,7 @@ HTMLImageElement::~HTMLImageElement()
 
 void HTMLImageElement::willAddAuthorShadowRoot()
 {
-    if (shadow()->oldestShadowRoot())
+    if (userAgentShadowRoot())
         return;
 
     createShadowSubtree();
@@ -112,9 +112,9 @@ void HTMLImageElement::createShadowSubtree()
 
 Element* HTMLImageElement::imageElement()
 {
-    if (ElementShadow* elementShadow = shadow()) {
-        ASSERT(elementShadow->oldestShadowRoot()->firstChild()->hasTagName(webkitInnerImageTag));
-        return toElement(elementShadow->oldestShadowRoot()->firstChild());
+    if (ShadowRoot* root = userAgentShadowRoot()) {
+        ASSERT(root->firstChild()->hasTagName(webkitInnerImageTag));
+        return toElement(root->firstChild());
     }
 
     return this;
@@ -409,8 +409,8 @@ void HTMLImageElement::setItemValueText(const String& value, ExceptionCode&)
 
 inline ImageInnerElement* HTMLImageElement::innerElement() const
 {
-    ASSERT(shadow());
-    return toImageInnerElement(shadow()->oldestShadowRoot()->firstChild());
+    ASSERT(userAgentShadowRoot());
+    return toImageInnerElement(userAgentShadowRoot()->firstChild());
 }
 
 }