Title: [135685] trunk/Source/WebCore
Revision
135685
Author
[email protected]
Date
2012-11-25 23:50:02 -0800 (Sun, 25 Nov 2012)

Log Message

Unreviewed, rolling out r135656.
http://trac.webkit.org/changeset/135656
https://bugs.webkit.org/show_bug.cgi?id=103218

Made a few SVG tests crash on all platforms (Requested by
apavlov on #webkit).

Patch by Sheriff Bot <[email protected]> on 2012-11-25

* css/CSSComputedStyleDeclaration.cpp:
(WebCore::valueForFamily):
* css/CSSValuePool.cpp:
(WebCore::CSSValuePool::createFontFamilyValue):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (135684 => 135685)


--- trunk/Source/WebCore/ChangeLog	2012-11-26 07:45:38 UTC (rev 135684)
+++ trunk/Source/WebCore/ChangeLog	2012-11-26 07:50:02 UTC (rev 135685)
@@ -1,3 +1,17 @@
+2012-11-25  Sheriff Bot  <[email protected]>
+
+        Unreviewed, rolling out r135656.
+        http://trac.webkit.org/changeset/135656
+        https://bugs.webkit.org/show_bug.cgi?id=103218
+
+        Made a few SVG tests crash on all platforms (Requested by
+        apavlov on #webkit).
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::valueForFamily):
+        * css/CSSValuePool.cpp:
+        (WebCore::CSSValuePool::createFontFamilyValue):
+
 2012-11-25  Takashi Sakamoto  <[email protected]>
 
         WebCore::RenderBlock::determineStartPosition crash

Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (135684 => 135685)


--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp	2012-11-26 07:45:38 UTC (rev 135684)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp	2012-11-26 07:50:02 UTC (rev 135685)
@@ -1209,7 +1209,7 @@
 {
     if (int familyIdentifier = identifierForFamily(family))
         return cssValuePool().createIdentifierValue(familyIdentifier);
-    return cssValuePool().createFontFamilyValue(family.string());
+    return cssValuePool().createValue(family.string(), CSSPrimitiveValue::CSS_STRING);
 }
 
 static PassRefPtr<CSSValue> renderTextDecorationFlagsToCSSValue(int textDecoration)

Modified: trunk/Source/WebCore/css/CSSValuePool.cpp (135684 => 135685)


--- trunk/Source/WebCore/css/CSSValuePool.cpp	2012-11-26 07:45:38 UTC (rev 135684)
+++ trunk/Source/WebCore/css/CSSValuePool.cpp	2012-11-26 07:50:02 UTC (rev 135685)
@@ -113,10 +113,6 @@
 
 PassRefPtr<CSSPrimitiveValue> CSSValuePool::createFontFamilyValue(const String& familyName)
 {
-    const int maximumFontFamilyCacheSize = 128;
-    if (m_fontFamilyValueCache.size() >= maximumFontFamilyCacheSize)
-        m_fontFamilyValueCache.remove(m_fontFamilyValueCache.begin());
-
     RefPtr<CSSPrimitiveValue>& value = m_fontFamilyValueCache.add(familyName, 0).iterator->value;
     if (!value)
         value = CSSPrimitiveValue::create(familyName, CSSPrimitiveValue::CSS_STRING);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to