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

Unified Diff: third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp

Issue 1447273003: Make the FloatSize constructor from an IntSize explicit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
diff --git a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
index d61ec02d198ed490b539551d63177555d9def36d..0153e27e2f4a64fef95c5f328bfbb811f4318e99 100644
--- a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
+++ b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
@@ -663,7 +663,7 @@ void CompositedLayerMapping::updateSquashingLayerGeometry(const LayoutPoint& off
}
squashingLayer->setPosition(squashLayerBounds.location());
- squashingLayer->setSize(squashLayerBounds.size());
+ squashingLayer->setSize(FloatSize(squashLayerBounds.size()));
*offsetFromTransformedAncestor = referenceOffsetFromTransformedAncestor;
offsetFromTransformedAncestor->move(squashLayerOriginInOwningLayerSpace);
@@ -711,7 +711,7 @@ void CompositedLayerMapping::updateGraphicsLayerGeometry(const PaintLayer* compo
updateAncestorClippingLayerGeometry(compositingContainer, snappedOffsetFromCompositedAncestor, graphicsLayerParentLocation);
updateOverflowControlsHostLayerGeometry(compositingStackingContext, compositingContainer);
- FloatSize contentsSize = relativeCompositingBounds.size();
+ FloatSize contentsSize(relativeCompositingBounds.size());
updateMainGraphicsLayerGeometry(relativeCompositingBounds, localCompositingBounds, graphicsLayerParentLocation);
updateContentsOffsetInCompositingLayer(snappedOffsetFromCompositedAncestor, graphicsLayerParentLocation);
@@ -761,7 +761,7 @@ void CompositedLayerMapping::updateMainGraphicsLayerGeometry(const IntRect& rela
m_graphicsLayer->setOffsetFromLayoutObject(toIntSize(localCompositingBounds.location()));
FloatSize oldSize = m_graphicsLayer->size();
- const IntSize& contentsSize = relativeCompositingBounds.size();
+ const FloatSize contentsSize(relativeCompositingBounds.size());
if (oldSize != contentsSize)
m_graphicsLayer->setSize(contentsSize);
@@ -814,7 +814,7 @@ void CompositedLayerMapping::updateAncestorClippingLayerGeometry(const PaintLaye
IntRect parentClipRect = pixelSnappedIntRect(m_owningLayer.clipper().backgroundClipRect(clipRectsContext).rect());
ASSERT(parentClipRect != LayoutRect::infiniteIntRect());
m_ancestorClippingLayer->setPosition(FloatPoint(parentClipRect.location() - graphicsLayerParentLocation));
- m_ancestorClippingLayer->setSize(parentClipRect.size());
+ m_ancestorClippingLayer->setSize(FloatSize(parentClipRect.size()));
// backgroundRect is relative to compositingContainer, so subtract snappedOffsetFromCompositedAncestor.X/snappedOffsetFromCompositedAncestor.Y to get back to local coords.
m_ancestorClippingLayer->setOffsetFromLayoutObject(parentClipRect.location() - snappedOffsetFromCompositedAncestor);
@@ -874,7 +874,7 @@ void CompositedLayerMapping::updateChildContainmentLayerGeometry(const IntRect&
clipPositionInParentSpace -= toFloatSize(ancestor->position());
m_childContainmentLayer->setPosition(clipPositionInParentSpace);
- m_childContainmentLayer->setSize(clippingBox.size());
+ m_childContainmentLayer->setSize(FloatSize(clippingBox.size()));
m_childContainmentLayer->setOffsetFromLayoutObject(toIntSize(clippingBox.location()));
if (m_childClippingMaskLayer && !m_scrollingLayer && !layoutObject()->style()->clipPath()) {
m_childClippingMaskLayer->setSize(m_childContainmentLayer->size());
@@ -887,7 +887,7 @@ void CompositedLayerMapping::updateChildTransformLayerGeometry()
if (!m_childTransformLayer)
return;
const IntRect borderBox = toLayoutBox(m_owningLayer.layoutObject())->pixelSnappedBorderBoxRect();
- m_childTransformLayer->setSize(borderBox.size());
+ m_childTransformLayer->setSize(FloatSize(borderBox.size()));
m_childTransformLayer->setPosition(FloatPoint(contentOffsetInCompositingLayer()));
}
@@ -951,7 +951,7 @@ void CompositedLayerMapping::updateScrollingLayerGeometry(const IntRect& localCo
IntRect overflowClipRect = enclosingIntRect(layoutBox->overflowClipRect(LayoutPoint()));
DoubleSize adjustedScrollOffset = m_owningLayer.scrollableArea()->adjustedScrollOffset();
m_scrollingLayer->setPosition(FloatPoint(overflowClipRect.location() - localCompositingBounds.location() + roundedIntSize(m_owningLayer.subpixelAccumulation())));
- m_scrollingLayer->setSize(overflowClipRect.size());
+ m_scrollingLayer->setSize(FloatSize(overflowClipRect.size()));
IntSize oldScrollingLayerOffset = m_scrollingLayer->offsetFromLayoutObject();
m_scrollingLayer->setOffsetFromLayoutObject(-toIntSize(overflowClipRect.location()));
@@ -976,7 +976,7 @@ void CompositedLayerMapping::updateScrollingLayerGeometry(const IntRect& localCo
m_scrollingContentsLayer->setPosition(coordinatorHandlesOffset ? FloatPoint() : FloatPoint(-toFloatSize(adjustedScrollOffset)));
}
- m_scrollingContentsLayer->setSize(scrollSize);
+ m_scrollingContentsLayer->setSize(FloatSize(scrollSize));
// FIXME: The paint offset and the scroll offset should really be separate concepts.
m_scrollingContentsLayer->setOffsetDoubleFromLayoutObject(scrollingContentsOffset, GraphicsLayer::DontSetNeedsDisplay);
@@ -1046,7 +1046,7 @@ void CompositedLayerMapping::updateBackgroundLayerGeometry(const FloatSize& rela
FloatSize backgroundSize = relativeCompositingBoundsSize;
if (backgroundLayerPaintsFixedRootBackground()) {
FrameView* frameView = toLayoutView(layoutObject())->frameView();
- backgroundSize = frameView->visibleContentRect().size();
+ backgroundSize = FloatSize(frameView->visibleContentRect().size());
}
m_backgroundLayer->setPosition(FloatPoint());
if (backgroundSize != m_backgroundLayer->size()) {
@@ -1208,7 +1208,7 @@ void CompositedLayerMapping::updateScrollingBlockSelection()
return;
m_scrollingBlockSelectionLayer->setPosition(position);
- m_scrollingBlockSelectionLayer->setSize(blockSelectionGapsBounds.size());
+ m_scrollingBlockSelectionLayer->setSize(FloatSize(blockSelectionGapsBounds.size()));
m_scrollingBlockSelectionLayer->setOffsetFromLayoutObject(toIntSize(blockSelectionGapsBounds.location()), GraphicsLayer::SetNeedsDisplay);
}
@@ -1364,7 +1364,7 @@ void CompositedLayerMapping::positionOverflowControlsLayers()
Scrollbar* hBar = m_owningLayer.scrollableArea()->horizontalScrollbar();
if (hBar) {
layer->setPosition(hBar->frameRect().location() - offsetFromLayoutObject);
- layer->setSize(hBar->frameRect().size());
+ layer->setSize(FloatSize(hBar->frameRect().size()));
if (layer->hasContentsLayer())
layer->setContentsRect(IntRect(IntPoint(), hBar->frameRect().size()));
}
@@ -1375,7 +1375,7 @@ void CompositedLayerMapping::positionOverflowControlsLayers()
Scrollbar* vBar = m_owningLayer.scrollableArea()->verticalScrollbar();
if (vBar) {
layer->setPosition(vBar->frameRect().location() - offsetFromLayoutObject);
- layer->setSize(vBar->frameRect().size());
+ layer->setSize(FloatSize(vBar->frameRect().size()));
if (layer->hasContentsLayer())
layer->setContentsRect(IntRect(IntPoint(), vBar->frameRect().size()));
}

Powered by Google App Engine
This is Rietveld 408576698