Title: [190242] trunk
- Revision
- 190242
- Author
- [email protected]
- Date
- 2015-09-25 09:11:56 -0700 (Fri, 25 Sep 2015)
Log Message
Unreviewed, rolling out r190232 and r190236.
https://bugs.webkit.org/show_bug.cgi?id=149555
"It did not help" (Requested by cdumez on #webkit).
Reverted changesets:
"Unreviewed, roll out r187615 as it seems to have caused a ~1%
PLT regression."
http://trac.webkit.org/changeset/190232
"This started failing after this rollout:"
http://trac.webkit.org/changeset/190236
Patch by Commit Queue <[email protected]> on 2015-09-25
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (190241 => 190242)
--- trunk/LayoutTests/ChangeLog 2015-09-25 16:10:58 UTC (rev 190241)
+++ trunk/LayoutTests/ChangeLog 2015-09-25 16:11:56 UTC (rev 190242)
@@ -1,3 +1,19 @@
+2015-09-25 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r190232 and r190236.
+ https://bugs.webkit.org/show_bug.cgi?id=149555
+
+ "It did not help" (Requested by cdumez on #webkit).
+
+ Reverted changesets:
+
+ "Unreviewed, roll out r187615 as it seems to have caused a ~1%
+ PLT regression."
+ http://trac.webkit.org/changeset/190232
+
+ "This started failing after this rollout:"
+ http://trac.webkit.org/changeset/190236
+
2015-09-25 Carlos Garcia Campos <[email protected]>
[GTK] ASSERTION FAILED: !m_inUpdateBackingStoreState in DrawingAreaImpl::display() after DrawingAreaImpl::forceRepaint()
Modified: trunk/LayoutTests/platform/mac/TestExpectations (190241 => 190242)
--- trunk/LayoutTests/platform/mac/TestExpectations 2015-09-25 16:10:58 UTC (rev 190241)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2015-09-25 16:11:56 UTC (rev 190242)
@@ -1318,4 +1318,3 @@
webkit.org/b/149510 accessibility/mac/aria-expanded-notifications.html [ Pass Failure ]
-webkit.org/b/147430 fast/css3-text/font-synthesis.html [ ImageOnlyFailure ]
Modified: trunk/Source/WebCore/ChangeLog (190241 => 190242)
--- trunk/Source/WebCore/ChangeLog 2015-09-25 16:10:58 UTC (rev 190241)
+++ trunk/Source/WebCore/ChangeLog 2015-09-25 16:11:56 UTC (rev 190242)
@@ -1,3 +1,19 @@
+2015-09-25 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r190232 and r190236.
+ https://bugs.webkit.org/show_bug.cgi?id=149555
+
+ "It did not help" (Requested by cdumez on #webkit).
+
+ Reverted changesets:
+
+ "Unreviewed, roll out r187615 as it seems to have caused a ~1%
+ PLT regression."
+ http://trac.webkit.org/changeset/190232
+
+ "This started failing after this rollout:"
+ http://trac.webkit.org/changeset/190236
+
2015-09-25 Youenn Fablet <[email protected]>
Remove the need for DOMClass in case of JSBuiltinConstructor WebIDL
Modified: trunk/Source/WebCore/platform/graphics/FontCache.h (190241 => 190242)
--- trunk/Source/WebCore/platform/graphics/FontCache.h 2015-09-25 16:10:58 UTC (rev 190241)
+++ trunk/Source/WebCore/platform/graphics/FontCache.h 2015-09-25 16:11:56 UTC (rev 190242)
@@ -112,7 +112,10 @@
static std::array<unsigned, 2> makeFlagsKey(const FontDescription& description)
{
static_assert(USCRIPT_CODE_LIMIT < 0x1000, "Script code must fit in an unsigned along with the other flags");
- unsigned first = static_cast<unsigned>(description.textRenderingMode()) << 6
+ unsigned first = static_cast<unsigned>(description.script()) << 11
+ | static_cast<unsigned>(description.textRenderingMode()) << 9
+ | static_cast<unsigned>(description.smallCaps()) << 8
+ | static_cast<unsigned>(description.fontSynthesis()) << 6
| static_cast<unsigned>(description.widthVariant()) << 4
| static_cast<unsigned>(description.nonCJKGlyphOrientation()) << 3
| static_cast<unsigned>(description.orientation()) << 2
Modified: trunk/Source/WebCore/platform/graphics/FontCascade.cpp (190241 => 190242)
--- trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2015-09-25 16:10:58 UTC (rev 190241)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2015-09-25 16:11:56 UTC (rev 190242)
@@ -183,7 +183,6 @@
Vector<AtomicString, 3> families;
unsigned fontSelectorId;
unsigned fontSelectorVersion;
- unsigned fontSelectorFlags;
};
struct FontCascadeCacheEntry {
@@ -203,7 +202,7 @@
{
if (a.fontDescriptionKey != b.fontDescriptionKey)
return false;
- if (a.fontSelectorId != b.fontSelectorId || a.fontSelectorVersion != b.fontSelectorVersion|| a.fontSelectorFlags != b.fontSelectorFlags)
+ if (a.fontSelectorId != b.fontSelectorId || a.fontSelectorVersion != b.fontSelectorVersion)
return false;
if (a.families.size() != b.families.size())
return false;
@@ -231,11 +230,6 @@
value->fonts.get().widthCache().clear();
}
-static unsigned makeFontSelectorFlags(const FontDescription& description)
-{
- return static_cast<unsigned>(description.script()) << 1 | static_cast<unsigned>(description.smallCaps());
-}
-
static FontCascadeCacheKey makeFontCascadeCacheKey(const FontCascadeDescription& description, FontSelector* fontSelector)
{
FontCascadeCacheKey key;
@@ -244,7 +238,6 @@
key.families.append(description.familyAt(i));
key.fontSelectorId = fontSelector ? fontSelector->uniqueId() : 0;
key.fontSelectorVersion = fontSelector ? fontSelector->version() : 0;
- key.fontSelectorFlags = fontSelector && fontSelector->resolvesFamilyFor(description) ? makeFontSelectorFlags(description) : 0;
return key;
}
@@ -257,7 +250,6 @@
hashCodes.uncheckedAppend(key.fontDescriptionKey.computeHash());
hashCodes.uncheckedAppend(key.fontSelectorId);
hashCodes.uncheckedAppend(key.fontSelectorVersion);
- hashCodes.uncheckedAppend(key.fontSelectorFlags);
for (unsigned i = 0; i < key.families.size(); ++i)
hashCodes.uncheckedAppend(key.families[i].impl() ? CaseFoldingHash::hash(key.families[i]) : 0);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
