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

Side by Side Diff: Source/core/rendering/compositing/RenderLayerCompositor.cpp

Issue 322163003: Rename AncestorDependentProperties to CompositingInputs (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Moar renaming Created 6 years, 6 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 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 27 matching lines...) Expand all
38 #include "core/inspector/InspectorInstrumentation.h" 38 #include "core/inspector/InspectorInstrumentation.h"
39 #include "core/inspector/InspectorNodeIds.h" 39 #include "core/inspector/InspectorNodeIds.h"
40 #include "core/page/Chrome.h" 40 #include "core/page/Chrome.h"
41 #include "core/page/Page.h" 41 #include "core/page/Page.h"
42 #include "core/page/scrolling/ScrollingCoordinator.h" 42 #include "core/page/scrolling/ScrollingCoordinator.h"
43 #include "core/rendering/RenderLayerStackingNode.h" 43 #include "core/rendering/RenderLayerStackingNode.h"
44 #include "core/rendering/RenderLayerStackingNodeIterator.h" 44 #include "core/rendering/RenderLayerStackingNodeIterator.h"
45 #include "core/rendering/RenderVideo.h" 45 #include "core/rendering/RenderVideo.h"
46 #include "core/rendering/RenderView.h" 46 #include "core/rendering/RenderView.h"
47 #include "core/rendering/compositing/CompositedLayerMapping.h" 47 #include "core/rendering/compositing/CompositedLayerMapping.h"
48 #include "core/rendering/compositing/CompositingInputsUpdater.h"
48 #include "core/rendering/compositing/CompositingLayerAssigner.h" 49 #include "core/rendering/compositing/CompositingLayerAssigner.h"
49 #include "core/rendering/compositing/CompositingRequirementsUpdater.h" 50 #include "core/rendering/compositing/CompositingRequirementsUpdater.h"
50 #include "core/rendering/compositing/GraphicsLayerTreeBuilder.h" 51 #include "core/rendering/compositing/GraphicsLayerTreeBuilder.h"
51 #include "core/rendering/compositing/GraphicsLayerUpdater.h" 52 #include "core/rendering/compositing/GraphicsLayerUpdater.h"
52 #include "platform/OverscrollTheme.h" 53 #include "platform/OverscrollTheme.h"
53 #include "platform/graphics/GraphicsLayer.h" 54 #include "platform/graphics/GraphicsLayer.h"
54 #include "public/platform/Platform.h" 55 #include "public/platform/Platform.h"
55 56
56 namespace WebCore { 57 namespace WebCore {
57 58
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 void RenderLayerCompositor::didLayout() 254 void RenderLayerCompositor::didLayout()
254 { 255 {
255 // FIXME: Technically we only need to do this when the FrameView's 256 // FIXME: Technically we only need to do this when the FrameView's
256 // isScrollable method would return a different value. 257 // isScrollable method would return a different value.
257 m_rootShouldAlwaysCompositeDirty = true; 258 m_rootShouldAlwaysCompositeDirty = true;
258 enableCompositingModeIfNeeded(); 259 enableCompositingModeIfNeeded();
259 260
260 // FIXME: Rather than marking the entire RenderView as dirty, we should 261 // FIXME: Rather than marking the entire RenderView as dirty, we should
261 // track which RenderLayers moved during layout and only dirty those 262 // track which RenderLayers moved during layout and only dirty those
262 // specific RenderLayers. 263 // specific RenderLayers.
263 rootRenderLayer()->setNeedsToUpdateAncestorDependentProperties(); 264 rootRenderLayer()->setNeedsCompositingInputsUpdate();
264 setNeedsCompositingUpdate(CompositingUpdateAfterCompositingInputChange); 265 setNeedsCompositingUpdate(CompositingUpdateAfterCompositingInputChange);
265 } 266 }
266 267
267 #if ASSERT_ENABLED 268 #if ASSERT_ENABLED
268 269
269 void RenderLayerCompositor::assertNoUnresolvedDirtyBits() 270 void RenderLayerCompositor::assertNoUnresolvedDirtyBits()
270 { 271 {
271 ASSERT(m_pendingUpdateType == CompositingUpdateNone); 272 ASSERT(m_pendingUpdateType == CompositingUpdateNone);
272 ASSERT(!m_rootShouldAlwaysCompositeDirty); 273 ASSERT(!m_rootShouldAlwaysCompositeDirty);
273 } 274 }
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 if (updateType == CompositingUpdateNone && !needsToUpdateScrollingCoordinato r) 330 if (updateType == CompositingUpdateNone && !needsToUpdateScrollingCoordinato r)
330 return; 331 return;
331 332
332 RenderLayer* updateRoot = rootRenderLayer(); 333 RenderLayer* updateRoot = rootRenderLayer();
333 334
334 Vector<RenderLayer*> layersNeedingRepaint; 335 Vector<RenderLayer*> layersNeedingRepaint;
335 336
336 if (updateType >= CompositingUpdateAfterCompositingInputChange) { 337 if (updateType >= CompositingUpdateAfterCompositingInputChange) {
337 bool layersChanged = false; 338 bool layersChanged = false;
338 { 339 {
339 TRACE_EVENT0("blink_rendering", "CompositingPropertyUpdater::updateA ncestorDependentProperties"); 340 TRACE_EVENT0("blink_rendering", "CompositingInputsUpdater::update");
340 CompositingPropertyUpdater(updateRoot).updateAncestorDependentProper ties(updateRoot); 341 CompositingInputsUpdater(updateRoot).update(updateRoot);
341 #if ASSERT_ENABLED 342 #if ASSERT_ENABLED
342 CompositingPropertyUpdater::assertNeedsToUpdateAncestorDependantProp ertiesBitsCleared(updateRoot); 343 CompositingInputsUpdater::assertNeedsCompositingInputsUpdateBitsClea red(updateRoot);
343 #endif 344 #endif
344 } 345 }
345 346
346 CompositingRequirementsUpdater(m_renderView, m_compositingReasonFinder). update(updateRoot); 347 CompositingRequirementsUpdater(m_renderView, m_compositingReasonFinder). update(updateRoot);
347 348
348 { 349 {
349 TRACE_EVENT0("blink_rendering", "CompositingLayerAssigner::assign"); 350 TRACE_EVENT0("blink_rendering", "CompositingLayerAssigner::assign");
350 CompositingLayerAssigner(this).assign(updateRoot, layersChanged, lay ersNeedingRepaint); 351 CompositingLayerAssigner(this).assign(updateRoot, layersChanged, lay ersNeedingRepaint);
351 } 352 }
352 353
(...skipping 956 matching lines...) Expand 10 before | Expand all | Expand 10 after
1309 } else if (graphicsLayer == m_scrollLayer.get()) { 1310 } else if (graphicsLayer == m_scrollLayer.get()) {
1310 name = "LocalFrame Scrolling Layer"; 1311 name = "LocalFrame Scrolling Layer";
1311 } else { 1312 } else {
1312 ASSERT_NOT_REACHED(); 1313 ASSERT_NOT_REACHED();
1313 } 1314 }
1314 1315
1315 return name; 1316 return name;
1316 } 1317 }
1317 1318
1318 } // namespace WebCore 1319 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/compositing/RenderLayerCompositor.h ('k') | Source/core/testing/Internals.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698