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

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: nit refine. 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 1404 matching lines...) Expand 10 before | Expand all | Expand 10 after
1415 if (!getBackgroundPaintedExtent(backgroundRect)) 1415 if (!getBackgroundPaintedExtent(backgroundRect))
1416 return false; 1416 return false;
1417 return foregroundIsKnownToBeOpaqueInRect(backgroundRect, backgroundObscurati onTestMaxDepth); 1417 return foregroundIsKnownToBeOpaqueInRect(backgroundRect, backgroundObscurati onTestMaxDepth);
1418 } 1418 }
1419 1419
1420 void LayoutBox::paintMask(const PaintInfo& paintInfo, const LayoutPoint& paintOf fset) const 1420 void LayoutBox::paintMask(const PaintInfo& paintInfo, const LayoutPoint& paintOf fset) const
1421 { 1421 {
1422 BoxPainter(*this).paintMask(paintInfo, paintOffset); 1422 BoxPainter(*this).paintMask(paintInfo, paintOffset);
1423 } 1423 }
1424 1424
1425 void LayoutBox::imageChanged(WrappedImagePtr image, const IntRect*) 1425 void LayoutBox::imageChanged(bool, WrappedImagePtr image, const IntRect*)
1426 { 1426 {
1427 // TODO(chrishtr): support PaintInvalidationDelayedFull for animated border images. 1427 // TODO(chrishtr): support PaintInvalidationDelayedFull for animated border images.
1428 if ((style()->borderImage().image() && style()->borderImage().image()->data( ) == image) 1428 if ((style()->borderImage().image() && style()->borderImage().image()->data( ) == image)
1429 || (style()->maskBoxImage().image() && style()->maskBoxImage().image()-> data() == image)) { 1429 || (style()->maskBoxImage().image() && style()->maskBoxImage().image()-> data() == image)) {
1430 setShouldDoFullPaintInvalidation(); 1430 setShouldDoFullPaintInvalidation();
1431 return; 1431 return;
1432 } 1432 }
1433 1433
1434 ShapeValue* shapeOutsideValue = style()->shapeOutside(); 1434 ShapeValue* shapeOutsideValue = style()->shapeOutside();
1435 if (!frameView()->isInPerformLayout() && isFloating() && shapeOutsideValue & & shapeOutsideValue->image() && shapeOutsideValue->image()->data() == image) { 1435 if (!frameView()->isInPerformLayout() && isFloating() && shapeOutsideValue & & shapeOutsideValue->image() && shapeOutsideValue->image()->data() == image) {
(...skipping 3249 matching lines...) Expand 10 before | Expand all | Expand 10 after
4685 } 4685 }
4686 4686
4687 void LayoutBox::IntrinsicSizingInfo::transpose() 4687 void LayoutBox::IntrinsicSizingInfo::transpose()
4688 { 4688 {
4689 size = size.transposedSize(); 4689 size = size.transposedSize();
4690 aspectRatio = aspectRatio.transposedSize(); 4690 aspectRatio = aspectRatio.transposedSize();
4691 std::swap(hasWidth, hasHeight); 4691 std::swap(hasWidth, hasHeight);
4692 } 4692 }
4693 4693
4694 } // namespace blink 4694 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698