| 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 1397 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1408 addJsonObjectForRect(value.get(), "old", oldRect); | 1408 addJsonObjectForRect(value.get(), "old", oldRect); |
| 1409 addJsonObjectForRect(value.get(), "new", newRect); | 1409 addJsonObjectForRect(value.get(), "new", newRect); |
| 1410 return value; | 1410 return value; |
| 1411 } | 1411 } |
| 1412 | 1412 |
| 1413 InvalidationReason RenderObject::invalidatePaintIfNeeded(const RenderLayerModelO
bject& paintInvalidationContainer, const LayoutRect& oldBounds, const LayoutPoin
t& oldLocation, const PaintInvalidationState& paintInvalidationState) | 1413 InvalidationReason RenderObject::invalidatePaintIfNeeded(const RenderLayerModelO
bject& paintInvalidationContainer, const LayoutRect& oldBounds, const LayoutPoin
t& oldLocation, const PaintInvalidationState& paintInvalidationState) |
| 1414 { | 1414 { |
| 1415 const LayoutRect& newBounds = previousPaintInvalidationRect(); | 1415 const LayoutRect& newBounds = previousPaintInvalidationRect(); |
| 1416 const LayoutPoint& newLocation = previousPositionFromPaintInvalidationContai
ner(); | 1416 const LayoutPoint& newLocation = previousPositionFromPaintInvalidationContai
ner(); |
| 1417 | 1417 |
| 1418 // FIXME(sky): Do we need this now that we don't have flipForWritingMode? |
| 1418 // FIXME: PaintInvalidationState should not be required here, but the call t
o flipForWritingMode | 1419 // FIXME: PaintInvalidationState should not be required here, but the call t
o flipForWritingMode |
| 1419 // in mapRectToPaintInvalidationBacking will give us the wrong results with
it disabled. | 1420 // in mapRectToPaintInvalidationBacking will give us the wrong results with
it disabled. |
| 1420 // crbug.com/393762 | 1421 // crbug.com/393762 |
| 1421 ASSERT(newBounds == boundsRectForPaintInvalidation(&paintInvalidationContain
er, &paintInvalidationState)); | 1422 ASSERT(newBounds == boundsRectForPaintInvalidation(&paintInvalidationContain
er, &paintInvalidationState)); |
| 1422 | 1423 |
| 1423 TRACE_EVENT2(TRACE_DISABLED_BY_DEFAULT("blink.invalidation"), "RenderObject:
:invalidatePaintIfNeeded()", | 1424 TRACE_EVENT2(TRACE_DISABLED_BY_DEFAULT("blink.invalidation"), "RenderObject:
:invalidatePaintIfNeeded()", |
| 1424 "object", this->debugName().ascii(), | 1425 "object", this->debugName().ascii(), |
| 1425 "info", jsonObjectForOldAndNewRects(oldBounds, newBounds)); | 1426 "info", jsonObjectForOldAndNewRects(oldBounds, newBounds)); |
| 1426 | 1427 |
| 1427 InvalidationReason invalidationReason = getPaintInvalidationReason(paintInva
lidationContainer, oldBounds, oldLocation, newBounds, newLocation); | 1428 InvalidationReason invalidationReason = getPaintInvalidationReason(paintInva
lidationContainer, oldBounds, oldLocation, newBounds, newLocation); |
| (...skipping 1421 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2849 { | 2850 { |
| 2850 if (object1) { | 2851 if (object1) { |
| 2851 const blink::RenderObject* root = object1; | 2852 const blink::RenderObject* root = object1; |
| 2852 while (root->parent()) | 2853 while (root->parent()) |
| 2853 root = root->parent(); | 2854 root = root->parent(); |
| 2854 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); | 2855 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); |
| 2855 } | 2856 } |
| 2856 } | 2857 } |
| 2857 | 2858 |
| 2858 #endif | 2859 #endif |
| OLD | NEW |