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

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

Issue 930183002: Move and rename RenderEmbeddedObject and RenderIFrame. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rename properly to LayoutIFrame in test expectations. Created 5 years, 10 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2009, 2010 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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 #include "core/layout/compositing/CompositingRequirementsUpdater.h" 47 #include "core/layout/compositing/CompositingRequirementsUpdater.h"
48 #include "core/layout/compositing/GraphicsLayerTreeBuilder.h" 48 #include "core/layout/compositing/GraphicsLayerTreeBuilder.h"
49 #include "core/layout/compositing/GraphicsLayerUpdater.h" 49 #include "core/layout/compositing/GraphicsLayerUpdater.h"
50 #include "core/loader/FrameLoaderClient.h" 50 #include "core/loader/FrameLoaderClient.h"
51 #include "core/page/Chrome.h" 51 #include "core/page/Chrome.h"
52 #include "core/page/ChromeClient.h" 52 #include "core/page/ChromeClient.h"
53 #include "core/page/Page.h" 53 #include "core/page/Page.h"
54 #include "core/page/scrolling/ScrollingCoordinator.h" 54 #include "core/page/scrolling/ScrollingCoordinator.h"
55 #include "core/paint/FramePainter.h" 55 #include "core/paint/FramePainter.h"
56 #include "core/paint/TransformRecorder.h" 56 #include "core/paint/TransformRecorder.h"
57 #include "core/rendering/RenderEmbeddedObject.h"
58 #include "core/rendering/RenderView.h" 57 #include "core/rendering/RenderView.h"
59 #include "platform/RuntimeEnabledFeatures.h" 58 #include "platform/RuntimeEnabledFeatures.h"
60 #include "platform/ScriptForbiddenScope.h" 59 #include "platform/ScriptForbiddenScope.h"
61 #include "platform/TraceEvent.h" 60 #include "platform/TraceEvent.h"
62 #include "platform/graphics/GraphicsLayer.h" 61 #include "platform/graphics/GraphicsLayer.h"
63 #include "platform/graphics/paint/DisplayItemList.h" 62 #include "platform/graphics/paint/DisplayItemList.h"
64 #include "platform/graphics/paint/DrawingRecorder.h" 63 #include "platform/graphics/paint/DrawingRecorder.h"
65 #include "platform/graphics/paint/TransformDisplayItem.h" 64 #include "platform/graphics/paint/TransformDisplayItem.h"
66 #include "public/platform/Platform.h" 65 #include "public/platform/Platform.h"
67 66
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 if (HTMLFrameOwnerElement* ownerElement = m_renderView.document().ownerEleme nt()) { 111 if (HTMLFrameOwnerElement* ownerElement = m_renderView.document().ownerEleme nt()) {
113 if (LayoutPart* renderer = ownerElement->layoutPart()) 112 if (LayoutPart* renderer = ownerElement->layoutPart())
114 renderer->layer()->updateSelfPaintingLayer(); 113 renderer->layer()->updateSelfPaintingLayer();
115 } 114 }
116 115
117 if (m_compositing) 116 if (m_compositing)
118 ensureRootLayer(); 117 ensureRootLayer();
119 else 118 else
120 destroyRootLayer(); 119 destroyRootLayer();
121 120
122 // Compositing also affects the answer to RenderIFrame::requiresAcceleratedC ompositing(), so 121 // Compositing also affects the answer to LayoutIFrame::requiresAcceleratedC ompositing(), so
123 // we need to schedule a style recalc in our parent document. 122 // we need to schedule a style recalc in our parent document.
124 if (HTMLFrameOwnerElement* ownerElement = m_renderView.document().ownerEleme nt()) 123 if (HTMLFrameOwnerElement* ownerElement = m_renderView.document().ownerEleme nt())
125 ownerElement->setNeedsCompositingUpdate(); 124 ownerElement->setNeedsCompositingUpdate();
126 } 125 }
127 126
128 void LayerCompositor::enableCompositingModeIfNeeded() 127 void LayerCompositor::enableCompositingModeIfNeeded()
129 { 128 {
130 if (!m_rootShouldAlwaysCompositeDirty) 129 if (!m_rootShouldAlwaysCompositeDirty)
131 return; 130 return;
132 131
(...skipping 1029 matching lines...) Expand 10 before | Expand all | Expand 10 after
1162 } else if (graphicsLayer == m_scrollLayer.get()) { 1161 } else if (graphicsLayer == m_scrollLayer.get()) {
1163 name = "LocalFrame Scrolling Layer"; 1162 name = "LocalFrame Scrolling Layer";
1164 } else { 1163 } else {
1165 ASSERT_NOT_REACHED(); 1164 ASSERT_NOT_REACHED();
1166 } 1165 }
1167 1166
1168 return name; 1167 return name;
1169 } 1168 }
1170 1169
1171 } // namespace blink 1170 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/compositing/CompositedLayerMapping.cpp ('k') | Source/core/layout/style/StyleRareNonInheritedData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698