Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> | 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> |
| 3 * 1999 Lars Knoll <knoll@kde.org> | 3 * 1999 Lars Knoll <knoll@kde.org> |
| 4 * 1999 Antti Koivisto <koivisto@kde.org> | 4 * 1999 Antti Koivisto <koivisto@kde.org> |
| 5 * 2000 Simon Hausmann <hausmann@kde.org> | 5 * 2000 Simon Hausmann <hausmann@kde.org> |
| 6 * 2000 Stefan Schimanski <1Stein@gmx.de> | 6 * 2000 Stefan Schimanski <1Stein@gmx.de> |
| 7 * 2001 George Staikos <staikos@kde.org> | 7 * 2001 George Staikos <staikos@kde.org> |
| 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All | 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All |
| 9 * rights reserved. | 9 * rights reserved. |
| 10 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> | 10 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> |
| (...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 206 .absoluteToLocalQuad(FloatQuad(absoluteBoundingBox), UseTransforms) | 206 .absoluteToLocalQuad(FloatQuad(absoluteBoundingBox), UseTransforms) |
| 207 .boundingBox(); | 207 .boundingBox(); |
| 208 PaintLayerPaintingInfo paintingInfo(layer, LayoutRect(boundingBox), | 208 PaintLayerPaintingInfo paintingInfo(layer, LayoutRect(boundingBox), |
| 209 GlobalPaintFlattenCompositingLayers, | 209 GlobalPaintFlattenCompositingLayers, |
| 210 LayoutSize()); | 210 LayoutSize()); |
| 211 PaintLayerFlags flags = PaintLayerHaveTransparency | | 211 PaintLayerFlags flags = PaintLayerHaveTransparency | |
| 212 PaintLayerAppliedTransform | | 212 PaintLayerAppliedTransform | |
| 213 PaintLayerUncachedClipRects; | 213 PaintLayerUncachedClipRects; |
| 214 PaintRecordBuilder builder(deviceSpaceBounds(boundingBox, *m_localFrame)); | 214 PaintRecordBuilder builder(deviceSpaceBounds(boundingBox, *m_localFrame)); |
| 215 PaintLayerPainter(*layer).paint(builder.context(), paintingInfo, flags); | 215 PaintLayerPainter(*layer).paint(builder.context(), paintingInfo, flags); |
| 216 PropertyTreeState borderBoxProperties = PropertyTreeState::root(); | |
| 217 if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) { | |
| 218 borderBoxProperties = | |
| 219 *layer->layoutObject().paintProperties()->localBorderBoxProperties(); | |
| 220 } | |
| 221 LOG(ERROR) << "layer: " << layer->layoutObject().debugName(); | |
|
wkorman
2017/03/31 21:08:18
remove
chrishtr
2017/03/31 21:18:00
Fixed.
| |
| 216 return createDragImage( | 222 return createDragImage( |
| 217 *m_localFrame, 1.0f, | 223 *m_localFrame, 1.0f, |
| 218 LayoutObject::shouldRespectImageOrientation(draggedLayoutObject), | 224 LayoutObject::shouldRespectImageOrientation(draggedLayoutObject), |
| 219 boundingBox, builder.endRecording()); | 225 boundingBox, builder.endRecording(borderBoxProperties)); |
| 220 } | 226 } |
| 221 | 227 |
| 222 private: | 228 private: |
| 223 const Member<const LocalFrame> m_localFrame; | 229 const Member<const LocalFrame> m_localFrame; |
| 224 const Member<Node> m_node; | 230 const Member<Node> m_node; |
| 225 #if DCHECK_IS_ON() | 231 #if DCHECK_IS_ON() |
| 226 const uint64_t m_domTreeVersion; | 232 const uint64_t m_domTreeVersion; |
| 227 #endif | 233 #endif |
| 228 }; | 234 }; |
| 229 | 235 |
| (...skipping 693 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 923 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) | 929 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) |
| 924 m_frame->client()->frameBlameContext()->Enter(); | 930 m_frame->client()->frameBlameContext()->Enter(); |
| 925 } | 931 } |
| 926 | 932 |
| 927 ScopedFrameBlamer::~ScopedFrameBlamer() { | 933 ScopedFrameBlamer::~ScopedFrameBlamer() { |
| 928 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) | 934 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) |
| 929 m_frame->client()->frameBlameContext()->Leave(); | 935 m_frame->client()->frameBlameContext()->Leave(); |
| 930 } | 936 } |
| 931 | 937 |
| 932 } // namespace blink | 938 } // namespace blink |
| OLD | NEW |