Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1099)

Side by Side Diff: Source/core/layout/compositing/CompositedDeprecatedPaintLayerMapping.cpp

Issue 997073004: Move inspector/InspectorNodeIds to dom/DOMNodeIds. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 10 matching lines...) Expand all
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
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/fetch/ImageResource.h" 32 #include "core/fetch/ImageResource.h"
32 #include "core/frame/FrameView.h" 33 #include "core/frame/FrameView.h"
33 #include "core/frame/RemoteFrame.h" 34 #include "core/frame/RemoteFrame.h"
34 #include "core/html/HTMLCanvasElement.h" 35 #include "core/html/HTMLCanvasElement.h"
35 #include "core/html/HTMLIFrameElement.h" 36 #include "core/html/HTMLIFrameElement.h"
36 #include "core/html/HTMLMediaElement.h" 37 #include "core/html/HTMLMediaElement.h"
37 #include "core/html/HTMLVideoElement.h" 38 #include "core/html/HTMLVideoElement.h"
38 #include "core/html/canvas/CanvasRenderingContext.h" 39 #include "core/html/canvas/CanvasRenderingContext.h"
39 #include "core/inspector/InspectorInstrumentation.h" 40 #include "core/inspector/InspectorInstrumentation.h"
40 #include "core/inspector/InspectorNodeIds.h"
41 #include "core/layout/FilterEffectRenderer.h" 41 #include "core/layout/FilterEffectRenderer.h"
42 #include "core/layout/LayoutEmbeddedObject.h" 42 #include "core/layout/LayoutEmbeddedObject.h"
43 #include "core/layout/LayoutImage.h" 43 #include "core/layout/LayoutImage.h"
44 #include "core/layout/LayoutPart.h" 44 #include "core/layout/LayoutPart.h"
45 #include "core/layout/LayoutVideo.h" 45 #include "core/layout/LayoutVideo.h"
46 #include "core/layout/LayoutView.h" 46 #include "core/layout/LayoutView.h"
47 #include "core/layout/compositing/DeprecatedPaintLayerCompositor.h" 47 #include "core/layout/compositing/DeprecatedPaintLayerCompositor.h"
48 #include "core/layout/style/KeyframeList.h" 48 #include "core/layout/style/KeyframeList.h"
49 #include "core/page/Chrome.h" 49 #include "core/page/Chrome.h"
50 #include "core/page/ChromeClient.h" 50 #include "core/page/ChromeClient.h"
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 PassOwnPtr<GraphicsLayer> CompositedDeprecatedPaintLayerMapping::createGraphicsL ayer(CompositingReasons reasons) 208 PassOwnPtr<GraphicsLayer> CompositedDeprecatedPaintLayerMapping::createGraphicsL ayer(CompositingReasons reasons)
209 { 209 {
210 GraphicsLayerFactory* graphicsLayerFactory = 0; 210 GraphicsLayerFactory* graphicsLayerFactory = 0;
211 if (Page* page = layoutObject()->frame()->page()) 211 if (Page* page = layoutObject()->frame()->page())
212 graphicsLayerFactory = page->chrome().client().graphicsLayerFactory(); 212 graphicsLayerFactory = page->chrome().client().graphicsLayerFactory();
213 213
214 OwnPtr<GraphicsLayer> graphicsLayer = GraphicsLayer::create(graphicsLayerFac tory, this); 214 OwnPtr<GraphicsLayer> graphicsLayer = GraphicsLayer::create(graphicsLayerFac tory, this);
215 215
216 graphicsLayer->setCompositingReasons(reasons); 216 graphicsLayer->setCompositingReasons(reasons);
217 if (Node* owningNode = m_owningLayer.layoutObject()->generatingNode()) 217 if (Node* owningNode = m_owningLayer.layoutObject()->generatingNode())
218 graphicsLayer->setOwnerNodeId(InspectorNodeIds::idForNode(owningNode)); 218 graphicsLayer->setOwnerNodeId(DOMNodeIds::idForNode(owningNode));
219 219
220 return graphicsLayer.release(); 220 return graphicsLayer.release();
221 } 221 }
222 222
223 void CompositedDeprecatedPaintLayerMapping::createPrimaryGraphicsLayer() 223 void CompositedDeprecatedPaintLayerMapping::createPrimaryGraphicsLayer()
224 { 224 {
225 m_graphicsLayer = createGraphicsLayer(m_owningLayer.compositingReasons()); 225 m_graphicsLayer = createGraphicsLayer(m_owningLayer.compositingReasons());
226 226
227 #if !OS(ANDROID) 227 #if !OS(ANDROID)
228 if (m_isMainFrameLayoutViewLayer) 228 if (m_isMainFrameLayoutViewLayer)
(...skipping 2144 matching lines...) Expand 10 before | Expand all | Expand 10 after
2373 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) { 2373 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) {
2374 name = "Scrolling Block Selection Layer"; 2374 name = "Scrolling Block Selection Layer";
2375 } else { 2375 } else {
2376 ASSERT_NOT_REACHED(); 2376 ASSERT_NOT_REACHED();
2377 } 2377 }
2378 2378
2379 return name; 2379 return name;
2380 } 2380 }
2381 2381
2382 } // namespace blink 2382 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/inspector/InspectorTraceEvents.cpp ('k') | Source/core/layout/compositing/DeprecatedPaintLayerCompositor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698