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

Side by Side Diff: Source/core/rendering/RenderObject.cpp

Issue 723103002: Revert "Move ViewDisplayList to GraphicsLayer" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « Source/core/rendering/RenderObject.h ('k') | Source/core/rendering/RenderView.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2009 Google Inc. All rights reserved. 7 * Copyright (C) 2009 Google Inc. All rights reserved.
8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 #include "core/rendering/compositing/RenderLayerCompositor.h" 78 #include "core/rendering/compositing/RenderLayerCompositor.h"
79 #include "core/rendering/style/ContentData.h" 79 #include "core/rendering/style/ContentData.h"
80 #include "core/rendering/style/ShadowList.h" 80 #include "core/rendering/style/ShadowList.h"
81 #include "platform/JSONValues.h" 81 #include "platform/JSONValues.h"
82 #include "platform/Partitions.h" 82 #include "platform/Partitions.h"
83 #include "platform/RuntimeEnabledFeatures.h" 83 #include "platform/RuntimeEnabledFeatures.h"
84 #include "platform/TraceEvent.h" 84 #include "platform/TraceEvent.h"
85 #include "platform/TracedValue.h" 85 #include "platform/TracedValue.h"
86 #include "platform/geometry/TransformState.h" 86 #include "platform/geometry/TransformState.h"
87 #include "platform/graphics/GraphicsContext.h" 87 #include "platform/graphics/GraphicsContext.h"
88 #include "platform/graphics/paint/DisplayItemList.h"
89 #include "wtf/RefCountedLeakCounter.h" 88 #include "wtf/RefCountedLeakCounter.h"
90 #include "wtf/text/StringBuilder.h" 89 #include "wtf/text/StringBuilder.h"
91 #include "wtf/text/WTFString.h" 90 #include "wtf/text/WTFString.h"
92 #include <algorithm> 91 #include <algorithm>
93 #ifndef NDEBUG 92 #ifndef NDEBUG
94 #include <stdio.h> 93 #include <stdio.h>
95 #endif 94 #endif
96 95
97 namespace blink { 96 namespace blink {
98 97
(...skipping 1016 matching lines...) Expand 10 before | Expand all | Expand 10 after
1115 return value; 1114 return value;
1116 } 1115 }
1117 1116
1118 LayoutRect RenderObject::computePaintInvalidationRect(const RenderLayerModelObje ct* paintInvalidationContainer, const PaintInvalidationState* paintInvalidationS tate) const 1117 LayoutRect RenderObject::computePaintInvalidationRect(const RenderLayerModelObje ct* paintInvalidationContainer, const PaintInvalidationState* paintInvalidationS tate) const
1119 { 1118 {
1120 return clippedOverflowRectForPaintInvalidation(paintInvalidationContainer, p aintInvalidationState); 1119 return clippedOverflowRectForPaintInvalidation(paintInvalidationContainer, p aintInvalidationState);
1121 } 1120 }
1122 1121
1123 void RenderObject::invalidatePaintUsingContainer(const RenderLayerModelObject* p aintInvalidationContainer, const LayoutRect& r, PaintInvalidationReason invalida tionReason) const 1122 void RenderObject::invalidatePaintUsingContainer(const RenderLayerModelObject* p aintInvalidationContainer, const LayoutRect& r, PaintInvalidationReason invalida tionReason) const
1124 { 1123 {
1125 if (RuntimeEnabledFeatures::slimmingPaintEnabled()) { 1124 if (RuntimeEnabledFeatures::slimmingPaintEnabled())
1126 if (RenderLayer* container = enclosingLayer()->enclosingLayerForPaintInv alidationCrossingFrameBoundaries()) 1125 view()->viewDisplayList().invalidate(this);
1127 container->graphicsLayerBacking()->displayItemList().invalidate(disp layItemClient());
1128 }
1129 1126
1130 if (r.isEmpty()) 1127 if (r.isEmpty())
1131 return; 1128 return;
1132 1129
1133 RELEASE_ASSERT(isRooted()); 1130 RELEASE_ASSERT(isRooted());
1134 1131
1135 // FIXME: Unify "devtools.timeline.invalidationTracking" and "blink.invalida tion". crbug.com/413527. 1132 // FIXME: Unify "devtools.timeline.invalidationTracking" and "blink.invalida tion". crbug.com/413527.
1136 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.invalidati onTracking"), 1133 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.invalidati onTracking"),
1137 "PaintInvalidationTracking", 1134 "PaintInvalidationTracking",
1138 "data", InspectorPaintInvalidationTrackingEvent::data(this, paintInvalid ationContainer)); 1135 "data", InspectorPaintInvalidationTrackingEvent::data(this, paintInvalid ationContainer));
(...skipping 2014 matching lines...) Expand 10 before | Expand all | Expand 10 after
3153 { 3150 {
3154 if (object1) { 3151 if (object1) {
3155 const blink::RenderObject* root = object1; 3152 const blink::RenderObject* root = object1;
3156 while (root->parent()) 3153 while (root->parent())
3157 root = root->parent(); 3154 root = root->parent();
3158 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 3155 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
3159 } 3156 }
3160 } 3157 }
3161 3158
3162 #endif 3159 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderObject.h ('k') | Source/core/rendering/RenderView.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698