| OLD | NEW |
| 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 1432 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1443 } | 1443 } |
| 1444 | 1444 |
| 1445 if (repaintContainer->hasFilter() && repaintContainer->layer()->requiresFull
LayerImageForFilters()) { | 1445 if (repaintContainer->hasFilter() && repaintContainer->layer()->requiresFull
LayerImageForFilters()) { |
| 1446 repaintContainer->layer()->repainter().setFilterBackendNeedsRepaintingIn
Rect(r); | 1446 repaintContainer->layer()->repainter().setFilterBackendNeedsRepaintingIn
Rect(r); |
| 1447 return; | 1447 return; |
| 1448 } | 1448 } |
| 1449 | 1449 |
| 1450 RenderView* v = view(); | 1450 RenderView* v = view(); |
| 1451 if (repaintContainer->isRenderView()) { | 1451 if (repaintContainer->isRenderView()) { |
| 1452 ASSERT(repaintContainer == v); | 1452 ASSERT(repaintContainer == v); |
| 1453 bool viewHasCompositedLayer = v->hasLayer() && v->layer()->compositingSt
ate() == PaintsIntoOwnBacking; | 1453 v->repaintViewRectangle(r); |
| 1454 if (!viewHasCompositedLayer) { | 1454 return; |
| 1455 v->repaintViewRectangle(r); | |
| 1456 return; | |
| 1457 } | |
| 1458 } | 1455 } |
| 1459 | 1456 |
| 1460 if (v->usesCompositing()) { | 1457 if (v->usesCompositing()) { |
| 1461 ASSERT(repaintContainer->hasLayer() && (repaintContainer->layer()->compo
sitingState() == PaintsIntoOwnBacking || repaintContainer->layer()->compositingS
tate() == PaintsIntoGroupedBacking)); | 1458 ASSERT(repaintContainer->hasLayer() && (repaintContainer->layer()->compo
sitingState() == PaintsIntoOwnBacking || repaintContainer->layer()->compositingS
tate() == PaintsIntoGroupedBacking)); |
| 1462 repaintContainer->layer()->repainter().setBackingNeedsRepaintInRect(r); | 1459 repaintContainer->layer()->repainter().setBackingNeedsRepaintInRect(r); |
| 1463 } | 1460 } |
| 1464 } | 1461 } |
| 1465 | 1462 |
| 1466 void RenderObject::repaint() const | 1463 void RenderObject::repaint() const |
| 1467 { | 1464 { |
| (...skipping 1991 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3459 { | 3456 { |
| 3460 if (object1) { | 3457 if (object1) { |
| 3461 const WebCore::RenderObject* root = object1; | 3458 const WebCore::RenderObject* root = object1; |
| 3462 while (root->parent()) | 3459 while (root->parent()) |
| 3463 root = root->parent(); | 3460 root = root->parent(); |
| 3464 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); | 3461 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); |
| 3465 } | 3462 } |
| 3466 } | 3463 } |
| 3467 | 3464 |
| 3468 #endif | 3465 #endif |
| OLD | NEW |