Chromium Code Reviews| 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 1496 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1507 // If a border-radius exists and width/height is smaller than | 1507 // If a border-radius exists and width/height is smaller than |
| 1508 // radius width/height, we cannot use delta-repaint. | 1508 // radius width/height, we cannot use delta-repaint. |
| 1509 RoundedRect oldRoundedRect = style()->getRoundedBorderFor(oldBounds); | 1509 RoundedRect oldRoundedRect = style()->getRoundedBorderFor(oldBounds); |
| 1510 RoundedRect newRoundedRect = style()->getRoundedBorderFor(newBounds); | 1510 RoundedRect newRoundedRect = style()->getRoundedBorderFor(newBounds); |
| 1511 fullRepaint = oldRoundedRect.radii() != newRoundedRect.radii(); | 1511 fullRepaint = oldRoundedRect.radii() != newRoundedRect.radii(); |
| 1512 } | 1512 } |
| 1513 if (!fullRepaint) { | 1513 if (!fullRepaint) { |
| 1514 // This ASSERT fails due to animations. See https://bugs.webkit.org/sho w_bug.cgi?id=37048 | 1514 // This ASSERT fails due to animations. See https://bugs.webkit.org/sho w_bug.cgi?id=37048 |
| 1515 // ASSERT(!newOutlineBoxRectPtr || *newOutlineBoxRectPtr == outlineBound sForRepaint(repaintContainer)); | 1515 // ASSERT(!newOutlineBoxRectPtr || *newOutlineBoxRectPtr == outlineBound sForRepaint(repaintContainer)); |
| 1516 newOutlineBox = newOutlineBoxRectPtr ? *newOutlineBoxRectPtr : outlineBo undsForRepaint(repaintContainer); | 1516 newOutlineBox = newOutlineBoxRectPtr ? *newOutlineBoxRectPtr : outlineBo undsForRepaint(repaintContainer); |
| 1517 if (newOutlineBox.location() != oldOutlineBox.location() || (mustRepaint BackgroundOrBorder() && (newBounds != oldBounds || newOutlineBox != oldOutlineBo x))) | 1517 |
| 1518 bool hasOutlineBox = hasOutline() || (style()->boxShadow() && style()->b oxShadow()->shadows().size() > 0); | |
|
Julien - ping for review
2014/03/07 00:01:10
style()->boxShadow() && style()->boxShadow()->shad
dsinclair
2014/03/07 03:18:56
Done.
| |
| 1519 if ((hasOutlineBox && newOutlineBox.location() != oldOutlineBox.location ()) | |
| 1520 || (mustRepaintBackgroundOrBorder() && (newBounds != oldBounds || (h asOutlineBox && newOutlineBox != oldOutlineBox)))) | |
| 1518 fullRepaint = true; | 1521 fullRepaint = true; |
| 1519 } | 1522 } |
| 1520 | 1523 |
| 1521 if (!repaintContainer) | 1524 if (!repaintContainer) |
| 1522 repaintContainer = v; | 1525 repaintContainer = v; |
| 1523 | 1526 |
| 1524 if (fullRepaint) { | 1527 if (fullRepaint) { |
| 1525 repaintUsingContainer(repaintContainer, pixelSnappedIntRect(oldBounds)); | 1528 repaintUsingContainer(repaintContainer, pixelSnappedIntRect(oldBounds)); |
| 1526 if (newBounds != oldBounds) | 1529 if (newBounds != oldBounds) |
| 1527 repaintUsingContainer(repaintContainer, pixelSnappedIntRect(newBound s)); | 1530 repaintUsingContainer(repaintContainer, pixelSnappedIntRect(newBound s)); |
| (...skipping 1791 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3319 { | 3322 { |
| 3320 if (object1) { | 3323 if (object1) { |
| 3321 const WebCore::RenderObject* root = object1; | 3324 const WebCore::RenderObject* root = object1; |
| 3322 while (root->parent()) | 3325 while (root->parent()) |
| 3323 root = root->parent(); | 3326 root = root->parent(); |
| 3324 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); | 3327 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); |
| 3325 } | 3328 } |
| 3326 } | 3329 } |
| 3327 | 3330 |
| 3328 #endif | 3331 #endif |
| OLD | NEW |