OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
46 #include "core/layout/LayoutView.h" | 46 #include "core/layout/LayoutView.h" |
47 #include "core/layout/api/LayoutAPIShim.h" | 47 #include "core/layout/api/LayoutAPIShim.h" |
48 #include "core/layout/api/LayoutPartItem.h" | 48 #include "core/layout/api/LayoutPartItem.h" |
49 #include "core/layout/compositing/PaintLayerCompositor.h" | 49 #include "core/layout/compositing/PaintLayerCompositor.h" |
50 #include "core/loader/resource/ImageResourceContent.h" | 50 #include "core/loader/resource/ImageResourceContent.h" |
51 #include "core/page/ChromeClient.h" | 51 #include "core/page/ChromeClient.h" |
52 #include "core/page/Page.h" | 52 #include "core/page/Page.h" |
53 #include "core/page/scrolling/ScrollingCoordinator.h" | 53 #include "core/page/scrolling/ScrollingCoordinator.h" |
54 #include "core/page/scrolling/StickyPositionScrollingConstraints.h" | 54 #include "core/page/scrolling/StickyPositionScrollingConstraints.h" |
55 #include "core/page/scrolling/TopDocumentRootScrollerController.h" | 55 #include "core/page/scrolling/TopDocumentRootScrollerController.h" |
| 56 #include "core/paint/FramePaintTiming.h" |
56 #include "core/paint/ObjectPaintInvalidator.h" | 57 #include "core/paint/ObjectPaintInvalidator.h" |
57 #include "core/paint/PaintInfo.h" | 58 #include "core/paint/PaintInfo.h" |
58 #include "core/paint/PaintLayerPainter.h" | 59 #include "core/paint/PaintLayerPainter.h" |
59 #include "core/paint/PaintLayerStackingNodeIterator.h" | 60 #include "core/paint/PaintLayerStackingNodeIterator.h" |
60 #include "core/paint/ScrollableAreaPainter.h" | 61 #include "core/paint/ScrollableAreaPainter.h" |
61 #include "core/paint/TransformRecorder.h" | 62 #include "core/paint/TransformRecorder.h" |
62 #include "core/plugins/PluginView.h" | 63 #include "core/plugins/PluginView.h" |
63 #include "core/probe/CoreProbes.h" | 64 #include "core/probe/CoreProbes.h" |
64 #include "platform/LengthFunctions.h" | 65 #include "platform/LengthFunctions.h" |
65 #include "platform/RuntimeEnabledFeatures.h" | 66 #include "platform/RuntimeEnabledFeatures.h" |
(...skipping 3208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3274 } | 3275 } |
3275 } | 3276 } |
3276 } | 3277 } |
3277 } | 3278 } |
3278 | 3279 |
3279 void CompositedLayerMapping::PaintContents( | 3280 void CompositedLayerMapping::PaintContents( |
3280 const GraphicsLayer* graphics_layer, | 3281 const GraphicsLayer* graphics_layer, |
3281 GraphicsContext& context, | 3282 GraphicsContext& context, |
3282 GraphicsLayerPaintingPhase graphics_layer_painting_phase, | 3283 GraphicsLayerPaintingPhase graphics_layer_painting_phase, |
3283 const IntRect& interest_rect) const { | 3284 const IntRect& interest_rect) const { |
| 3285 FramePaintTiming frame_paint_timing(context, GetLayoutObject().GetFrame()); |
| 3286 |
3284 // https://code.google.com/p/chromium/issues/detail?id=343772 | 3287 // https://code.google.com/p/chromium/issues/detail?id=343772 |
3285 DisableCompositingQueryAsserts disabler; | 3288 DisableCompositingQueryAsserts disabler; |
3286 // Allow throttling to make sure no painting paths (e.g., | 3289 // Allow throttling to make sure no painting paths (e.g., |
3287 // ContentLayerDelegate::paintContents) try to paint throttled content. | 3290 // ContentLayerDelegate::paintContents) try to paint throttled content. |
3288 DocumentLifecycle::AllowThrottlingScope allow_throttling( | 3291 DocumentLifecycle::AllowThrottlingScope allow_throttling( |
3289 owning_layer_.GetLayoutObject().GetDocument().Lifecycle()); | 3292 owning_layer_.GetLayoutObject().GetDocument().Lifecycle()); |
3290 #if DCHECK_IS_ON() | 3293 #if DCHECK_IS_ON() |
3291 // FIXME: once the state machine is ready, this can be removed and we can | 3294 // FIXME: once the state machine is ready, this can be removed and we can |
3292 // refer to that instead. | 3295 // refer to that instead. |
3293 if (Page* page = GetLayoutObject().GetFrame()->GetPage()) | 3296 if (Page* page = GetLayoutObject().GetFrame()->GetPage()) |
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3615 } else if (graphics_layer == decoration_outline_layer_.get()) { | 3618 } else if (graphics_layer == decoration_outline_layer_.get()) { |
3616 name = "Decoration Layer"; | 3619 name = "Decoration Layer"; |
3617 } else { | 3620 } else { |
3618 NOTREACHED(); | 3621 NOTREACHED(); |
3619 } | 3622 } |
3620 | 3623 |
3621 return name; | 3624 return name; |
3622 } | 3625 } |
3623 | 3626 |
3624 } // namespace blink | 3627 } // namespace blink |
OLD | NEW |