| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights |
| 3 * reserved. | 3 * reserved. |
| 4 * | 4 * |
| 5 * Portions are Copyright (C) 1998 Netscape Communications Corporation. | 5 * Portions are Copyright (C) 1998 Netscape Communications Corporation. |
| 6 * | 6 * |
| 7 * Other contributors: | 7 * Other contributors: |
| 8 * Robert O'Callahan <roc+@cs.cmu.edu> | 8 * Robert O'Callahan <roc+@cs.cmu.edu> |
| 9 * David Baron <dbaron@fas.harvard.edu> | 9 * David Baron <dbaron@fas.harvard.edu> |
| 10 * Christian Biesinger <cbiesinger@web.de> | 10 * Christian Biesinger <cbiesinger@web.de> |
| (...skipping 756 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 767 if (childHas3D) { | 767 if (childHas3D) { |
| 768 m_has3DTransformedDescendant = true; | 768 m_has3DTransformedDescendant = true; |
| 769 break; | 769 break; |
| 770 } | 770 } |
| 771 } | 771 } |
| 772 } | 772 } |
| 773 | 773 |
| 774 void PaintLayer::updateLayerPosition() { | 774 void PaintLayer::updateLayerPosition() { |
| 775 LayoutPoint localPoint; | 775 LayoutPoint localPoint; |
| 776 | 776 |
| 777 if (!layoutObject().isOutOfFlowPositioned() && parent() && |
| 778 parent()->layoutObject().isLayoutInline() && |
| 779 ((parent()->parent() && |
| 780 !parent()->parent()->layoutObject().isLayoutBlock()) || |
| 781 parent()->location() != LayoutPoint())) { |
| 782 auto reason = layoutObject().isFloating() ? ReasonLOFloatLayerBug1 |
| 783 : ReasonLOFloatLayerBug2; |
| 784 for (LayoutObject* object = layoutObject().parent(); |
| 785 object && object != parent()->layoutObject(); |
| 786 object = object->parent()) { |
| 787 if (object->isFloating()) { |
| 788 object->m_rareStat.addReason(reason); |
| 789 LOG(ERROR) << "Found: !!! " << reason; |
| 790 } |
| 791 } |
| 792 } |
| 793 |
| 777 bool didResize = false; | 794 bool didResize = false; |
| 778 if (layoutObject().isInline() && layoutObject().isLayoutInline()) { | 795 if (layoutObject().isInline() && layoutObject().isLayoutInline()) { |
| 779 LayoutInline& inlineFlow = toLayoutInline(layoutObject()); | 796 LayoutInline& inlineFlow = toLayoutInline(layoutObject()); |
| 780 IntRect lineBox = enclosingIntRect(inlineFlow.linesBoundingBox()); | 797 IntRect lineBox = enclosingIntRect(inlineFlow.linesBoundingBox()); |
| 781 m_size = lineBox.size(); | 798 m_size = lineBox.size(); |
| 782 } else if (LayoutBox* box = layoutBox()) { | 799 } else if (LayoutBox* box = layoutBox()) { |
| 783 IntSize newSize = pixelSnappedIntSize(box->size(), box->location()); | 800 IntSize newSize = pixelSnappedIntSize(box->size(), box->location()); |
| 784 didResize = newSize != m_size; | 801 didResize = newSize != m_size; |
| 785 m_size = newSize; | 802 m_size = newSize; |
| 786 localPoint.moveBy(box->physicalLocation()); | 803 localPoint.moveBy(box->physicalLocation()); |
| (...skipping 2463 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3250 } | 3267 } |
| 3251 | 3268 |
| 3252 void showLayerTree(const blink::LayoutObject* layoutObject) { | 3269 void showLayerTree(const blink::LayoutObject* layoutObject) { |
| 3253 if (!layoutObject) { | 3270 if (!layoutObject) { |
| 3254 LOG(INFO) << "Cannot showLayerTree. Root is (nil)"; | 3271 LOG(INFO) << "Cannot showLayerTree. Root is (nil)"; |
| 3255 return; | 3272 return; |
| 3256 } | 3273 } |
| 3257 showLayerTree(layoutObject->enclosingLayer()); | 3274 showLayerTree(layoutObject->enclosingLayer()); |
| 3258 } | 3275 } |
| 3259 #endif | 3276 #endif |
| OLD | NEW |