Import Qt5x2 branch of QtWebkit for Qt 5.2

Importing a new snapshot of webkit.

Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>

1 files changed, 24 insertions, 2 deletions

diff --git a/Source/WebCore/css/CSSValuePool.cpp b/Source/WebCore/css/CSSValuePool.cpp
index c1689919d..855682693 100644
--- a/Source/WebCore/css/CSSValuePool.cpp
+++ b/Source/WebCore/css/CSSValuePool.cpp
@@ -49,16 +49,22 @@ CSSValuePool::CSSValuePool()
 {
 }
 
-PassRefPtr<CSSPrimitiveValue> CSSValuePool::createIdentifierValue(int ident)
+PassRefPtr<CSSPrimitiveValue> CSSValuePool::createIdentifierValue(CSSValueID ident)
 {
-    if (ident <= 0 || ident >= numCSSValueKeywords)
+    if (!ident)
         return CSSPrimitiveValue::createIdentifier(ident);
 
+    RELEASE_ASSERT(ident > 0 && ident < numCSSValueKeywords);
     if (!m_identifierValueCache[ident])
         m_identifierValueCache[ident] = CSSPrimitiveValue::createIdentifier(ident);
     return m_identifierValueCache[ident];
 }
 
+PassRefPtr<CSSPrimitiveValue> CSSValuePool::createIdentifierValue(CSSPropertyID ident)
+{
+    return CSSPrimitiveValue::createIdentifier(ident);
+}
+
 PassRefPtr<CSSPrimitiveValue> CSSValuePool::createColorValue(unsigned rgbValue)
 {
     // These are the empty and deleted values of the hash table.
@@ -132,4 +138,20 @@ PassRefPtr<CSSValueList> CSSValuePool::createFontFaceValue(const AtomicString& s
     return value;
 }
 
+void CSSValuePool::drain()
+{
+    m_colorValueCache.clear();
+    m_fontFaceValueCache.clear();
+    m_fontFamilyValueCache.clear();
+
+    for (int i = 0; i < numCSSValueKeywords; ++i)
+        m_identifierValueCache[i] = 0;
+
+    for (int i = 0; i < maximumCacheableIntegerValue; ++i) {
+        m_pixelValueCache[i] = 0;
+        m_percentValueCache[i] = 0;
+        m_numberValueCache[i] = 0;
+    }
+}
+
 }