| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. |
| 4 * All rights reserved. | 4 * All rights reserved. |
| 5 * | 5 * |
| 6 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
| 7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
| 8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
| 9 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
| 10 * | 10 * |
| (...skipping 574 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 585 if ((os->canBeSelectionLeaf() || os == m_selectionStart || | 585 if ((os->canBeSelectionLeaf() || os == m_selectionStart || |
| 586 os == m_selectionEnd) && | 586 os == m_selectionEnd) && |
| 587 os->getSelectionState() != SelectionNone) { | 587 os->getSelectionState() != SelectionNone) { |
| 588 // Blocks are responsible for painting line gaps and margin gaps. They | 588 // Blocks are responsible for painting line gaps and margin gaps. They |
| 589 // must be examined as well. | 589 // must be examined as well. |
| 590 selRect.unite(selectionRectForLayoutObject(os)); | 590 selRect.unite(selectionRectForLayoutObject(os)); |
| 591 const LayoutBlock* cb = os->containingBlock(); | 591 const LayoutBlock* cb = os->containingBlock(); |
| 592 while (cb && !cb->isLayoutView()) { | 592 while (cb && !cb->isLayoutView()) { |
| 593 selRect.unite(selectionRectForLayoutObject(cb)); | 593 selRect.unite(selectionRectForLayoutObject(cb)); |
| 594 VisitedContainingBlockSet::AddResult addResult = | 594 VisitedContainingBlockSet::AddResult addResult = |
| 595 visitedContainingBlocks.add(cb); | 595 visitedContainingBlocks.insert(cb); |
| 596 if (!addResult.isNewEntry) | 596 if (!addResult.isNewEntry) |
| 597 break; | 597 break; |
| 598 cb = cb->containingBlock(); | 598 cb = cb->containingBlock(); |
| 599 } | 599 } |
| 600 } | 600 } |
| 601 | 601 |
| 602 os = os->nextInPreOrder(); | 602 os = os->nextInPreOrder(); |
| 603 } | 603 } |
| 604 | 604 |
| 605 return pixelSnappedIntRect(selRect); | 605 return pixelSnappedIntRect(selRect); |
| (...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1049 bool LayoutView::paintedOutputOfObjectHasNoEffectRegardlessOfSize() const { | 1049 bool LayoutView::paintedOutputOfObjectHasNoEffectRegardlessOfSize() const { |
| 1050 // Frame scroll corner is painted using LayoutView as the display item client. | 1050 // Frame scroll corner is painted using LayoutView as the display item client. |
| 1051 if (!RuntimeEnabledFeatures::rootLayerScrollingEnabled() && | 1051 if (!RuntimeEnabledFeatures::rootLayerScrollingEnabled() && |
| 1052 (frameView()->horizontalScrollbar() || frameView()->verticalScrollbar())) | 1052 (frameView()->horizontalScrollbar() || frameView()->verticalScrollbar())) |
| 1053 return false; | 1053 return false; |
| 1054 | 1054 |
| 1055 return LayoutBlockFlow::paintedOutputOfObjectHasNoEffectRegardlessOfSize(); | 1055 return LayoutBlockFlow::paintedOutputOfObjectHasNoEffectRegardlessOfSize(); |
| 1056 } | 1056 } |
| 1057 | 1057 |
| 1058 } // namespace blink | 1058 } // namespace blink |
| OLD | NEW |