Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / dom / PseudoElement.cpp

diff --git a/src/third_party/WebKit/Source/core/dom/PseudoElement.cpp b/src/third_party/WebKit/Source/core/dom/PseudoElement.cpp
index 9512d82..1c6a3e1 100644 (file)
--- a/src/third_party/WebKit/Source/core/dom/PseudoElement.cpp
+++ b/src/third_party/WebKit/Source/core/dom/PseudoElement.cpp
@@ -32,7 +32,7 @@
 #include "core/rendering/RenderQuote.h"
 #include "core/rendering/style/ContentData.h"
 
-namespace WebCore {
+namespace blink {
 
 const QualifiedName& pseudoElementTagName()
 {
@@ -70,13 +70,15 @@ PassRefPtr<RenderStyle> PseudoElement::customStyleForRenderer()
 
 void PseudoElement::dispose()
 {
+    ASSERT(parentOrShadowHostElement());
+
     InspectorInstrumentation::pseudoElementDestroyed(this);
 
     ASSERT(!nextSibling());
     ASSERT(!previousSibling());
 
     detach();
-    RefPtr<Element> parent = parentOrShadowHostElement();
+    RefPtrWillBeRawPtr<Element> parent = parentOrShadowHostElement();
     setParentOrShadowHostNode(0);
     removedFrom(parent.get());
 }
@@ -91,8 +93,6 @@ void PseudoElement::attach(const AttachContext& context)
     if (!renderer)
         return;
     RenderStyle* style = renderer->style();
-    if (style->hasFlowFrom())
-        return;
     if (style->styleType() != BEFORE && style->styleType() != AFTER)
         return;
     ASSERT(style->contentData());