From 528d6eb2a23ee3cb19c267dc77ec4bd7647d597a Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Tue, 31 May 2011 14:52:35 +0100
Subject: Merge WebKit at r80534: Fix CSSComputedStyleDeclaration.cpp

Update our uses of CSSPrimitiveValue following
http://trac.webkit.org/changeset/80463

Change-Id: I216382423f496b90af61b044b2a4bda9a6c322de
---
 Source/WebCore/css/CSSParser.cpp | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'Source/WebCore/css/CSSParser.cpp')

diff --git a/Source/WebCore/css/CSSParser.cpp b/Source/WebCore/css/CSSParser.cpp
index 06e06e1..df8816c 100644
--- a/Source/WebCore/css/CSSParser.cpp
+++ b/Source/WebCore/css/CSSParser.cpp
@@ -226,14 +226,10 @@ void CSSParser::setupParser(const char* prefix, const String& string, const char
 
 void CSSParser::parseSheet(CSSStyleSheet* sheet, const String& string, int startLineNumber, StyleRuleRangeMap* ruleRangeMap)
 {
-<<<<<<< HEAD
 #ifdef ANDROID_INSTRUMENT
     android::TimeCounter::start(android::TimeCounter::CSSParseTimeCounter);
 #endif
-    m_styleSheet = sheet;
-=======
     setStyleSheet(sheet);
->>>>>>> WebKit at r80534
     m_defaultNamespace = starAtom; // Reset the default namespace.
     m_ruleRangeMap = ruleRangeMap;
     if (ruleRangeMap) {
@@ -254,14 +250,10 @@ void CSSParser::parseSheet(CSSStyleSheet* sheet, const String& string, int start
 
 PassRefPtr<CSSRule> CSSParser::parseRule(CSSStyleSheet* sheet, const String& string)
 {
-<<<<<<< HEAD
 #ifdef ANDROID_INSTRUMENT
     android::TimeCounter::start(android::TimeCounter::CSSParseTimeCounter);
 #endif
-    m_styleSheet = sheet;
-=======
     setStyleSheet(sheet);
->>>>>>> WebKit at r80534
     m_allowNamespaceDeclarations = false;
     setupParser("@-webkit-rule{", string, "} ");
     cssyyparse(this);
@@ -273,14 +265,10 @@ PassRefPtr<CSSRule> CSSParser::parseRule(CSSStyleSheet* sheet, const String& str
 
 PassRefPtr<CSSRule> CSSParser::parseKeyframeRule(CSSStyleSheet *sheet, const String &string)
 {
-<<<<<<< HEAD
 #ifdef ANDROID_INSTRUMENT
     android::TimeCounter::start(android::TimeCounter::CSSParseTimeCounter);
 #endif
-    m_styleSheet = sheet;
-=======
     setStyleSheet(sheet);
->>>>>>> WebKit at r80534
     setupParser("@-webkit-keyframe-rule{ ", string, "} ");
     cssyyparse(this);
 #ifdef ANDROID_INSTRUMENT
-- 
cgit v1.1