| 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 3217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3283 } | 3284 } |
| 3284 } | 3285 } |
| 3285 } | 3286 } |
| 3286 } | 3287 } |
| 3287 | 3288 |
| 3288 void CompositedLayerMapping::PaintContents( | 3289 void CompositedLayerMapping::PaintContents( |
| 3289 const GraphicsLayer* graphics_layer, | 3290 const GraphicsLayer* graphics_layer, |
| 3290 GraphicsContext& context, | 3291 GraphicsContext& context, |
| 3291 GraphicsLayerPaintingPhase graphics_layer_painting_phase, | 3292 GraphicsLayerPaintingPhase graphics_layer_painting_phase, |
| 3292 const IntRect& interest_rect) const { | 3293 const IntRect& interest_rect) const { |
| 3294 FramePaintTiming frame_paint_timing(context, GetLayoutObject().GetFrame()); |
| 3295 |
| 3293 // https://code.google.com/p/chromium/issues/detail?id=343772 | 3296 // https://code.google.com/p/chromium/issues/detail?id=343772 |
| 3294 DisableCompositingQueryAsserts disabler; | 3297 DisableCompositingQueryAsserts disabler; |
| 3295 // Allow throttling to make sure no painting paths (e.g., | 3298 // Allow throttling to make sure no painting paths (e.g., |
| 3296 // ContentLayerDelegate::paintContents) try to paint throttled content. | 3299 // ContentLayerDelegate::paintContents) try to paint throttled content. |
| 3297 DocumentLifecycle::AllowThrottlingScope allow_throttling( | 3300 DocumentLifecycle::AllowThrottlingScope allow_throttling( |
| 3298 owning_layer_.GetLayoutObject().GetDocument().Lifecycle()); | 3301 owning_layer_.GetLayoutObject().GetDocument().Lifecycle()); |
| 3299 #if DCHECK_IS_ON() | 3302 #if DCHECK_IS_ON() |
| 3300 // FIXME: once the state machine is ready, this can be removed and we can | 3303 // FIXME: once the state machine is ready, this can be removed and we can |
| 3301 // refer to that instead. | 3304 // refer to that instead. |
| 3302 if (Page* page = GetLayoutObject().GetFrame()->GetPage()) | 3305 if (Page* page = GetLayoutObject().GetFrame()->GetPage()) |
| (...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3625 } else if (graphics_layer == decoration_outline_layer_.get()) { | 3628 } else if (graphics_layer == decoration_outline_layer_.get()) { |
| 3626 name = "Decoration Layer"; | 3629 name = "Decoration Layer"; |
| 3627 } else { | 3630 } else { |
| 3628 NOTREACHED(); | 3631 NOTREACHED(); |
| 3629 } | 3632 } |
| 3630 | 3633 |
| 3631 return name; | 3634 return name; |
| 3632 } | 3635 } |
| 3633 | 3636 |
| 3634 } // namespace blink | 3637 } // namespace blink |
| OLD | NEW |