| 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 26 matching lines...) Expand all Loading... |
| 37 #include "core/html/HTMLMediaElement.h" | 37 #include "core/html/HTMLMediaElement.h" |
| 38 #include "core/html/HTMLVideoElement.h" | 38 #include "core/html/HTMLVideoElement.h" |
| 39 #include "core/html/canvas/CanvasRenderingContext.h" | 39 #include "core/html/canvas/CanvasRenderingContext.h" |
| 40 #include "core/inspector/InspectorInstrumentation.h" | 40 #include "core/inspector/InspectorInstrumentation.h" |
| 41 #include "core/layout/LayoutEmbeddedObject.h" | 41 #include "core/layout/LayoutEmbeddedObject.h" |
| 42 #include "core/layout/LayoutImage.h" | 42 #include "core/layout/LayoutImage.h" |
| 43 #include "core/layout/LayoutPart.h" | 43 #include "core/layout/LayoutPart.h" |
| 44 #include "core/layout/LayoutVideo.h" | 44 #include "core/layout/LayoutVideo.h" |
| 45 #include "core/layout/LayoutView.h" | 45 #include "core/layout/LayoutView.h" |
| 46 #include "core/layout/compositing/DeprecatedPaintLayerCompositor.h" | 46 #include "core/layout/compositing/DeprecatedPaintLayerCompositor.h" |
| 47 #include "core/style/KeyframeList.h" | |
| 48 #include "core/page/ChromeClient.h" | 47 #include "core/page/ChromeClient.h" |
| 49 #include "core/page/Page.h" | 48 #include "core/page/Page.h" |
| 50 #include "core/page/scrolling/ScrollingCoordinator.h" | 49 #include "core/page/scrolling/ScrollingCoordinator.h" |
| 51 #include "core/paint/DeprecatedPaintLayerPainter.h" | 50 #include "core/paint/DeprecatedPaintLayerPainter.h" |
| 52 #include "core/paint/DeprecatedPaintLayerStackingNodeIterator.h" | 51 #include "core/paint/DeprecatedPaintLayerStackingNodeIterator.h" |
| 53 #include "core/paint/ScrollableAreaPainter.h" | 52 #include "core/paint/ScrollableAreaPainter.h" |
| 54 #include "core/paint/TransformRecorder.h" | 53 #include "core/paint/TransformRecorder.h" |
| 55 #include "core/plugins/PluginView.h" | 54 #include "core/plugins/PluginView.h" |
| 55 #include "core/style/KeyframeList.h" |
| 56 #include "platform/LengthFunctions.h" | 56 #include "platform/LengthFunctions.h" |
| 57 #include "platform/RuntimeEnabledFeatures.h" | 57 #include "platform/RuntimeEnabledFeatures.h" |
| 58 #include "platform/fonts/FontCache.h" | 58 #include "platform/fonts/FontCache.h" |
| 59 #include "platform/geometry/TransformState.h" | 59 #include "platform/geometry/TransformState.h" |
| 60 #include "platform/graphics/GraphicsContext.h" | 60 #include "platform/graphics/GraphicsContext.h" |
| 61 #include "platform/graphics/paint/ClipDisplayItem.h" | 61 #include "platform/graphics/paint/ClipDisplayItem.h" |
| 62 #include "platform/graphics/paint/DisplayItemList.h" | 62 #include "platform/graphics/paint/DisplayItemList.h" |
| 63 #include "platform/graphics/paint/TransformDisplayItem.h" | 63 #include "platform/graphics/paint/TransformDisplayItem.h" |
| 64 #include "wtf/CurrentTime.h" | 64 #include "wtf/CurrentTime.h" |
| 65 #include "wtf/text/StringBuilder.h" | 65 #include "wtf/text/StringBuilder.h" |
| (...skipping 988 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1054 if (m_ancestorClippingLayer) | 1054 if (m_ancestorClippingLayer) |
| 1055 m_ancestorClippingLayer->removeAllChildren(); | 1055 m_ancestorClippingLayer->removeAllChildren(); |
| 1056 | 1056 |
| 1057 m_graphicsLayer->removeFromParent(); | 1057 m_graphicsLayer->removeFromParent(); |
| 1058 | 1058 |
| 1059 if (m_ancestorClippingLayer) | 1059 if (m_ancestorClippingLayer) |
| 1060 m_ancestorClippingLayer->addChild(m_graphicsLayer.get()); | 1060 m_ancestorClippingLayer->addChild(m_graphicsLayer.get()); |
| 1061 | 1061 |
| 1062 // Layer to which children should be attached as we build the hierarchy. | 1062 // Layer to which children should be attached as we build the hierarchy. |
| 1063 GraphicsLayer* bottomLayer = m_graphicsLayer.get(); | 1063 GraphicsLayer* bottomLayer = m_graphicsLayer.get(); |
| 1064 auto updateBottomLayer = [&bottomLayer](GraphicsLayer* layer) { | 1064 auto updateBottomLayer = [&bottomLayer](GraphicsLayer* layer) |
| 1065 { |
| 1065 if (layer) { | 1066 if (layer) { |
| 1066 bottomLayer->addChild(layer); | 1067 bottomLayer->addChild(layer); |
| 1067 bottomLayer = layer; | 1068 bottomLayer = layer; |
| 1068 } | 1069 } |
| 1069 }; | 1070 }; |
| 1070 | 1071 |
| 1071 updateBottomLayer(m_childTransformLayer.get()); | 1072 updateBottomLayer(m_childTransformLayer.get()); |
| 1072 updateBottomLayer(m_childContainmentLayer.get()); | 1073 updateBottomLayer(m_childContainmentLayer.get()); |
| 1073 updateBottomLayer(m_scrollingLayer.get()); | 1074 updateBottomLayer(m_scrollingLayer.get()); |
| 1074 | 1075 |
| (...skipping 1267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2342 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) { | 2343 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) { |
| 2343 name = "Scrolling Block Selection Layer"; | 2344 name = "Scrolling Block Selection Layer"; |
| 2344 } else { | 2345 } else { |
| 2345 ASSERT_NOT_REACHED(); | 2346 ASSERT_NOT_REACHED(); |
| 2346 } | 2347 } |
| 2347 | 2348 |
| 2348 return name; | 2349 return name; |
| 2349 } | 2350 } |
| 2350 | 2351 |
| 2351 } // namespace blink | 2352 } // namespace blink |
| OLD | NEW |