Remove the remaining parts of ignorePendingStylesheets and placeholder styles.

sky/engine/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 340 matching lines @@
     return toValidDirValue(getAttribute(HTMLNames::dirAttr));
 }
 
 void Element::setDir(const AtomicString& value)
 {
     setAttribute(HTMLNames::dirAttr, value);
 }
 
 int Element::offsetLeft()
 {
-    document().updateLayoutIgnorePendingStylesheets();
+    document().updateLayout();
     if (RenderBoxModelObject* renderer = renderBoxModelObject())
         return renderer->offsetLeft();
     return 0;
 }
 
 int Element::offsetTop()
 {
-    document().updateLayoutIgnorePendingStylesheets();
+    document().updateLayout();
     if (RenderBoxModelObject* renderer = renderBoxModelObject())
         return renderer->pixelSnappedOffsetTop();
     return 0;
 }
 
 int Element::offsetWidth()
 {
-    document().updateLayoutIgnorePendingStylesheets();
+    document().updateLayout();
     if (RenderBoxModelObject* renderer = renderBoxModelObject())
         return renderer->pixelSnappedOffsetWidth();
     return 0;
 }
 
 int Element::offsetHeight()
 {
-    document().updateLayoutIgnorePendingStylesheets();
+    document().updateLayout();
     if (RenderBoxModelObject* renderer = renderBoxModelObject())
         return renderer->pixelSnappedOffsetHeight();
     return 0;
 }
 
 Element* Element::offsetParent()
 {
-    document().updateLayoutIgnorePendingStylesheets();
+    document().updateLayout();
     if (RenderObject* renderer = this->renderer())
         return renderer->offsetParent();
     return 0;
 }
 
 int Element::clientLeft()
 {
-    document().updateLayoutIgnorePendingStylesheets();
+    document().updateLayout();
 
     if (RenderBox* renderer = renderBox())
         return roundToInt(renderer->clientLeft());
     return 0;
 }
 
 int Element::clientTop()
 {
-    document().updateLayoutIgnorePendingStylesheets();
+    document().updateLayout();
 
     if (RenderBox* renderer = renderBox())
         return roundToInt(renderer->clientTop());
     return 0;
 }
 
 int Element::clientWidth()
 {
-    document().updateLayoutIgnorePendingStylesheets();
+    document().updateLayout();
 
     // FIXME(sky): Can we just use getBoundingClientRect() instead?
     if (document().documentElement() == this) {
         if (FrameView* view = document().view())
             return view->layoutSize().width();
     }
 
     if (RenderBox* renderer = renderBox())
         return renderer->pixelSnappedClientWidth();
     return 0;
 }
 
 int Element::clientHeight()
 {
-    document().updateLayoutIgnorePendingStylesheets();
+    document().updateLayout();
 
     // FIXME(sky): Can we just use getBoundingClientRect() instead?
     if (document().documentElement() == this) {
         if (FrameView* view = document().view())
             return view->layoutSize().height();
     }
 
     if (RenderBox* renderer = renderBox())
         return renderer->pixelSnappedClientHeight();
     return 0;
 }
 
 int Element::scrollLeft()
 {
-    document().updateLayoutIgnorePendingStylesheets();
+    document().updateLayout();
 
     if (document().documentElement() != this) {
         if (RenderBox* rend = renderBox())
             return rend->scrollLeft();
     }
 
     return 0;
 }
 
 int Element::scrollTop()
 {
-    document().updateLayoutIgnorePendingStylesheets();
+    document().updateLayout();
 
     if (document().documentElement() != this) {
         if (RenderBox* rend = renderBox())
             return rend->scrollTop();
     }
 
     return 0;
 }
 
 void Element::setScrollLeft(int newLeft)
 {
-    document().updateLayoutIgnorePendingStylesheets();
+    document().updateLayout();
 
     if (document().documentElement() != this) {
         if (RenderBox* rend = renderBox())
             rend->setScrollLeft(newLeft);
     }
 }
 
 void Element::setScrollLeft(const Dictionary& scrollOptionsHorizontal, ExceptionState& exceptionState)
 {
     String scrollBehaviorString;
@@ skipping 10 matching lines @@
         exceptionState.throwTypeError("ScrollOptionsHorizontal must include an 'x' member.");
         return;
     }
 
     // FIXME: Use scrollBehavior to decide whether to scroll smoothly or instantly.
     setScrollLeft(position);
 }
 
 void Element::setScrollTop(int newTop)
 {
-    document().updateLayoutIgnorePendingStylesheets();
+    document().updateLayout();
 
     if (document().documentElement() != this) {
         if (RenderBox* rend = renderBox())
             rend->setScrollTop(newTop);
     }
 }
 
 void Element::setScrollTop(const Dictionary& scrollOptionsVertical, ExceptionState& exceptionState)
 {
     String scrollBehaviorString;
@@ skipping 10 matching lines @@
         exceptionState.throwTypeError("ScrollOptionsVertical must include a 'y' member.");
         return;
     }
 
     // FIXME: Use scrollBehavior to decide whether to scroll smoothly or instantly.
     setScrollTop(position);
 }
 
 int Element::scrollWidth()
 {
-    document().updateLayoutIgnorePendingStylesheets();
+    document().updateLayout();
     if (RenderBox* rend = renderBox())
         return rend->scrollWidth().toDouble();
     return 0;
 }
 
 int Element::scrollHeight()
 {
-    document().updateLayoutIgnorePendingStylesheets();
+    document().updateLayout();
     if (RenderBox* rend = renderBox())
         return rend->scrollHeight().toDouble();
     return 0;
 }
 
 PassRefPtr<ClientRectList> Element::getClientRects()
 {
-    document().updateLayoutIgnorePendingStylesheets();
+    document().updateLayout();
 
     RenderBoxModelObject* renderBoxModelObject = this->renderBoxModelObject();
     if (!renderBoxModelObject)
         return ClientRectList::create();
 
     // FIXME: Handle SVG elements.
     // FIXME: Handle table/inline-table with a caption.
 
     Vector<FloatQuad> quads;
     renderBoxModelObject->absoluteQuads(quads);
     document().adjustFloatQuadsForScroll(quads);
     return ClientRectList::create(quads);
 }
 
 PassRefPtr<ClientRect> Element::getBoundingClientRect()
 {
-    document().updateLayoutIgnorePendingStylesheets();
+    document().updateLayout();
 
     Vector<FloatQuad> quads;
     // Get the bounding rectangle from the box model.
     if (renderBoxModelObject())
         renderBoxModelObject()->absoluteQuads(quads);
 
     if (quads.isEmpty())
         return ClientRect::create();
 
     FloatRect result = quads[0].boundingBox();
@@ skipping 628 matching lines @@
 {
     if (!inDocument())
         return;
 
     if (document().focusedElement() == this)
         return;
 
     if (!document().isActive())
         return;
 
-    document().updateLayoutIgnorePendingStylesheets();
+    document().updateLayout();
     if (!isFocusable())
         return;
 
     RefPtr<Node> protect(this);
     if (!document().page()->focusController().setFocusedElement(this, document().frame(), type))
         return;
 
     // Setting the focused node above might have invalidated the layout due to scripts.
-    document().updateLayoutIgnorePendingStylesheets();
+    document().updateLayout();
     if (!isFocusable())
         return;
     updateFocusAppearance(restorePreviousSelection);
 
     if (UserGestureIndicator::processedUserGestureSinceLoad()) {
         // Bring up the keyboard in the context of anything triggered by a user
         // gesture. Since tracking that across arbitrary boundaries (eg.
         // animations) is difficult, for now we match IE's heuristic and bring
         // up the keyboard if there's been any gesture since load.
         document().page()->chrome().client().showImeIfNeeded();
@@ skipping 146 matching lines @@
     // values returned for the ":selection" pseudo-element will be correct.
     if (RenderStyle* usedStyle = renderStyle())
         return usedStyle;
 
     if (!inActiveDocument())
         // FIXME: Try to do better than this. Ensure that styleForElement() works for elements that are not in the
         // document tree and figure out when to destroy the computed style for such elements.
         return 0;
 
     ElementRareData& rareData = ensureElementRareData();
-    if (!rareData.computedStyle())
-        rareData.setComputedStyle(document().styleForElementIgnoringPendingStylesheets(this));
+    if (!rareData.computedStyle()) {
+        RenderStyle* parentStyle = parentNode() ? parentNode()->computedStyle() : 0;
+        rareData.setComputedStyle(document().ensureStyleResolver().styleForElement(this, parentStyle));
+    }
     return rareData.computedStyle();
 }
 
 AtomicString Element::computeInheritedLanguage() const
 {
     const Node* n = this;
     AtomicString value;
     // The language property is inherited, so we iterate over the parents to find the first language.
     do {
         if (n->isElementNode()) {
@@ skipping 416 matching lines @@
         return false;
     // Turn off style sharing for elements that can gain layers for reasons outside of the style system.
     // See comments in RenderObject::setStyle().
     // FIXME: Why does gaining a layer from outside the style system require disabling sharing?
     if (isHTMLCanvasElement(*this))
         return false;
     return true;
 }
 
 } // namespace blink