| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) |
| 3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. | 3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. |
| 4 * All right reserved. | 4 * All right reserved. |
| 5 * Copyright (C) 2010 Google Inc. All rights reserved. | 5 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 6 * | 6 * |
| 7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
| 8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
| 9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
| 10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
| (...skipping 570 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 581 wordGlyphBounds.move(measuredWidth, 0); | 581 wordGlyphBounds.move(measuredWidth, 0); |
| 582 glyphBounds.unite(wordGlyphBounds); | 582 glyphBounds.unite(wordGlyphBounds); |
| 583 measuredWidth += wordMeasurement.width; | 583 measuredWidth += wordMeasurement.width; |
| 584 } | 584 } |
| 585 if (!wordMeasurement.fallbackFonts.isEmpty()) { | 585 if (!wordMeasurement.fallbackFonts.isEmpty()) { |
| 586 HashSet<const SimpleFontData*>::const_iterator end = | 586 HashSet<const SimpleFontData*>::const_iterator end = |
| 587 wordMeasurement.fallbackFonts.end(); | 587 wordMeasurement.fallbackFonts.end(); |
| 588 for (HashSet<const SimpleFontData*>::const_iterator it = | 588 for (HashSet<const SimpleFontData*>::const_iterator it = |
| 589 wordMeasurement.fallbackFonts.begin(); | 589 wordMeasurement.fallbackFonts.begin(); |
| 590 it != end; ++it) | 590 it != end; ++it) |
| 591 fallbackFonts.add(*it); | 591 fallbackFonts.insert(*it); |
| 592 } | 592 } |
| 593 } | 593 } |
| 594 wordMeasurementsIndex = i; | 594 wordMeasurementsIndex = i; |
| 595 if (lastEndOffset != run->m_stop) { | 595 if (lastEndOffset != run->m_stop) { |
| 596 // If we don't have enough cached data, we'll measure the run again. | 596 // If we don't have enough cached data, we'll measure the run again. |
| 597 canUseCachedWordMeasurements = false; | 597 canUseCachedWordMeasurements = false; |
| 598 fallbackFonts.clear(); | 598 fallbackFonts.clear(); |
| 599 } | 599 } |
| 600 } | 600 } |
| 601 | 601 |
| (...skipping 1911 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2513 | 2513 |
| 2514 bool LayoutBlockFlow::paintedOutputOfObjectHasNoEffectRegardlessOfSize() const { | 2514 bool LayoutBlockFlow::paintedOutputOfObjectHasNoEffectRegardlessOfSize() const { |
| 2515 // LayoutBlockFlow is in charge of paint invalidation of the first line. | 2515 // LayoutBlockFlow is in charge of paint invalidation of the first line. |
| 2516 if (firstLineBox()) | 2516 if (firstLineBox()) |
| 2517 return false; | 2517 return false; |
| 2518 | 2518 |
| 2519 return LayoutBlock::paintedOutputOfObjectHasNoEffectRegardlessOfSize(); | 2519 return LayoutBlock::paintedOutputOfObjectHasNoEffectRegardlessOfSize(); |
| 2520 } | 2520 } |
| 2521 | 2521 |
| 2522 } // namespace blink | 2522 } // namespace blink |
| OLD | NEW |