Don't clear StyleAffectedByEmpty before recalc.

Source/core/dom/Element.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Peter Kelly (pmk@post.com)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
  *           (C) 2007 Eric Seidel (eric@webkit.org)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 1309 matching lines @@
 
 void Element::attach(const AttachContext& context)
 {
     ASSERT(document().inStyleRecalc());
 
     // We've already been through detach when doing an attach, but we might
     // need to clear any state that's been added since then.
     if (hasRareData() && styleChangeType() == NeedsReattachStyleChange) {
         ElementRareData* data = elementRareData();
         data->clearComputedStyle();
-        // Only clear the style state if we're not going to reuse the style from recalcStyle.
-        if (!context.resolvedStyle)
-            data->resetStyleState();
     }
 
     RenderTreeBuilder(this, context.resolvedStyle).createRendererForElementIfNeeded();
 
     addCallbackSelectors();
 
     StyleResolverParentScope parentScope(*this);
 
     createPseudoElementIfNeeded(BEFORE);
 
@@ skipping 18 matching lines @@
 {
     HTMLFrameOwnerElement::UpdateSuspendScope suspendWidgetHierarchyUpdates;
     cancelFocusAppearanceUpdate();
     removeCallbackSelectors();
     if (svgFilterNeedsLayerUpdate())
         document().unscheduleSVGFilterLayerUpdateHack(*this);
     if (hasRareData()) {
         ElementRareData* data = elementRareData();
         data->clearPseudoElements();
 
-        // attach() will perform the below steps for us when inside recalcStyle.
-        if (!document().inStyleRecalc()) {
-            data->resetStyleState();
+        // attach() will clear the computed style for us when inside recalcStyle.
+        if (!document().inStyleRecalc())
             data->clearComputedStyle();
-        }
 
         if (ActiveAnimations* activeAnimations = data->activeAnimations()) {
             if (context.performingReattach) {
                 // FIXME: We call detach from within style recalc, so compositingState is not up to date.
                 // https://code.google.com/p/chromium/issues/detail?id=339847
                 DisableCompositingQueryAsserts disabler;
 
                 // FIXME: restart compositor animations rather than pull back to the main thread
                 activeAnimations->cancelAnimationOnCompositor();
             } else {
@@ skipping 88 matching lines @@
 {
     ASSERT(document().inStyleRecalc());
     ASSERT(!parentOrShadowHostNode()->needsStyleRecalc());
 
     if (hasCustomStyleCallbacks())
         willRecalcStyle(change);
 
     if (change >= Inherit || needsStyleRecalc()) {
         if (hasRareData()) {
             ElementRareData* data = elementRareData();
-            data->resetStyleState();
             data->clearComputedStyle();
 
             if (change >= Inherit) {
                 if (ActiveAnimations* activeAnimations = data->activeAnimations())
                     activeAnimations->setAnimationStyleChange(false);
             }
         }
         if (parentRenderStyle())
             change = recalcOwnStyle(change);
         clearNeedsStyleRecalc();
@@ skipping 1772 matching lines @@
         return v8::Handle<v8::Object>();
 
     wrapper->SetPrototype(binding->prototype());
 
     wrapperType->refObject(toScriptWrappableBase());
     V8DOMWrapper::associateObjectWithWrapperNonTemplate(this, wrapperType, wrapper, isolate);
     return wrapper;
 }
 
 } // namespace blink