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

Side by Side Diff: Source/core/paint/LayerClipRecorder.cpp

Issue 1192363005: Move all clip display item parameters to the constructor (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 6 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
« no previous file with comments | « Source/core/paint/BoxClipper.cpp ('k') | Source/core/paint/RoundedInnerRectClipper.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "core/paint/LayerClipRecorder.h" 6 #include "core/paint/LayerClipRecorder.h"
7 7
8 #include "core/layout/ClipRect.h" 8 #include "core/layout/ClipRect.h"
9 #include "core/layout/LayoutView.h" 9 #include "core/layout/LayoutView.h"
10 #include "core/paint/DeprecatedPaintLayer.h" 10 #include "core/paint/DeprecatedPaintLayer.h"
11 #include "platform/RuntimeEnabledFeatures.h" 11 #include "platform/RuntimeEnabledFeatures.h"
12 #include "platform/geometry/IntRect.h" 12 #include "platform/geometry/IntRect.h"
13 #include "platform/graphics/GraphicsContext.h" 13 #include "platform/graphics/GraphicsContext.h"
14 #include "platform/graphics/GraphicsLayer.h" 14 #include "platform/graphics/GraphicsLayer.h"
15 #include "platform/graphics/paint/ClipRecorder.h" 15 #include "platform/graphics/paint/ClipRecorder.h"
16 #include "platform/graphics/paint/DisplayItemList.h" 16 #include "platform/graphics/paint/DisplayItemList.h"
17 17
18 namespace blink { 18 namespace blink {
19 19
20 LayerClipRecorder::LayerClipRecorder(GraphicsContext& graphicsContext, const Lay outBoxModelObject& layoutObject, DisplayItem::Type clipType, const ClipRect& cli pRect, 20 LayerClipRecorder::LayerClipRecorder(GraphicsContext& graphicsContext, const Lay outBoxModelObject& layoutObject, DisplayItem::Type clipType, const ClipRect& cli pRect,
21 const DeprecatedPaintLayerPaintingInfo* localPaintingInfo, const LayoutPoint & fragmentOffset, PaintLayerFlags paintFlags, BorderRadiusClippingRule rule) 21 const DeprecatedPaintLayerPaintingInfo* localPaintingInfo, const LayoutPoint & fragmentOffset, PaintLayerFlags paintFlags, BorderRadiusClippingRule rule)
22 : m_graphicsContext(graphicsContext) 22 : m_graphicsContext(graphicsContext)
23 , m_layoutObject(layoutObject) 23 , m_layoutObject(layoutObject)
24 , m_clipType(clipType) 24 , m_clipType(clipType)
25 { 25 {
26 IntRect snappedClipRect = pixelSnappedIntRect(clipRect.rect()); 26 IntRect snappedClipRect = pixelSnappedIntRect(clipRect.rect());
27 OwnPtr<ClipDisplayItem> clipDisplayItem = ClipDisplayItem::create(layoutObje ct, clipType, snappedClipRect); 27 OwnPtr<Vector<FloatRoundedRect>> roundedRects;
28 if (localPaintingInfo && clipRect.hasRadius()) 28 if (localPaintingInfo && clipRect.hasRadius()) {
29 collectRoundedRectClips(*layoutObject.layer(), *localPaintingInfo, graph icsContext, fragmentOffset, paintFlags, rule, clipDisplayItem->roundedRectClips( )); 29 roundedRects = adoptPtr(new Vector<FloatRoundedRect>());
30 collectRoundedRectClips(*layoutObject.layer(), *localPaintingInfo, graph icsContext, fragmentOffset, paintFlags, rule, *roundedRects);
31 }
32
33 OwnPtr<ClipDisplayItem> clipDisplayItem = ClipDisplayItem::create(layoutObje ct, clipType, snappedClipRect, roundedRects.release());
30 if (!RuntimeEnabledFeatures::slimmingPaintEnabled()) { 34 if (!RuntimeEnabledFeatures::slimmingPaintEnabled()) {
31 clipDisplayItem->replay(graphicsContext); 35 clipDisplayItem->replay(graphicsContext);
32 } else { 36 } else {
33 ASSERT(m_graphicsContext.displayItemList()); 37 ASSERT(m_graphicsContext.displayItemList());
34 if (m_graphicsContext.displayItemList()->displayItemConstructionIsDisabl ed()) 38 if (m_graphicsContext.displayItemList()->displayItemConstructionIsDisabl ed())
35 return; 39 return;
36 m_graphicsContext.displayItemList()->add(clipDisplayItem.release()); 40 m_graphicsContext.displayItemList()->add(clipDisplayItem.release());
37 } 41 }
38 } 42 }
39 43
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 return; 88 return;
85 DisplayItem::Type endType = DisplayItem::clipTypeToEndClipType(m_clipTyp e); 89 DisplayItem::Type endType = DisplayItem::clipTypeToEndClipType(m_clipTyp e);
86 OwnPtr<EndClipDisplayItem> endClip = EndClipDisplayItem::create(m_layout Object, endType); 90 OwnPtr<EndClipDisplayItem> endClip = EndClipDisplayItem::create(m_layout Object, endType);
87 m_graphicsContext.displayItemList()->add(endClip.release()); 91 m_graphicsContext.displayItemList()->add(endClip.release());
88 } else { 92 } else {
89 m_graphicsContext.restore(); 93 m_graphicsContext.restore();
90 } 94 }
91 } 95 }
92 96
93 } // namespace blink 97 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/paint/BoxClipper.cpp ('k') | Source/core/paint/RoundedInnerRectClipper.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698