Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(318)

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutBox.cpp

Issue 1728313003: Split ImageResourceClient into ResourceClient and ImageResourceObserver [2/2] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and reflect comment Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 1385 matching lines...) Expand 10 before | Expand all | Expand 10 after
1396 if (!getBackgroundPaintedExtent(backgroundRect)) 1396 if (!getBackgroundPaintedExtent(backgroundRect))
1397 return false; 1397 return false;
1398 return foregroundIsKnownToBeOpaqueInRect(backgroundRect, backgroundObscurati onTestMaxDepth); 1398 return foregroundIsKnownToBeOpaqueInRect(backgroundRect, backgroundObscurati onTestMaxDepth);
1399 } 1399 }
1400 1400
1401 void LayoutBox::paintMask(const PaintInfo& paintInfo, const LayoutPoint& paintOf fset) const 1401 void LayoutBox::paintMask(const PaintInfo& paintInfo, const LayoutPoint& paintOf fset) const
1402 { 1402 {
1403 BoxPainter(*this).paintMask(paintInfo, paintOffset); 1403 BoxPainter(*this).paintMask(paintInfo, paintOffset);
1404 } 1404 }
1405 1405
1406 void LayoutBox::imageChanged(WrappedImagePtr image, const IntRect*) 1406 void LayoutBox::imageChanged(bool, WrappedImagePtr image, const IntRect*)
1407 { 1407 {
1408 // TODO(chrishtr): support PaintInvalidationDelayedFull for animated border images. 1408 // TODO(chrishtr): support PaintInvalidationDelayedFull for animated border images.
1409 if ((style()->borderImage().image() && style()->borderImage().image()->data( ) == image) 1409 if ((style()->borderImage().image() && style()->borderImage().image()->data( ) == image)
1410 || (style()->maskBoxImage().image() && style()->maskBoxImage().image()-> data() == image)) { 1410 || (style()->maskBoxImage().image() && style()->maskBoxImage().image()-> data() == image)) {
1411 setShouldDoFullPaintInvalidation(); 1411 setShouldDoFullPaintInvalidation();
1412 return; 1412 return;
1413 } 1413 }
1414 1414
1415 ShapeValue* shapeOutsideValue = style()->shapeOutside(); 1415 ShapeValue* shapeOutsideValue = style()->shapeOutside();
1416 if (!frameView()->isInPerformLayout() && isFloating() && shapeOutsideValue & & shapeOutsideValue->image() && shapeOutsideValue->image()->data() == image) { 1416 if (!frameView()->isInPerformLayout() && isFloating() && shapeOutsideValue & & shapeOutsideValue->image() && shapeOutsideValue->image()->data() == image) {
(...skipping 3261 matching lines...) Expand 10 before | Expand all | Expand 10 after
4678 } 4678 }
4679 4679
4680 void LayoutBox::IntrinsicSizingInfo::transpose() 4680 void LayoutBox::IntrinsicSizingInfo::transpose()
4681 { 4681 {
4682 size = size.transposedSize(); 4682 size = size.transposedSize();
4683 aspectRatio = aspectRatio.transposedSize(); 4683 aspectRatio = aspectRatio.transposedSize();
4684 std::swap(hasWidth, hasHeight); 4684 std::swap(hasWidth, hasHeight);
4685 } 4685 }
4686 4686
4687 } // namespace blink 4687 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698