Merge diffNeedsFullLayout methods.

sky/engine/core/rendering/style/RenderStyle.cpp

 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Adobe Systems Incorporated. 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 268 matching lines @@
 }
 
 StyleDifference RenderStyle::visualInvalidationDiff(const RenderStyle& other) const
 {
     // Note, we use .get() on each DataRef below because DataRef::operator== will do a deep
     // compare, which is duplicate work when we're going to compare each property inside
     // this function anyway.
 
     StyleDifference diff;
 
-    // FIXME(sky): Combine these two into one function call.
-    if (diffNeedsFullLayoutAndPaintInvalidation(other)
-        || diffNeedsFullLayout(other))
+    if (diffNeedsFullLayout(other)) {
         diff.setNeedsFullLayout();
-
-    if (!diff.needsFullLayout() && position() != StaticPosition && surround->offset != other.surround->offset) {
+    } else if (position() != StaticPosition && surround->offset != other.surround->offset) {
         // Optimize for the case where a positioned layer is moving but not changing size.
         if (positionedObjectMovedOnly(surround->offset, other.surround->offset, m_box->width()))
             diff.setNeedsPositionedMovementLayout();
         else
             diff.setNeedsFullLayout();
     }
 
     updatePropertySpecificDifferences(other, diff);
 
     // Cursors are not checked, since they will be set appropriately in response to mouse events,
     // so they don't need to cause any paint invalidation or layout.
 
     // Animations don't need to be checked either. We always set the new style on the RenderObject, so we will get a chance to fire off
     // the resulting transition properly.
 
     return diff;
 }
 
-bool RenderStyle::diffNeedsFullLayoutAndPaintInvalidation(const RenderStyle& other) const
+bool RenderStyle::diffNeedsFullLayout(const RenderStyle& other) const
 {
     // FIXME: Not all cases in this method need both full layout and paint invalidation.
     // Should move cases into diffNeedsFullLayout() if
     // - don't need paint invalidation at all;
     // - or the renderer knows how to exactly invalidate paints caused by the layout change
     //   instead of forced full paint invalidation.
 
     if (surround.get() != other.surround.get()) {
         // If our border widths change, then we need to layout. Other changes to borders only necessitate a paint invalidation.
         if (borderLeftWidth() != other.borderLeftWidth()
@@ skipping 91 matching lines @@
         || noninherited_flags.unicodeBidi != other.noninherited_flags.unicodeBidi
         || noninherited_flags.position != other.noninherited_flags.position
         || noninherited_flags.originalDisplay != other.noninherited_flags.originalDisplay)
         return true;
 
     if (!m_background->outline().visuallyEqual(other.m_background->outline())) {
         // FIXME: We only really need to recompute the overflow but we don't have an optimized layout for it.
         return true;
     }
 
-    // Movement of non-static-positioned object is special cased in RenderStyle::visualInvalidationDiff().
-
-    return false;
-}
-
-bool RenderStyle::diffNeedsFullLayout(const RenderStyle& other) const
-{
     if (m_box.get() != other.m_box.get()) {
         if (m_box->width() != other.m_box->width()
             || m_box->minWidth() != other.m_box->minWidth()
             || m_box->maxWidth() != other.m_box->maxWidth()
             || m_box->height() != other.m_box->height()
             || m_box->minHeight() != other.m_box->minHeight()
             || m_box->maxHeight() != other.m_box->maxHeight())
             return true;
 
         if (m_box->verticalAlign() != other.m_box->verticalAlign())
             return true;
 
         if (m_box->boxSizing() != other.m_box->boxSizing())
             return true;
     }
 
     if (noninherited_flags.verticalAlign != other.noninherited_flags.verticalAlign)
         return true;
 
     if (surround.get() != other.surround.get()) {
         if (surround->margin != other.surround->margin)
             return true;
 
         if (surround->padding != other.surround->padding)
             return true;
     }
 
+    // Movement of non-static-positioned object is special cased in RenderStyle::visualInvalidationDiff().
+
     return false;
 }
 
 void RenderStyle::updatePropertySpecificDifferences(const RenderStyle& other, StyleDifference& diff) const
 {
     // StyleAdjuster has ensured that zIndex is non-auto only if it's applicable.
     if (m_box->zIndex() != other.m_box->zIndex() || m_box->hasAutoZIndex() != other.m_box->hasAutoZIndex())
         diff.setZIndexChanged();
 
     if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) {
@@ skipping 746 matching lines @@
     // right
     radiiSum = radii.topRight().height() + radii.bottomRight().height();
     if (radiiSum > rect.height())
         factor = std::min(rect.height() / radiiSum, factor);
 
     ASSERT(factor <= 1);
     return factor;
 }
 
 } // namespace blink