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

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

Issue 271803002: [RAL] Fix nested non-composited RenderView repainting (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Moar rebaselines Created 6 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/RenderBox.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 1518 matching lines...) Expand 10 before | Expand all | Expand 10 after
1529 } 1529 }
1530 1530
1531 if (repaintContainer->hasFilter() && repaintContainer->layer()->requiresFull LayerImageForFilters()) { 1531 if (repaintContainer->hasFilter() && repaintContainer->layer()->requiresFull LayerImageForFilters()) {
1532 repaintContainer->layer()->repainter().setFilterBackendNeedsRepaintingIn Rect(r); 1532 repaintContainer->layer()->repainter().setFilterBackendNeedsRepaintingIn Rect(r);
1533 return; 1533 return;
1534 } 1534 }
1535 1535
1536 RenderView* v = view(); 1536 RenderView* v = view();
1537 if (repaintContainer->isRenderView()) { 1537 if (repaintContainer->isRenderView()) {
1538 ASSERT(repaintContainer == v); 1538 ASSERT(repaintContainer == v);
1539 bool viewHasCompositedLayer = v->hasLayer() && v->layer()->compositingSt ate() == PaintsIntoOwnBacking; 1539 v->repaintViewRectangle(r);
1540 if (!viewHasCompositedLayer) { 1540 return;
1541 v->repaintViewRectangle(r);
1542 return;
1543 }
1544 } 1541 }
1545 1542
1546 if (v->usesCompositing()) { 1543 if (v->usesCompositing()) {
1547 ASSERT(repaintContainer->hasLayer() && (repaintContainer->layer()->compo sitingState() == PaintsIntoOwnBacking || repaintContainer->layer()->compositingS tate() == PaintsIntoGroupedBacking)); 1544 ASSERT(repaintContainer->hasLayer() && (repaintContainer->layer()->compo sitingState() == PaintsIntoOwnBacking || repaintContainer->layer()->compositingS tate() == PaintsIntoGroupedBacking));
1548 repaintContainer->layer()->repainter().setBackingNeedsRepaintInRect(r); 1545 repaintContainer->layer()->repainter().setBackingNeedsRepaintInRect(r);
1549 } 1546 }
1550 } 1547 }
1551 1548
1552 void RenderObject::repaint() const 1549 void RenderObject::repaint() const
1553 { 1550 {
(...skipping 2006 matching lines...) Expand 10 before | Expand all | Expand 10 after
3560 { 3557 {
3561 if (object1) { 3558 if (object1) {
3562 const WebCore::RenderObject* root = object1; 3559 const WebCore::RenderObject* root = object1;
3563 while (root->parent()) 3560 while (root->parent())
3564 root = root->parent(); 3561 root = root->parent();
3565 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 3562 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
3566 } 3563 }
3567 } 3564 }
3568 3565
3569 #endif 3566 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBox.cpp ('k') | Source/core/rendering/RenderView.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698