13 files changed, 8 insertions, 355 deletions

diff --git a/Source/WebCore/css/AndroidCSSPropertyNames.in b/Source/WebCore/css/AndroidCSSPropertyNames.in
index ef67d6b..be751da 100644
--- a/Source/WebCore/css/AndroidCSSPropertyNames.in
+++ b/Source/WebCore/css/AndroidCSSPropertyNames.in
@@ -21,14 +21,5 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
--webkit-ring
--webkit-ring-fill-color
--webkit-ring-inner-width
--webkit-ring-outer-width
--webkit-ring-outset
--webkit-ring-pressed-inner-color
--webkit-ring-pressed-outer-color
--webkit-ring-radius
--webkit-ring-selected-inner-color
--webkit-ring-selected-outer-color
+
 -webkit-tap-highlight-color
diff --git a/Source/WebCore/css/CSSComputedStyleDeclaration.cpp b/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
index 4c0571d..4922109 100644
--- a/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
+++ b/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
@@ -291,18 +291,6 @@ static const int computedProperties[] = {
     CSSPropertyWebkitSvgShadow,
     CSSPropertyVectorEffect
 #endif
-#ifdef ANDROID_CSS_RING
-    ,
-    CSSPropertyWebkitRingFillColor,
-    CSSPropertyWebkitRingInnerWidth,
-    CSSPropertyWebkitRingOuterWidth,
-    CSSPropertyWebkitRingOutset,
-    CSSPropertyWebkitRingPressedInnerColor,
-    CSSPropertyWebkitRingPressedOuterColor,
-    CSSPropertyWebkitRingRadius,
-    CSSPropertyWebkitRingSelectedInnerColor,
-    CSSPropertyWebkitRingSelectedOuterColor
-#endif
 #ifdef ANDROID_CSS_TAP_HIGHLIGHT_COLOR
     ,
     CSSPropertyWebkitTapHighlightColor
@@ -1818,29 +1806,6 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
         case CSSPropertyWebkitTransformOriginZ:
         case CSSPropertyWebkitTransition:
             break;
-#ifdef ANDROID_CSS_RING
-        case CSSPropertyWebkitRing:
-            // shorthand property currently not supported see bug 13658
-            break;
-        case CSSPropertyWebkitRingFillColor:
-            return primitiveValueCache->createColorValue(style->ringFillColor().rgb());
-        case CSSPropertyWebkitRingInnerWidth:
-            return primitiveValueCache->createValue(style->ringInnerWidth());
-        case CSSPropertyWebkitRingOuterWidth:
-            return primitiveValueCache->createValue(style->ringOuterWidth());
-        case CSSPropertyWebkitRingOutset:
-            return primitiveValueCache->createValue(style->ringOutset());
-        case CSSPropertyWebkitRingPressedInnerColor:
-            return primitiveValueCache->createColorValue(style->ringPressedInnerColor().rgb());
-        case CSSPropertyWebkitRingPressedOuterColor:
-            return primitiveValueCache->createColorValue(style->ringPressedOuterColor().rgb());
-        case CSSPropertyWebkitRingRadius:
-            return primitiveValueCache->createValue(style->ringRadius());
-        case CSSPropertyWebkitRingSelectedInnerColor:
-            return primitiveValueCache->createColorValue(style->ringSelectedInnerColor().rgb());
-        case CSSPropertyWebkitRingSelectedOuterColor:
-            return primitiveValueCache->createColorValue(style->ringSelectedOuterColor().rgb());
-#endif
 #ifdef ANDROID_CSS_TAP_HIGHLIGHT_COLOR
         case CSSPropertyWebkitTapHighlightColor:
             return primitiveValueCache->createColorValue(style->tapHighlightColor().rgb());
diff --git a/Source/WebCore/css/CSSImportRule.cpp b/Source/WebCore/css/CSSImportRule.cpp
index 09e313e..81ade39 100644
--- a/Source/WebCore/css/CSSImportRule.cpp
+++ b/Source/WebCore/css/CSSImportRule.cpp
@@ -170,26 +170,4 @@ void CSSImportRule::addSubresourceStyleURLs(ListHashSet<KURL>& urls)
         addSubresourceURL(urls, m_styleSheet->baseURL());
 }
 
-#ifdef ANDROID_INSTRUMENT
-void* CSSImportRule::operator new(size_t size)
-{
-    return StyleBase::operator new(size);
-}
-
-void* CSSImportRule::operator new[](size_t size)
-{
-    return StyleBase::operator new[](size);
-}
-
-void CSSImportRule::operator delete(void* p, size_t size)
-{
-    StyleBase::operator delete(p, size);
-}
-
-void CSSImportRule::operator delete[](void* p, size_t size)
-{
-    StyleBase::operator delete[](p, size);
-}
-#endif
-
 } // namespace WebCore
diff --git a/Source/WebCore/css/CSSImportRule.h b/Source/WebCore/css/CSSImportRule.h
index 3f44f5b..ad4e97d 100644
--- a/Source/WebCore/css/CSSImportRule.h
+++ b/Source/WebCore/css/CSSImportRule.h
@@ -66,14 +66,6 @@ private:
     // from CachedResourceClient
     virtual void setCSSStyleSheet(const String& href, const KURL& baseURL, const String& charset, const CachedCSSStyleSheet*);
 
-#ifdef ANDROID_INSTRUMENT
-    // Overridden to resolve the ambiguous
-    void* operator new(size_t size);
-    void* operator new[](size_t size);
-    void operator delete(void* p, size_t size);
-    void operator delete[](void* p, size_t size);
-#endif
-
     String m_strHref;
     RefPtr<MediaList> m_lstMedia;
     RefPtr<CSSStyleSheet> m_styleSheet;
diff --git a/Source/WebCore/css/CSSMutableStyleDeclaration.cpp b/Source/WebCore/css/CSSMutableStyleDeclaration.cpp
index ba3332d..ece418a 100644
--- a/Source/WebCore/css/CSSMutableStyleDeclaration.cpp
+++ b/Source/WebCore/css/CSSMutableStyleDeclaration.cpp
@@ -261,20 +261,6 @@ String CSSMutableStyleDeclaration::getPropertyValue(int propertyID) const
                 return value->cssText();
         }
 #endif
-#ifdef ANDROID_CSS_RING
-        case CSSPropertyWebkitRing: {
-            const int properties[9] = { CSSPropertyWebkitRingFillColor,
-                                        CSSPropertyWebkitRingInnerWidth,
-                                        CSSPropertyWebkitRingOuterWidth,
-                                        CSSPropertyWebkitRingOutset,
-                                        CSSPropertyWebkitRingPressedInnerColor,
-                                        CSSPropertyWebkitRingPressedOuterColor,
-                                        CSSPropertyWebkitRingRadius,
-                                        CSSPropertyWebkitRingSelectedInnerColor,
-                                        CSSPropertyWebkitRingSelectedOuterColor };
-            return getLayeredShorthandValue(properties, 9);
-        }
-#endif
     }
     return String();
 }
diff --git a/Source/WebCore/css/CSSParser.cpp b/Source/WebCore/css/CSSParser.cpp
index 831e438..b78a6d0 100644
--- a/Source/WebCore/css/CSSParser.cpp
+++ b/Source/WebCore/css/CSSParser.cpp
@@ -92,10 +92,6 @@ extern int cssyyparse(void* parser);
 using namespace std;
 using namespace WTF;
 
-#ifdef ANDROID_INSTRUMENT
-#include "TimeCounter.h"
-#endif
-
 namespace WebCore {
 
 static const unsigned INVALID_NUM_PARSED_PROPERTIES = UINT_MAX;
@@ -230,9 +226,6 @@ void CSSParser::setupParser(const char* prefix, const String& string, const char
 
 void CSSParser::parseSheet(CSSStyleSheet* sheet, const String& string, int startLineNumber, StyleRuleRangeMap* ruleRangeMap)
 {
-#ifdef ANDROID_INSTRUMENT
-    android::TimeCounter::start(android::TimeCounter::CSSParseTimeCounter);
-#endif
     setStyleSheet(sheet);
     m_defaultNamespace = starAtom; // Reset the default namespace.
     m_ruleRangeMap = ruleRangeMap;
@@ -247,37 +240,22 @@ void CSSParser::parseSheet(CSSStyleSheet* sheet, const String& string, int start
     m_ruleRangeMap = 0;
     m_currentRuleData = 0;
     m_rule = 0;
-#ifdef ANDROID_INSTRUMENT
-    android::TimeCounter::record(android::TimeCounter::CSSParseTimeCounter, __FUNCTION__);
-#endif
 }
 
 PassRefPtr<CSSRule> CSSParser::parseRule(CSSStyleSheet* sheet, const String& string)
 {
-#ifdef ANDROID_INSTRUMENT
-    android::TimeCounter::start(android::TimeCounter::CSSParseTimeCounter);
-#endif
     setStyleSheet(sheet);
     m_allowNamespaceDeclarations = false;
     setupParser("@-webkit-rule{", string, "} ");
     cssyyparse(this);
-#ifdef ANDROID_INSTRUMENT
-    android::TimeCounter::record(android::TimeCounter::CSSParseTimeCounter, __FUNCTION__);
-#endif
     return m_rule.release();
 }
 
 PassRefPtr<CSSRule> CSSParser::parseKeyframeRule(CSSStyleSheet *sheet, const String &string)
 {
-#ifdef ANDROID_INSTRUMENT
-    android::TimeCounter::start(android::TimeCounter::CSSParseTimeCounter);
-#endif
     setStyleSheet(sheet);
     setupParser("@-webkit-keyframe-rule{ ", string, "} ");
     cssyyparse(this);
-#ifdef ANDROID_INSTRUMENT
-    android::TimeCounter::record(android::TimeCounter::CSSParseTimeCounter, __FUNCTION__);
-#endif
     return m_keyframe.release();
 }
 
@@ -440,9 +418,6 @@ bool CSSParser::parseValue(CSSMutableStyleDeclaration* declaration, int property
 
 bool CSSParser::parseValue(CSSMutableStyleDeclaration* declaration, int propertyId, const String& string, bool important)
 {
-#ifdef ANDROID_INSTRUMENT
-    android::TimeCounter::start(android::TimeCounter::CSSParseTimeCounter);
-#endif
     ASSERT(!declaration->stylesheet() || declaration->stylesheet()->isCSSStyleSheet());
     setStyleSheet(static_cast<CSSStyleSheet*>(declaration->stylesheet()));
 
@@ -464,9 +439,6 @@ bool CSSParser::parseValue(CSSMutableStyleDeclaration* declaration, int property
         clearProperties();
     }
 
-#ifdef ANDROID_INSTRUMENT
-    android::TimeCounter::record(android::TimeCounter::CSSParseTimeCounter, __FUNCTION__);
-#endif
     return ok;
 }
 
@@ -499,9 +471,6 @@ bool CSSParser::parseColor(RGBA32& color, const String& string, bool strict)
 
 bool CSSParser::parseColor(CSSMutableStyleDeclaration* declaration, const String& string)
 {
-#ifdef ANDROID_INSTRUMENT
-    android::TimeCounter::start(android::TimeCounter::CSSParseTimeCounter);
-#endif
     ASSERT(!declaration->stylesheet() || declaration->stylesheet()->isCSSStyleSheet());
     setStyleSheet(static_cast<CSSStyleSheet*>(declaration->stylesheet()));
 
@@ -509,9 +478,6 @@ bool CSSParser::parseColor(CSSMutableStyleDeclaration* declaration, const String
     cssyyparse(this);
     m_rule = 0;
 
-#ifdef ANDROID_INSTRUMENT
-    android::TimeCounter::record(android::TimeCounter::CSSParseTimeCounter, __FUNCTION__);
-#endif
     return (m_numParsedProperties && m_parsedProperties[0]->m_id == CSSPropertyColor);
 }
 
@@ -533,9 +499,6 @@ bool CSSParser::parseSystemColor(RGBA32& color, const String& string, Document*
 
 void CSSParser::parseSelector(const String& string, Document* doc, CSSSelectorList& selectorList)
 {
-#ifdef ANDROID_INSTRUMENT
-    android::TimeCounter::start(android::TimeCounter::CSSParseTimeCounter);
-#endif
     RefPtr<CSSStyleSheet> dummyStyleSheet = CSSStyleSheet::create(doc);
 
     setStyleSheet(dummyStyleSheet.get());
@@ -549,18 +512,10 @@ void CSSParser::parseSelector(const String& string, Document* doc, CSSSelectorLi
 
     // The style sheet will be deleted right away, so it won't outlive the document.
     ASSERT(dummyStyleSheet->hasOneRef());
-
-#ifdef ANDROID_INSTRUMENT
-    android::TimeCounter::record(android::TimeCounter::CSSParseTimeCounter, __FUNCTION__);
-#endif
 }
 
 bool CSSParser::parseDeclaration(CSSMutableStyleDeclaration* declaration, const String& string, RefPtr<CSSStyleSourceData>* styleSourceData)
 {
-#ifdef ANDROID_INSTRUMENT
-    android::TimeCounter::start(android::TimeCounter::CSSParseTimeCounter);
-#endif
-
     // Length of the "@-webkit-decls{" prefix.
     static const unsigned prefixLength = 15;
 
@@ -599,9 +554,6 @@ bool CSSParser::parseDeclaration(CSSMutableStyleDeclaration* declaration, const
         m_currentRuleData = 0;
         m_inStyleRuleOrDeclaration = false;
     }
-#ifdef ANDROID_INSTRUMENT
-    android::TimeCounter::record(android::TimeCounter::CSSParseTimeCounter, __FUNCTION__);
-#endif
     return ok;
 }
 
@@ -610,9 +562,6 @@ bool CSSParser::parseMediaQuery(MediaList* queries, const String& string)
     if (string.isEmpty())
         return true;
 
-#ifdef ANDROID_INSTRUMENT
-    android::TimeCounter::start(android::TimeCounter::CSSParseTimeCounter);
-#endif
     ASSERT(!m_mediaQuery);
 
     // can't use { because tokenizer state switches from mediaquery to initial state when it sees { token.
@@ -626,9 +575,6 @@ bool CSSParser::parseMediaQuery(MediaList* queries, const String& string)
         queries->appendMediaQuery(m_mediaQuery.release());
     }
 
-#ifdef ANDROID_INSTRUMENT
-    android::TimeCounter::record(android::TimeCounter::CSSParseTimeCounter, __FUNCTION__);
-#endif
     return ok;
 }
 
@@ -2016,7 +1962,6 @@ bool CSSParser::parseValue(int propId, bool important)
     case CSSPropertyTextOverline:
     case CSSPropertyTextUnderline:
         return false;
-
 #if ENABLE(WCSS)
     case CSSPropertyWapInputFormat:
         validPrimitive = true;
@@ -2063,36 +2008,6 @@ bool CSSParser::parseValue(int propId, bool important)
             return parseLineBoxContain(important);
         break;
 
-#ifdef ANDROID_CSS_RING
-    case CSSPropertyWebkitRing:
-    {
-        const int properties[9] = { CSSPropertyWebkitRingFillColor,
-                                    CSSPropertyWebkitRingInnerWidth,
-                                    CSSPropertyWebkitRingOuterWidth,
-                                    CSSPropertyWebkitRingOutset,
-                                    CSSPropertyWebkitRingPressedInnerColor,
-                                    CSSPropertyWebkitRingPressedOuterColor,
-                                    CSSPropertyWebkitRingRadius,
-                                    CSSPropertyWebkitRingSelectedInnerColor,
-                                    CSSPropertyWebkitRingSelectedOuterColor };
-        return parseShorthand(propId, properties, 9, important);
-    }
-    case CSSPropertyWebkitRingFillColor:
-    case CSSPropertyWebkitRingPressedInnerColor:
-    case CSSPropertyWebkitRingPressedOuterColor:
-    case CSSPropertyWebkitRingSelectedInnerColor:
-    case CSSPropertyWebkitRingSelectedOuterColor:
-        parsedValue = parseColor();
-        if (parsedValue)
-            m_valueList->next();
-        break;
-    case CSSPropertyWebkitRingInnerWidth:
-    case CSSPropertyWebkitRingOuterWidth:
-    case CSSPropertyWebkitRingOutset:
-    case CSSPropertyWebkitRingRadius:
-        validPrimitive = validUnit(value, FLength | FNonNeg, m_strict);
-        break;
-#endif
 #ifdef ANDROID_CSS_TAP_HIGHLIGHT_COLOR
     case CSSPropertyWebkitTapHighlightColor:
         parsedValue = parseColor();
diff --git a/Source/WebCore/css/CSSPropertyNames.in b/Source/WebCore/css/CSSPropertyNames.in
index a62d2f3..395b7cf 100644
--- a/Source/WebCore/css/CSSPropertyNames.in
+++ b/Source/WebCore/css/CSSPropertyNames.in
@@ -306,3 +306,4 @@ z-index
 -webkit-user-drag
 -webkit-user-modify
 -webkit-user-select
+-webkit-overflow-scrolling
diff --git a/Source/WebCore/css/CSSStyleDeclaration.cpp b/Source/WebCore/css/CSSStyleDeclaration.cpp
index 1c465e5..d4acc2a 100644
--- a/Source/WebCore/css/CSSStyleDeclaration.cpp
+++ b/Source/WebCore/css/CSSStyleDeclaration.cpp
@@ -27,6 +27,7 @@
 #include "CSSPropertyNames.h"
 #include "CSSRule.h"
 #include <wtf/ASCIICType.h>
+#include <wtf/text/CString.h>
 
 using namespace WTF;
 
diff --git a/Source/WebCore/css/CSSStyleSelector.cpp b/Source/WebCore/css/CSSStyleSelector.cpp
index b79f2dc..0b6fd35 100644
--- a/Source/WebCore/css/CSSStyleSelector.cpp
+++ b/Source/WebCore/css/CSSStyleSelector.cpp
@@ -6054,138 +6054,6 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
         ASSERT_NOT_REACHED();
         return;
 
-#ifdef ANDROID_CSS_RING
-    case CSSPropertyWebkitRing:
-        if (valueType != CSSValue::CSS_INHERIT || !m_parentNode) return;
-        m_style->setRingFillColor(m_parentStyle->ringFillColor());
-        m_style->setRingInnerWidth(m_parentStyle->ringInnerWidth());
-        m_style->setRingOuterWidth(m_parentStyle->ringOuterWidth());
-        m_style->setRingOutset(m_parentStyle->ringOutset());
-        m_style->setRingPressedInnerColor(m_parentStyle->ringPressedInnerColor());
-        m_style->setRingPressedOuterColor(m_parentStyle->ringPressedOuterColor());
-        m_style->setRingRadius(m_parentStyle->ringRadius());
-        m_style->setRingSelectedInnerColor(m_parentStyle->ringSelectedInnerColor());
-        m_style->setRingSelectedOuterColor(m_parentStyle->ringSelectedOuterColor());
-        return;
-    case CSSPropertyWebkitRingFillColor: {
-        HANDLE_INHERIT_AND_INITIAL(ringFillColor, RingFillColor);
-        if (!primitiveValue)
-            break;
-        Color col = getColorFromPrimitiveValue(primitiveValue).blendWithWhite();
-        m_style->setRingFillColor(col);
-        return;
-    }
-    case CSSPropertyWebkitRingInnerWidth: {
-        HANDLE_INHERIT_AND_INITIAL(ringInnerWidth, RingInnerWidth)
-        if (!primitiveValue)
-            break;
-        Length l;
-        int type = primitiveValue->primitiveType();
-        if (CSSPrimitiveValue::isUnitTypeLength(type)) {
-            // width can be specified with fractional px
-            // scale by 16 here (and unscale in android_graphics) to keep
-            // 4 bits of fraction
-            RefPtr<CSSPrimitiveValue> scaledValue = CSSPrimitiveValue::create(
-                primitiveValue->getFloatValue() * 16,
-                (CSSPrimitiveValue::UnitTypes) type);
-            l = Length(scaledValue->computeLengthIntForLength(style(),
-                m_rootElementStyle, zoomFactor), Fixed);
-            scaledValue.release();
-        } else if (type == CSSPrimitiveValue::CSS_PERCENTAGE)
-            l = Length(primitiveValue->getDoubleValue(), Percent);
-        else
-            return;
-        m_style->setRingInnerWidth(l);
-        return;
-    }
-    case CSSPropertyWebkitRingOuterWidth: {
-        HANDLE_INHERIT_AND_INITIAL(ringOuterWidth, RingOuterWidth)
-        if (!primitiveValue)
-            break;
-        Length l;
-        int type = primitiveValue->primitiveType();
-        if (CSSPrimitiveValue::isUnitTypeLength(type)) {
-            // width can be specified with fractional px
-            // scale by 16 here (and unscale in android_graphics) to keep
-            // 4 bits of fraction
-            RefPtr<CSSPrimitiveValue> scaledValue = CSSPrimitiveValue::create(
-                primitiveValue->getFloatValue() * 16,
-                (CSSPrimitiveValue::UnitTypes) type);
-            l = Length(scaledValue->computeLengthIntForLength(style(),
-                m_rootElementStyle, zoomFactor), Fixed);
-            scaledValue.release();
-        } else if (type == CSSPrimitiveValue::CSS_PERCENTAGE)
-            l = Length(primitiveValue->getDoubleValue(), Percent);
-        else
-            return;
-        m_style->setRingOuterWidth(l);
-        return;
-    }
-    case CSSPropertyWebkitRingOutset: {
-        HANDLE_INHERIT_AND_INITIAL(ringOutset, RingOutset)
-        if (!primitiveValue)
-            break;
-        Length l;
-        int type = primitiveValue->primitiveType();
-        if (CSSPrimitiveValue::isUnitTypeLength(type))
-            l = Length(primitiveValue->computeLengthIntForLength(style(),
-                m_rootElementStyle, zoomFactor), Fixed);
-        else if (type == CSSPrimitiveValue::CSS_PERCENTAGE)
-            l = Length(primitiveValue->getDoubleValue(), Percent);
-        else
-            return;
-        m_style->setRingOutset(l);
-        return;
-    }
-    case CSSPropertyWebkitRingPressedInnerColor: {
-        HANDLE_INHERIT_AND_INITIAL(ringPressedInnerColor, RingPressedInnerColor);
-        if (!primitiveValue)
-            break;
-        Color col = getColorFromPrimitiveValue(primitiveValue).blendWithWhite();
-        m_style->setRingPressedInnerColor(col);
-        return;
-    }
-    case CSSPropertyWebkitRingPressedOuterColor: {
-        HANDLE_INHERIT_AND_INITIAL(ringPressedOuterColor, RingPressedOuterColor);
-        if (!primitiveValue)
-            break;
-        Color col = getColorFromPrimitiveValue(primitiveValue).blendWithWhite();
-        m_style->setRingPressedOuterColor(col);
-        return;
-    }
-    case CSSPropertyWebkitRingRadius: {
-        HANDLE_INHERIT_AND_INITIAL(ringRadius, RingRadius)
-        if (!primitiveValue)
-            break;
-        Length l;
-        int type = primitiveValue->primitiveType();
-        if (CSSPrimitiveValue::isUnitTypeLength(type))
-            l = Length(primitiveValue->computeLengthIntForLength(style(),
-                m_rootElementStyle, zoomFactor), Fixed);
-        else if (type == CSSPrimitiveValue::CSS_PERCENTAGE)
-            l = Length(primitiveValue->getDoubleValue(), Percent);
-        else
-            return;
-        m_style->setRingRadius(l);
-        return;
-    }
-    case CSSPropertyWebkitRingSelectedInnerColor: {
-        HANDLE_INHERIT_AND_INITIAL(ringSelectedInnerColor, RingSelectedInnerColor);
-        if (!primitiveValue)
-            break;
-        Color col = getColorFromPrimitiveValue(primitiveValue).blendWithWhite();
-        m_style->setRingSelectedInnerColor(col);
-        return;
-    }
-    case CSSPropertyWebkitRingSelectedOuterColor: {
-        HANDLE_INHERIT_AND_INITIAL(ringSelectedOuterColor, RingSelectedOuterColor);
-        if (!primitiveValue)
-            break;
-        Color col = getColorFromPrimitiveValue(primitiveValue).blendWithWhite();
-        m_style->setRingSelectedOuterColor(col);
-        return;
-    }
-#endif
 #ifdef ANDROID_CSS_TAP_HIGHLIGHT_COLOR
     case CSSPropertyWebkitTapHighlightColor: {
         HANDLE_INHERIT_AND_INITIAL(tapHighlightColor, TapHighlightColor);
diff --git a/Source/WebCore/css/CSSValueKeywords.in b/Source/WebCore/css/CSSValueKeywords.in
index 6dac06f..5b6e5b0 100644
--- a/Source/WebCore/css/CSSValueKeywords.in
+++ b/Source/WebCore/css/CSSValueKeywords.in
@@ -756,6 +756,10 @@ windowed
 manual
 # auto
 
+# -webkit-overflow-scrolling
+# auto
+touch
+
 # -webkit-writing-mode
 # SVG compatibility
 lr
diff --git a/Source/WebCore/css/StyleBase.cpp b/Source/WebCore/css/StyleBase.cpp
index 5d9d79d..93dbda0 100644
--- a/Source/WebCore/css/StyleBase.cpp
+++ b/Source/WebCore/css/StyleBase.cpp
@@ -65,37 +65,4 @@ KURL StyleBase::baseURL() const
     return sheet->ownerNode()->document()->baseURL();
 }
 
-#ifdef ANDROID_INSTRUMENT
-static size_t styleSize = 0;
-
-void* StyleBase::operator new(size_t size)
-{
-    styleSize += size;
-    return ::operator new(size);
-}
-
-void* StyleBase::operator new[](size_t size)
-{
-    styleSize += size;
-    return ::operator new[](size);
-}
-
-void StyleBase::operator delete(void* p, size_t size)
-{
-    styleSize -= size;
-    ::operator delete(p);
-}
-
-void StyleBase::operator delete[](void* p, size_t size)
-{
-    styleSize -= size;
-    ::operator delete[](p);
-}
-
-size_t StyleBase::reportStyleSize()
-{
-    return styleSize;
-}
-#endif
-
 }
diff --git a/Source/WebCore/css/StyleBase.h b/Source/WebCore/css/StyleBase.h
index 94efa01..63c671e 100644
--- a/Source/WebCore/css/StyleBase.h
+++ b/Source/WebCore/css/StyleBase.h
@@ -72,18 +72,6 @@ namespace WebCore {
 
         StyleSheet* stylesheet();
 
-#ifdef ANDROID_INSTRUMENT
-        // Overridden to prevent the normal new from being called.
-        void* operator new(size_t size);
-        void* operator new[](size_t size);
-
-        // Overridden to prevent the normal delete from being called.
-        void operator delete(void* p, size_t size);
-        void operator delete[](void* p, size_t size);
-
-        static size_t reportStyleSize();
-#endif
-
     protected:
         StyleBase(StyleBase* parent)
             : m_parent(parent)
diff --git a/Source/WebCore/css/mediaControlsAndroid.css b/Source/WebCore/css/mediaControlsAndroid.css
index 77f8b08..614c92f 100644
--- a/Source/WebCore/css/mediaControlsAndroid.css
+++ b/Source/WebCore/css/mediaControlsAndroid.css
@@ -49,10 +49,7 @@ video:-webkit-full-page-media::-webkit-media-controls-panel {
 }
 
 audio::-webkit-media-controls-mute-button, video::-webkit-media-controls-mute-button {
-    -webkit-appearance: media-mute-button;
-    display: -webkit-box;
-    width: 48px;
-    height: 48px;
+    display: none;
 }
 
 audio::-webkit-media-controls-play-button, video::-webkit-media-controls-play-button {