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 12 matching lines...) Expand all Loading... |
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
24 */ | 24 */ |
25 | 25 |
26 #include "config.h" | 26 #include "config.h" |
27 | 27 |
28 #include "core/layout/compositing/CompositedDeprecatedPaintLayerMapping.h" | 28 #include "core/layout/compositing/CompositedDeprecatedPaintLayerMapping.h" |
29 | 29 |
30 #include "core/HTMLNames.h" | 30 #include "core/HTMLNames.h" |
31 #include "core/dom/DOMNodeIds.h" | 31 #include "core/dom/DOMNodeIds.h" |
32 #include "core/fetch/ImageResource.h" | 32 #include "core/fetch/ImageResource.h" |
33 #include "core/frame/FrameHost.h" | |
34 #include "core/frame/FrameView.h" | 33 #include "core/frame/FrameView.h" |
35 #include "core/frame/RemoteFrame.h" | 34 #include "core/frame/RemoteFrame.h" |
36 #include "core/html/HTMLCanvasElement.h" | 35 #include "core/html/HTMLCanvasElement.h" |
37 #include "core/html/HTMLIFrameElement.h" | 36 #include "core/html/HTMLIFrameElement.h" |
38 #include "core/html/HTMLMediaElement.h" | 37 #include "core/html/HTMLMediaElement.h" |
39 #include "core/html/HTMLVideoElement.h" | 38 #include "core/html/HTMLVideoElement.h" |
40 #include "core/html/canvas/CanvasRenderingContext.h" | 39 #include "core/html/canvas/CanvasRenderingContext.h" |
41 #include "core/inspector/InspectorInstrumentation.h" | 40 #include "core/inspector/InspectorInstrumentation.h" |
42 #include "core/layout/LayoutEmbeddedObject.h" | 41 #include "core/layout/LayoutEmbeddedObject.h" |
43 #include "core/layout/LayoutHTMLCanvas.h" | 42 #include "core/layout/LayoutHTMLCanvas.h" |
(...skipping 1011 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1055 bottomLayer = layer; | 1054 bottomLayer = layer; |
1056 } | 1055 } |
1057 }; | 1056 }; |
1058 | 1057 |
1059 updateBottomLayer(m_childTransformLayer.get()); | 1058 updateBottomLayer(m_childTransformLayer.get()); |
1060 updateBottomLayer(m_childContainmentLayer.get()); | 1059 updateBottomLayer(m_childContainmentLayer.get()); |
1061 updateBottomLayer(m_scrollingLayer.get()); | 1060 updateBottomLayer(m_scrollingLayer.get()); |
1062 | 1061 |
1063 // Now constructing the subtree for the overflow controls. | 1062 // Now constructing the subtree for the overflow controls. |
1064 bottomLayer = m_graphicsLayer.get(); | 1063 bottomLayer = m_graphicsLayer.get(); |
1065 if (m_isMainFrameLayoutViewLayer) | |
1066 bottomLayer = layoutObject()->frame()->page()->frameHost().visualViewpor
t().containerLayer(); | |
1067 updateBottomLayer(m_overflowControlsClippingLayer.get()); | 1064 updateBottomLayer(m_overflowControlsClippingLayer.get()); |
1068 updateBottomLayer(m_overflowControlsHostLayer.get()); | 1065 updateBottomLayer(m_overflowControlsHostLayer.get()); |
1069 if (m_layerForHorizontalScrollbar) | 1066 if (m_layerForHorizontalScrollbar) |
1070 m_overflowControlsHostLayer->addChild(m_layerForHorizontalScrollbar.get(
)); | 1067 m_overflowControlsHostLayer->addChild(m_layerForHorizontalScrollbar.get(
)); |
1071 if (m_layerForVerticalScrollbar) | 1068 if (m_layerForVerticalScrollbar) |
1072 m_overflowControlsHostLayer->addChild(m_layerForVerticalScrollbar.get())
; | 1069 m_overflowControlsHostLayer->addChild(m_layerForVerticalScrollbar.get())
; |
1073 if (m_layerForScrollCorner) | 1070 if (m_layerForScrollCorner) |
1074 m_overflowControlsHostLayer->addChild(m_layerForScrollCorner.get()); | 1071 m_overflowControlsHostLayer->addChild(m_layerForScrollCorner.get()); |
1075 | 1072 |
1076 // The squashing containment layer, if it exists, becomes a no-op parent. | 1073 // The squashing containment layer, if it exists, becomes a no-op parent. |
(...skipping 1311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2388 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) { | 2385 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) { |
2389 name = "Scrolling Block Selection Layer"; | 2386 name = "Scrolling Block Selection Layer"; |
2390 } else { | 2387 } else { |
2391 ASSERT_NOT_REACHED(); | 2388 ASSERT_NOT_REACHED(); |
2392 } | 2389 } |
2393 | 2390 |
2394 return name; | 2391 return name; |
2395 } | 2392 } |
2396 | 2393 |
2397 } // namespace blink | 2394 } // namespace blink |
OLD | NEW |