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

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

Issue 13959008: Remove NonCompositedContentHost (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase. add setBackgroundColor to setIsAcceleratedCompositingActive Created 7 years, 7 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) 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 1354 matching lines...) Expand 10 before | Expand all | Expand 10 after
1365 1365
1366 if (repaintContainer->hasFilter() && repaintContainer->layer() && repaintCon tainer->layer()->requiresFullLayerImageForFilters()) { 1366 if (repaintContainer->hasFilter() && repaintContainer->layer() && repaintCon tainer->layer()->requiresFullLayerImageForFilters()) {
1367 repaintContainer->layer()->setFilterBackendNeedsRepaintingInRect(r); 1367 repaintContainer->layer()->setFilterBackendNeedsRepaintingInRect(r);
1368 return; 1368 return;
1369 } 1369 }
1370 1370
1371 RenderView* v = view(); 1371 RenderView* v = view();
1372 if (repaintContainer->isRenderView()) { 1372 if (repaintContainer->isRenderView()) {
1373 ASSERT(repaintContainer == v); 1373 ASSERT(repaintContainer == v);
1374 bool viewHasCompositedLayer = v->hasLayer() && v->layer()->isComposited( ); 1374 bool viewHasCompositedLayer = v->hasLayer() && v->layer()->isComposited( );
1375 if (!viewHasCompositedLayer || v->layer()->backing()->paintsIntoWindow() ) { 1375 if (!viewHasCompositedLayer) {
1376 LayoutRect repaintRectangle = r; 1376 LayoutRect repaintRectangle = r;
1377 if (viewHasCompositedLayer && v->layer()->transform()) 1377 if (viewHasCompositedLayer && v->layer()->transform())
1378 repaintRectangle = enclosingIntRect(v->layer()->transform()->map Rect(r)); 1378 repaintRectangle = enclosingIntRect(v->layer()->transform()->map Rect(r));
1379 v->repaintViewRectangle(repaintRectangle); 1379 v->repaintViewRectangle(repaintRectangle);
1380 return; 1380 return;
1381 } 1381 }
1382 } 1382 }
1383 1383
1384 if (v->usesCompositing()) { 1384 if (v->usesCompositing()) {
1385 ASSERT(repaintContainer->hasLayer() && repaintContainer->layer()->isComp osited()); 1385 ASSERT(repaintContainer->hasLayer() && repaintContainer->layer()->isComp osited());
(...skipping 1805 matching lines...) Expand 10 before | Expand all | Expand 10 after
3191 { 3191 {
3192 if (object1) { 3192 if (object1) {
3193 const WebCore::RenderObject* root = object1; 3193 const WebCore::RenderObject* root = object1;
3194 while (root->parent()) 3194 while (root->parent())
3195 root = root->parent(); 3195 root = root->parent();
3196 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 3196 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
3197 } 3197 }
3198 } 3198 }
3199 3199
3200 #endif 3200 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698