Inline paintInvalidationOrMarkForLayout.

sky/engine/core/rendering/RenderImage.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Allan Sandfeld Jensen (kde@carewolf.com)
  *           (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Google Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011-2012. All rights reserved.
  *
@@ skipping 95 matching lines @@
     // yet so all we can do is update our intrinsic size. Once we're inserted
     // the resulting layout will do the rest of the work.
     if (!parent()) {
         updateIntrinsicSizeIfNeeded(m_imageResource->intrinsicSize());
         return;
     }
 
     if (hasBoxDecorationBackground() || hasMask())
         RenderReplaced::imageChanged(newImage, rect);
 
-    paintInvalidationOrMarkForLayout(rect);
-}
-
-void RenderImage::updateIntrinsicSizeIfNeeded(const LayoutSize& newSize)
-{
-    if (m_imageResource->errorOccurred() || !m_imageResource->hasImage())
-        return;
-    setIntrinsicSize(newSize);
-}
-
-void RenderImage::updateInnerContentRect()
-{
-    // Propagate container size to the image resource.
-    LayoutRect containerRect = replacedContentRect();
-    IntSize containerSize(containerRect.width(), containerRect.height());
-    if (!containerSize.isEmpty())
-        m_imageResource->setContainerSizeForRenderer(containerSize);
-}
-
-void RenderImage::paintInvalidationOrMarkForLayout(const IntRect* rect)
-{
     ASSERT(isRooted());
 
     LayoutSize oldIntrinsicSize = intrinsicSize();
     LayoutSize newIntrinsicSize = m_imageResource->intrinsicSize();
     updateIntrinsicSizeIfNeeded(newIntrinsicSize);
 
     bool imageSourceHasChangedSize = oldIntrinsicSize != newIntrinsicSize;
     if (imageSourceHasChangedSize)
         setPreferredLogicalWidthsDirty();
 
@@ skipping 13 matching lines @@
     // The image hasn't changed in size or its style constrains its size, so a paint invalidation will suffice.
     if (everHadLayout() && !selfNeedsLayout()) {
         // The inner content rectangle is calculated during layout, but may need an update now
         // (unless the box has already been scheduled for layout). In order to calculate it, we
         // may need values from the containing block, though, so make sure that we're not too
         // early. It may be that layout hasn't even taken place once yet.
         updateInnerContentRect();
     }
 }
 
+void RenderImage::updateIntrinsicSizeIfNeeded(const LayoutSize& newSize)
+{
+    if (m_imageResource->errorOccurred() || !m_imageResource->hasImage())
+        return;
+    setIntrinsicSize(newSize);
+}
+
+void RenderImage::updateInnerContentRect()
+{
+    // Propagate container size to the image resource.
+    LayoutRect containerRect = replacedContentRect();
+    IntSize containerSize(containerRect.width(), containerRect.height());
+    if (!containerSize.isEmpty())
+        m_imageResource->setContainerSizeForRenderer(containerSize);
+}
+
 void RenderImage::notifyFinished(Resource* newImage)
 {
     if (!m_imageResource)
         return;
 
     if (documentBeingDestroyed())
         return;
 
     invalidateBackgroundObscurationStatus();
 }
@@ skipping 143 matching lines @@
         return;
     }
 }
 
 bool RenderImage::needsPreferredWidthsRecalculation() const
 {
     return RenderReplaced::needsPreferredWidthsRecalculation();
 }
 
 } // namespace blink