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

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

Issue 15973002: Remove NonCompositedContentHost -- Take 2 (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: adding back annotation. final rebase. Created 7 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
« no previous file with comments | « Source/core/rendering/RenderLayerCompositor.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 1341 matching lines...) Expand 10 before | Expand all | Expand 10 after
1352 1352
1353 if (repaintContainer->hasFilter() && repaintContainer->layer() && repaintCon tainer->layer()->requiresFullLayerImageForFilters()) { 1353 if (repaintContainer->hasFilter() && repaintContainer->layer() && repaintCon tainer->layer()->requiresFullLayerImageForFilters()) {
1354 repaintContainer->layer()->setFilterBackendNeedsRepaintingInRect(r); 1354 repaintContainer->layer()->setFilterBackendNeedsRepaintingInRect(r);
1355 return; 1355 return;
1356 } 1356 }
1357 1357
1358 RenderView* v = view(); 1358 RenderView* v = view();
1359 if (repaintContainer->isRenderView()) { 1359 if (repaintContainer->isRenderView()) {
1360 ASSERT(repaintContainer == v); 1360 ASSERT(repaintContainer == v);
1361 bool viewHasCompositedLayer = v->hasLayer() && v->layer()->isComposited( ); 1361 bool viewHasCompositedLayer = v->hasLayer() && v->layer()->isComposited( );
1362 if (!viewHasCompositedLayer || v->layer()->backing()->paintsIntoWindow() ) { 1362 if (!viewHasCompositedLayer) {
1363 LayoutRect repaintRectangle = r; 1363 LayoutRect repaintRectangle = r;
1364 if (viewHasCompositedLayer && v->layer()->transform()) 1364 if (viewHasCompositedLayer && v->layer()->transform())
1365 repaintRectangle = enclosingIntRect(v->layer()->transform()->map Rect(r)); 1365 repaintRectangle = enclosingIntRect(v->layer()->transform()->map Rect(r));
1366 v->repaintViewRectangle(repaintRectangle); 1366 v->repaintViewRectangle(repaintRectangle);
1367 return; 1367 return;
1368 } 1368 }
1369 } 1369 }
1370 1370
1371 if (v->usesCompositing()) { 1371 if (v->usesCompositing()) {
1372 ASSERT(repaintContainer->hasLayer() && repaintContainer->layer()->isComp osited()); 1372 ASSERT(repaintContainer->hasLayer() && repaintContainer->layer()->isComp osited());
(...skipping 1809 matching lines...) Expand 10 before | Expand all | Expand 10 after
3182 { 3182 {
3183 if (object1) { 3183 if (object1) {
3184 const WebCore::RenderObject* root = object1; 3184 const WebCore::RenderObject* root = object1;
3185 while (root->parent()) 3185 while (root->parent())
3186 root = root->parent(); 3186 root = root->parent();
3187 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 3187 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
3188 } 3188 }
3189 } 3189 }
3190 3190
3191 #endif 3191 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderLayerCompositor.cpp ('k') | Source/core/rendering/RenderView.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698