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

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

Issue 7054014: Revert 86910 - 2011-05-19 James Robinson <jamesr@chromium.org> (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/742/
Patch Set: Created 9 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
« no previous file with comments | « Source/WebCore/ChangeLog ('k') | no next file » | 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 1145 matching lines...) Expand 10 before | Expand all | Expand 10 after
1156 #if USE(ACCELERATED_COMPOSITING) 1156 #if USE(ACCELERATED_COMPOSITING)
1157 RenderView* v = view(); 1157 RenderView* v = view();
1158 if (repaintContainer->isRenderView()) { 1158 if (repaintContainer->isRenderView()) {
1159 ASSERT(repaintContainer == v); 1159 ASSERT(repaintContainer == v);
1160 if (!v->hasLayer() || !v->layer()->isComposited() || v->layer()->backing ()->paintingGoesToWindow()) { 1160 if (!v->hasLayer() || !v->layer()->isComposited() || v->layer()->backing ()->paintingGoesToWindow()) {
1161 v->repaintViewRectangle(r, immediate); 1161 v->repaintViewRectangle(r, immediate);
1162 return; 1162 return;
1163 } 1163 }
1164 } 1164 }
1165 1165
1166 if (v->usesCompositing() && layer()->isComposited()) { 1166 if (v->usesCompositing()) {
1167 ASSERT(repaintContainer->hasLayer() && repaintContainer->layer()->isComp osited()); 1167 ASSERT(repaintContainer->hasLayer() && repaintContainer->layer()->isComp osited());
1168 repaintContainer->layer()->setBackingNeedsRepaintInRect(r); 1168 repaintContainer->layer()->setBackingNeedsRepaintInRect(r);
1169 } 1169 }
1170 #else 1170 #else
1171 if (repaintContainer->isRenderView()) 1171 if (repaintContainer->isRenderView())
1172 toRenderView(repaintContainer)->repaintViewRectangle(r, immediate); 1172 toRenderView(repaintContainer)->repaintViewRectangle(r, immediate);
1173 #endif 1173 #endif
1174 } 1174 }
1175 1175
1176 void RenderObject::repaint(bool immediate) 1176 void RenderObject::repaint(bool immediate)
(...skipping 1479 matching lines...) Expand 10 before | Expand all | Expand 10 after
2656 { 2656 {
2657 if (object1) { 2657 if (object1) {
2658 const WebCore::RenderObject* root = object1; 2658 const WebCore::RenderObject* root = object1;
2659 while (root->parent()) 2659 while (root->parent())
2660 root = root->parent(); 2660 root = root->parent();
2661 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 2661 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
2662 } 2662 }
2663 } 2663 }
2664 2664
2665 #endif 2665 #endif
OLDNEW
« no previous file with comments | « Source/WebCore/ChangeLog ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698