Remove the remaining parts of ignorePendingStylesheets and placeholder styles.

sky/engine/core/html/HTMLImageElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 167 matching lines @@
         imageLoader().updateFromElement(ImageLoader::UpdateNormal, m_elementCreatedByParser ? ImageLoader::ForceLoadImmediately : ImageLoader::LoadNormally);
 }
 
 void HTMLImageElement::removedFrom(ContainerNode* insertionPoint)
 {
     if (m_listener)
         document().mediaQueryMatcher().removeViewportListener(m_listener.get());
     HTMLElement::removedFrom(insertionPoint);
 }
 
-int HTMLImageElement::width(bool ignorePendingStylesheets)
+int HTMLImageElement::width()
 {
     if (!renderer()) {
         // check the attribute first for an explicit pixel value
         bool ok;
         int width = getAttribute(HTMLNames::widthAttr).toInt(&ok);
         if (ok)
             return width;
 
         // if the image is available, use its width
         if (imageLoader().image())
             return imageLoader().image()->imageSizeForRenderer(renderer()).width();
     }
 
-    if (ignorePendingStylesheets)
-        document().updateLayoutIgnorePendingStylesheets();
-    else
-        document().updateLayout();
+    document().updateLayout();
 
     RenderBox* box = renderBox();
     return box ? box->contentBoxRect().pixelSnappedWidth() : 0;
 }
 
-int HTMLImageElement::height(bool ignorePendingStylesheets)
+int HTMLImageElement::height()
 {
     if (!renderer()) {
         // check the attribute first for an explicit pixel value
         bool ok;
         int height = getAttribute(HTMLNames::heightAttr).toInt(&ok);
         if (ok)
             return height;
 
         // if the image is available, use its height
         if (imageLoader().image())
             return imageLoader().image()->imageSizeForRenderer(renderer()).height();
     }
 
-    if (ignorePendingStylesheets)
-        document().updateLayoutIgnorePendingStylesheets();
-    else
-        document().updateLayout();
+    document().updateLayout();
 
     RenderBox* box = renderBox();
     return box ? box->contentBoxRect().pixelSnappedHeight() : 0;
 }
 
 int HTMLImageElement::naturalWidth() const
 {
     if (!imageLoader().image())
         return 0;
 
@@ skipping 41 matching lines @@
     setAttribute(HTMLNames::srcAttr, AtomicString(value));
 }
 
 void HTMLImageElement::setWidth(int value)
 {
     setIntegralAttribute(HTMLNames::widthAttr, value);
 }
 
 int HTMLImageElement::x() const
 {
-    document().updateLayoutIgnorePendingStylesheets();
+    document().updateLayout();
     RenderObject* r = renderer();
     if (!r)
         return 0;
 
     // FIXME: This doesn't work correctly with transforms.
     FloatPoint absPos = r->localToAbsolute();
     return absPos.x();
 }
 
 int HTMLImageElement::y() const
 {
-    document().updateLayoutIgnorePendingStylesheets();
+    document().updateLayout();
     RenderObject* r = renderer();
     if (!r)
         return 0;
 
     // FIXME: This doesn't work correctly with transforms.
     FloatPoint absPos = r->localToAbsolute();
     return absPos.y();
 }
 
 bool HTMLImageElement::complete() const
@@ skipping 62 matching lines @@
     }
     imageLoader().updateFromElement(behavior);
 }
 
 const KURL& HTMLImageElement::sourceURL() const
 {
     return cachedImage()->response().url();
 }
 
 }