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

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

Issue 701873002: Revert "Don't invalidate scrolling container layer when scrolling contents need invalidation" (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/RenderLayerModelObject.cpp ('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 1158 matching lines...) Expand 10 before | Expand all | Expand 10 after
1169 TRACE_EVENT2(TRACE_DISABLED_BY_DEFAULT("blink.invalidation"), "RenderObject: :invalidatePaintUsingContainer()", 1169 TRACE_EVENT2(TRACE_DISABLED_BY_DEFAULT("blink.invalidation"), "RenderObject: :invalidatePaintUsingContainer()",
1170 "object", this->debugName().ascii(), 1170 "object", this->debugName().ascii(),
1171 "info", jsonObjectForPaintInvalidationInfo(r, paintInvalidationReasonToS tring(invalidationReason))); 1171 "info", jsonObjectForPaintInvalidationInfo(r, paintInvalidationReasonToS tring(invalidationReason)));
1172 1172
1173 if (paintInvalidationContainer->isRenderFlowThread()) { 1173 if (paintInvalidationContainer->isRenderFlowThread()) {
1174 toRenderFlowThread(paintInvalidationContainer)->paintInvalidationRectang leInRegions(r); 1174 toRenderFlowThread(paintInvalidationContainer)->paintInvalidationRectang leInRegions(r);
1175 return; 1175 return;
1176 } 1176 }
1177 1177
1178 if (paintInvalidationContainer->isRenderView()) { 1178 if (paintInvalidationContainer->isRenderView()) {
1179 toRenderView(paintInvalidationContainer)->invalidatePaintForRectangle(r, invalidationReason, *this); 1179 toRenderView(paintInvalidationContainer)->invalidatePaintForRectangle(r, invalidationReason);
1180 return; 1180 return;
1181 } 1181 }
1182 1182
1183 if (paintInvalidationContainer->view()->usesCompositing()) { 1183 if (paintInvalidationContainer->view()->usesCompositing()) {
1184 ASSERT(paintInvalidationContainer->isPaintInvalidationContainer()); 1184 ASSERT(paintInvalidationContainer->isPaintInvalidationContainer());
1185 paintInvalidationContainer->setBackingNeedsPaintInvalidationInRect(r, in validationReason, *this); 1185 paintInvalidationContainer->setBackingNeedsPaintInvalidationInRect(r, in validationReason);
1186 } 1186 }
1187 } 1187 }
1188 1188
1189 LayoutRect RenderObject::boundsRectForPaintInvalidation(const RenderLayerModelOb ject* paintInvalidationContainer, const PaintInvalidationState* paintInvalidatio nState) const 1189 LayoutRect RenderObject::boundsRectForPaintInvalidation(const RenderLayerModelOb ject* paintInvalidationContainer, const PaintInvalidationState* paintInvalidatio nState) const
1190 { 1190 {
1191 if (!paintInvalidationContainer) 1191 if (!paintInvalidationContainer)
1192 return computePaintInvalidationRect(paintInvalidationContainer, paintInv alidationState); 1192 return computePaintInvalidationRect(paintInvalidationContainer, paintInv alidationState);
1193 return RenderLayer::computePaintInvalidationRect(this, paintInvalidationCont ainer->layer(), paintInvalidationState); 1193 return RenderLayer::computePaintInvalidationRect(this, paintInvalidationCont ainer->layer(), paintInvalidationState);
1194 } 1194 }
1195 1195
(...skipping 1989 matching lines...) Expand 10 before | Expand all | Expand 10 after
3185 { 3185 {
3186 if (object1) { 3186 if (object1) {
3187 const blink::RenderObject* root = object1; 3187 const blink::RenderObject* root = object1;
3188 while (root->parent()) 3188 while (root->parent())
3189 root = root->parent(); 3189 root = root->parent();
3190 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 3190 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
3191 } 3191 }
3192 } 3192 }
3193 3193
3194 #endif 3194 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderLayerModelObject.cpp ('k') | Source/core/rendering/RenderView.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698