Index: third_party/WebKit/Source/core/layout/LayoutObject.cpp |
diff --git a/third_party/WebKit/Source/core/layout/LayoutObject.cpp b/third_party/WebKit/Source/core/layout/LayoutObject.cpp |
index 487a40c172e0987a77e7a545a3f3f9a0090e421e..915e7e4c6115a034120284471ad4ff2d47eec0ef 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutObject.cpp |
+++ b/third_party/WebKit/Source/core/layout/LayoutObject.cpp |
@@ -947,45 +947,6 @@ LayoutBlock* LayoutObject::containingBlock() const |
return toLayoutBlock(o); |
} |
-bool LayoutObject::mustInvalidateFillLayersPaintOnHeightChange(const FillLayer& layer) const |
-{ |
- // Nobody will use multiple layers without wanting fancy positioning. |
- if (layer.next()) |
- return true; |
- |
- // Make sure we have a valid image. |
- StyleImage* img = layer.image(); |
- if (!img || !img->canRender()) |
- return false; |
- |
- if (layer.repeatY() != RepeatFill && layer.repeatY() != NoRepeatFill) |
- return true; |
- |
- // TODO(alancutter): Make this work correctly for calc lengths. |
- if (layer.yPosition().hasPercent() && !layer.yPosition().isZero()) |
- return true; |
- |
- if (layer.backgroundYOrigin() != TopEdge) |
- return true; |
- |
- EFillSizeType sizeType = layer.sizeType(); |
- |
- if (sizeType == Contain || sizeType == Cover) |
- return true; |
- |
- if (sizeType == SizeLength) { |
- // TODO(alancutter): Make this work correctly for calc lengths. |
- if (layer.sizeLength().height().hasPercent() && !layer.sizeLength().height().isZero()) |
- return true; |
- if (img->isGeneratedImage() && layer.sizeLength().height().isAuto()) |
- return true; |
- } else if (img->usesImageContainerSize()) { |
- return true; |
- } |
- |
- return false; |
-} |
- |
FloatRect LayoutObject::absoluteBoundingBoxFloatRect() const |
{ |
Vector<FloatQuad> quads; |
@@ -1375,7 +1336,7 @@ inline void LayoutObject::invalidateSelectionIfNeeded(const LayoutBoxModelObject |
{ |
// Update selection rect when we are doing full invalidation (in case that the object is moved, composite status changed, etc.) |
// or shouldInvalidationSelection is set (in case that the selection itself changed). |
- bool fullInvalidation = view()->doingFullPaintInvalidation() || isFullPaintInvalidationReason(invalidationReason); |
+ bool fullInvalidation = isFullPaintInvalidationReason(invalidationReason); |
if (!fullInvalidation && !shouldInvalidateSelection()) |
return; |