-
Erik Arvidsson authored
Revert of Revert of Blink roll 9d34a87:9a051c52 (patchset #1 id:1 of https://codereview.chromium.org/540023002/) Reason for revert: breaking all gpu bots see https://code.google.com/p/chromium/issues/detail?id=410885 Original issue's description: > Revert of Blink roll 9d34a87:9a051c52 (patchset #1 id:1 of https://codereview.chromium.org/539713002/) > > Reason for revert: > Breaks telemetry_perf_unittests on Mac. > Likely culprit is http://src.chromium.org/viewvc/blink?revision=181336&view=revision > > ASSERTION FAILED: (HashTableKeyChecker<HashTranslator, KeyTraits, HashFunctions::safeToCompareToEmptyOrDeleted>::checkKey(key)) > ../../third_party/WebKit/Source/wtf/HashTable.h(645) : const ValueType *WTF::HashTable<blink::FontPlatformData, WTF::KeyValuePair<blink::FontPlatformData, std::pair<WTF::RefPtr<blink::SimpleFontData>, unsigned int> >, WTF::KeyValuePairKeyExtractor, blink::FontDataCacheKeyHash, WTF::HashMapValueTraits<blink::FontDataCacheKeyTraits, WTF::HashTraits<std::pair<WTF::RefPtr<blink::SimpleFontData>, unsigned int> > >, blink::FontDataCacheKeyTraits, WTF::DefaultAllocator>::lookup(T) const [Key = blink::FontPlatformData, Value = WTF::KeyValuePair<blink::FontPlatformData, std::pair<WTF::RefPtr<blink::SimpleFontData>, unsigned int> >, Extractor = WTF::KeyValuePairKeyExtractor, HashFunctions = blink::FontDataCacheKeyHash, Traits = WTF::HashMapValueTraits<blink::FontDataCacheKeyTraits, WTF::HashTraits<std::pair<WTF::RefPtr<blink::SimpleFontData>, unsigned int> > >, KeyTraits = blink::FontDataCacheKeyTraits, Allocator = WTF::DefaultAllocator, HashTranslator = WTF::IdentityHashTranslator<blink::FontDataCacheKeyHash>, T = blink::FontPlatformData] > 1 0x5045c9b7 WTF::KeyValuePair<blink::FontPlatformData, std::pair<WTF::RefPtr<blink::SimpleFontData>, unsigned int> > const* WTF::HashTable<blink::FontPlatformData, WTF::KeyValuePair<blink::FontPlatformData, std::pair<WTF::RefPtr<blink::SimpleFontData>, unsigned int> >, WTF::KeyValuePairKeyExtractor, blink::FontDataCacheKeyHash, WTF::HashMapValueTraits<blink::FontDataCacheKeyTraits, WTF::HashTraits<std::pair<WTF::RefPtr<blink::SimpleFontData>, unsigned int> > >, blink::FontDataCacheKeyTraits, WTF::DefaultAllocator>::lookup<WTF::IdentityHashTranslator<blink::FontDataCacheKeyHash>, blink::FontPlatformData>(blink::FontPlatformData) const > 2 0x5045c8fc WTF::KeyValuePair<blink::FontPlatformData, std::pair<WTF::RefPtr<blink::SimpleFontData>, unsigned int> >* WTF::HashTable<blink::FontPlatformData, WTF::KeyValuePair<blink::FontPlatformData, std::pair<WTF::RefPtr<blink::SimpleFontData>, unsigned int> >, WTF::KeyValuePairKeyExtractor, blink::FontDataCacheKeyHash, WTF::HashMapValueTraits<blink::FontDataCacheKeyTraits, WTF::HashTraits<std::pair<WTF::RefPtr<blink::SimpleFontData>, unsigned int> > >, blink::FontDataCacheKeyTraits, WTF::DefaultAllocator>::lookup<WTF::IdentityHashTranslator<blink::FontDataCacheKeyHash>, blink::FontPlatformData>(blink::FontPlatformData) > 3 0x5045fed9 WTF::HashTableIterator<blink::FontPlatformData, WTF::KeyValuePair<blink::FontPlatformData, std::pair<WTF::RefPtr<blink::SimpleFontData>, unsigned int> >, WTF::KeyValuePairKeyExtractor, blink::FontDataCacheKeyHash, WTF::HashMapValueTraits<blink::FontDataCacheKeyTraits, WTF::HashTraits<std::pair<WTF::RefPtr<blink::SimpleFontData>, unsigned int> > >, blink::FontDataCacheKeyTraits, WTF::DefaultAllocator> WTF::HashTable<blink::FontPlatformData, WTF::KeyValuePair<blink::FontPlatformData, std::pair<WTF::RefPtr<blink::SimpleFontData>, unsigned int> >, WTF::KeyValuePairKeyExtractor, blink::FontDataCacheKeyHash, WTF::HashMapValueTraits<blink::FontDataCacheKeyTraits, WTF::HashTraits<std::pair<WTF::RefPtr<blink::SimpleFontData>, unsigned int> > >, blink::FontDataCacheKeyTraits, WTF::DefaultAllocator>::find<WTF::IdentityHashTranslator<blink::FontDataCacheKeyHash>, blink::FontPlatformData>(blink::FontPlatformData const&) > 4 0x5045fe51 WTF::HashTable<blink::FontPlatformData, WTF::KeyValuePair<blink::FontPlatformData, std::pair<WTF::RefPtr<blink::SimpleFontData>, unsigned int> >, WTF::KeyValuePairKeyExtractor, blink::FontDataCacheKeyHash, WTF::HashMapValueTraits<blink::FontDataCacheKeyTraits, WTF::HashTraits<std::pair<WTF::RefPtr<blink::SimpleFontData>, unsigned int> > >, blink::FontDataCacheKeyTraits, WTF::DefaultAllocator>::find(blink::FontPlatformData const&) > 5 0x504556e8 WTF::HashMap<blink::FontPlatformData, std::pair<WTF::RefPtr<blink::SimpleFontData>, unsigned int>, blink::FontDataCacheKeyHash, blink::FontDataCacheKeyTraits, WTF::HashTraits<std::pair<WTF::RefPtr<blink::SimpleFontData>, unsigned int> >, WTF::DefaultAllocator>::find(blink::FontPlatformData const&) > 6 0x50454b28 blink::FontDataCache::get(blink::FontPlatformData const*, blink::ShouldRetain) > 7 0x50446962 blink::FontCache::fontDataFromFontPlatformData(blink::FontPlatformData const*, blink::ShouldRetain) > 8 0x504467f1 blink::FontCache::getFontData(blink::FontDescription const&, WTF::AtomicString const&, bool, blink::ShouldRetain) > 9 0x5046298f blink::FontFallbackList::getFontData(blink::FontDescription const&, int&) const > 10 0x504620c9 blink::FontFallbackList::fontDataAt(blink::FontDescription const&, unsigned int) const > 11 0x50461d9d blink::FontFallbackList::determinePitch(blink::FontDescription const&) const > 12 0x4384da35 blink::FontFallbackList::isFixedPitch(blink::FontDescription const&) const > 13 0x4384d6b9 blink::Font::isFixedPitch() const > 14 0x43841394 blink::RenderText::widthFromCache(blink::Font const&, int, int, float, blink::TextDirection, WTF::HashSet<blink::SimpleFontData const*, WTF::PtrHash<blink::SimpleFontData const*>, WTF::HashTraits<blink::SimpleFontData const*>, WTF::DefaultAllocator>*, blink::GlyphOverflow*) const > 15 0x4383c04d blink::RenderText::computePreferredLogicalWidths(float, WTF::HashSet<blink::SimpleFontData const*, WTF::PtrHash<blink::SimpleFontData const*>, WTF::HashTraits<blink::SimpleFontData const*>, WTF::DefaultAllocator>&, blink::GlyphOverflow&) > 16 0x4383ad0c blink::RenderText::computePreferredLogicalWidths(float) > 17 0x4383a603 blink::RenderText::trimmedPrefWidths(float, float&, bool&, float&, bool&, bool&, bool&, float&, float&, float&, float&, bool&, blink::TextDirection) > 18 0x4365b7ab blink::RenderBlockFlow::computeInlinePreferredLogicalWidths(blink::LayoutUnit&, blink::LayoutUnit&) > 19 0x435f3d3c blink::RenderBlock::computeIntrinsicLogicalWidths(blink::LayoutUnit&, blink::LayoutUnit&) const > 20 0x435f4ecc blink::RenderBlock::computePreferredLogicalWidths() > 21 0x4367488e blink::RenderBox::minPreferredLogicalWidth() const > 22 0x435f4474 blink::RenderBlock::computeBlockPreferredLogicalWidths(blink::LayoutUnit&, blink::LayoutUnit&) const > 23 0x435f3d5a blink::RenderBlock::computeIntrinsicLogicalWidths(blink::LayoutUnit&, blink::LayoutUnit&) const > 24 0x435f4ecc blink::RenderBlock::computePreferredLogicalWidths() > 25 0x4367488e blink::RenderBox::minPreferredLogicalWidth() const > 26 0x435f4474 blink::RenderBlock::computeBlockPreferredLogicalWidths(blink::LayoutUnit&, blink::LayoutUnit&) const > 27 0x435f3d5a blink::RenderBlock::computeIntrinsicLogicalWidths(blink::LayoutUnit&, blink::LayoutUnit&) const > 28 0x435f4ecc blink::RenderBlock::computePreferredLogicalWidths() > 29 0x438059b1 blink::RenderTableCell::computePreferredLogicalWidths() > 30 0x4367488e blink::RenderBox::minPreferredLogicalWidth() const > 31 0x435766c8 blink::AutoTableLayout::recalcColumn(unsigned int) > > Original issue's description: > > Blink roll 9d34a87:9a051c52 > > > > https://chromium.googlesource.com/chromium/blink/+log/9d34a87dee82cbdcd5876669aa1cd1a430289e09..9a051c526402aedfa6bc73e6699838c777b679cf > > TBR=tkent@chromium.org,arv@chromium.org > > > > Committed: https://chromium.googlesource.com/chromium/src/+/203622e5b22fd772320684b7f8a1aa1fa4afc25b > > TBR=arv@chromium.org,tkent@chromium.org,blink-deps-roller@chromium.org > NOTREECHECKS=true > NOTRY=true > > Committed: https://chromium.googlesource.com/chromium/src/+/3c503fbc25dc383874c83b1fc2c6a72fdfbf4bfc TBR=arv@chromium.org,tkent@chromium.org,blink-deps-roller@chromium.org,dslomov@chromium.org NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/544733002 Cr-Commit-Position: refs/heads/master@{#293317}
31fccd7d
