| 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 692 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 703 if ((os->canBeSelectionLeaf() || os == m_selectionStart || | 703 if ((os->canBeSelectionLeaf() || os == m_selectionStart || |
| 704 os == m_selectionEnd) && | 704 os == m_selectionEnd) && |
| 705 os->getSelectionState() != SelectionNone) { | 705 os->getSelectionState() != SelectionNone) { |
| 706 // Blocks are responsible for painting line gaps and margin gaps. They | 706 // Blocks are responsible for painting line gaps and margin gaps. They |
| 707 // must be examined as well. | 707 // must be examined as well. |
| 708 oldSelectedObjects.set(os, os->getSelectionState()); | 708 oldSelectedObjects.set(os, os->getSelectionState()); |
| 709 if (blockPaintInvalidationMode == PaintInvalidationNewXOROld) { | 709 if (blockPaintInvalidationMode == PaintInvalidationNewXOROld) { |
| 710 LayoutBlock* cb = os->containingBlock(); | 710 LayoutBlock* cb = os->containingBlock(); |
| 711 while (cb && !cb->isLayoutView()) { | 711 while (cb && !cb->isLayoutView()) { |
| 712 SelectedBlockMap::AddResult result = | 712 SelectedBlockMap::AddResult result = |
| 713 oldSelectedBlocks.add(cb, cb->getSelectionState()); | 713 oldSelectedBlocks.insert(cb, cb->getSelectionState()); |
| 714 if (!result.isNewEntry) | 714 if (!result.isNewEntry) |
| 715 break; | 715 break; |
| 716 cb = cb->containingBlock(); | 716 cb = cb->containingBlock(); |
| 717 } | 717 } |
| 718 } | 718 } |
| 719 } | 719 } |
| 720 | 720 |
| 721 os = getNextOrPrevLayoutObjectBasedOnDirection(os, stop, continueExploring, | 721 os = getNextOrPrevLayoutObjectBasedOnDirection(os, stop, continueExploring, |
| 722 exploringBackwards); | 722 exploringBackwards); |
| 723 } | 723 } |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 759 o = start; | 759 o = start; |
| 760 exploringBackwards = false; | 760 exploringBackwards = false; |
| 761 continueExploring = o && (o != stop); | 761 continueExploring = o && (o != stop); |
| 762 while (continueExploring) { | 762 while (continueExploring) { |
| 763 if ((o->canBeSelectionLeaf() || o == start || o == end) && | 763 if ((o->canBeSelectionLeaf() || o == start || o == end) && |
| 764 o->getSelectionState() != SelectionNone) { | 764 o->getSelectionState() != SelectionNone) { |
| 765 newSelectedObjects.set(o, o->getSelectionState()); | 765 newSelectedObjects.set(o, o->getSelectionState()); |
| 766 LayoutBlock* cb = o->containingBlock(); | 766 LayoutBlock* cb = o->containingBlock(); |
| 767 while (cb && !cb->isLayoutView()) { | 767 while (cb && !cb->isLayoutView()) { |
| 768 SelectedBlockMap::AddResult result = | 768 SelectedBlockMap::AddResult result = |
| 769 newSelectedBlocks.add(cb, cb->getSelectionState()); | 769 newSelectedBlocks.insert(cb, cb->getSelectionState()); |
| 770 if (!result.isNewEntry) | 770 if (!result.isNewEntry) |
| 771 break; | 771 break; |
| 772 cb = cb->containingBlock(); | 772 cb = cb->containingBlock(); |
| 773 } | 773 } |
| 774 } | 774 } |
| 775 | 775 |
| 776 o = getNextOrPrevLayoutObjectBasedOnDirection(o, stop, continueExploring, | 776 o = getNextOrPrevLayoutObjectBasedOnDirection(o, stop, continueExploring, |
| 777 exploringBackwards); | 777 exploringBackwards); |
| 778 } | 778 } |
| 779 | 779 |
| (...skipping 269 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 |