CSS vendor-specific property/value cleanup. Properly qualify background...
authorhyatt <hyatt@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 14 Apr 2006 22:50:07 +0000 (22:50 +0000)
committerhyatt <hyatt@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 14 Apr 2006 22:50:07 +0000 (22:50 +0000)
        background-origin, border-image and the border-radius properties.  Make sure
        our overflow extensions of marquee and overlay are qualified as well.  Rename
        the -khtml- extension to -webkit.

        Reviewed by beth

        * bindings/js/kjs_css.cpp:
        (KJS::cssPropertyName):
        * bindings/objc/DOMCSS.mm:
        (-[DOMCSSStyleDeclaration _fontSizeDelta]):
        (-[DOMCSSStyleDeclaration _setFontSizeDelta:]):
        * bindings/objc/DOMHTML.mm:
        (-[DOMHTMLInputElement _setAutofilled:]):
        * bridge/mac/FrameMac.h:
        * bridge/mac/FrameMac.mm:
        * css/CSSComputedStyleDeclaration.cpp:
        (WebCore::):
        (WebCore::valueForTextAlign):
        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
        * css/CSSGrammar.y:
        * css/CSSPropertyNames.in:
        * css/CSSValueKeywords.in:
        * css/css_base.cpp:
        (WebCore::CSSSelector::extractPseudoType):
        * css/css_valueimpl.cpp:
        (WebCore::):
        * css/css_valueimpl.h:
        * css/cssparser.cpp:
        (WebCore::CSSParser::parseRule):
        (WebCore::CSSParser::parseValue):
        (WebCore::CSSParser::parseColor):
        (WebCore::CSSParser::parseDeclaration):
        (WebCore::CSSParser::parseBackgroundShorthand):
        (WebCore::CSSParser::parseBackgroundColor):
        (WebCore::CSSParser::parseBackgroundProperty):
        (WebCore::CSSParser::parseFontFamily):
        (WebCore::CSSParser::parseShadow):
        * css/cssstyleselector.cpp:
        (WebCore::CSSStyleSelector::applyDeclarations):
        (WebCore::CSSStyleSelector::applyProperty):
        (WebCore::CSSStyleSelector::getColorFromPrimitiveValue):
        * css/cssstyleselector.h:
        * css/html4.css:
        * css/quirks.css:
        * css/tokenizer.flex:
        * editing/ApplyStyleCommand.cpp:
        (WebCore::StyleChange::init):
        (WebCore::ApplyStyleCommand::applyRelativeFontStyleChange):
        (WebCore::ApplyStyleCommand::removeInlineStyle):
        * editing/CompositeEditCommand.cpp:
        (WebCore::blockPlaceholderClassString):
        * editing/JSEditor.cpp:
        * editing/ReplaceSelectionCommand.cpp:
        (WebCore::ReplaceSelectionCommand::fixupNodeStyles):
        (WebCore::styleForNode):
        * editing/htmlediting.cpp:
        (WebCore::rebalanceWhitespaceInTextNode):
        * html/HTMLElement.cpp:
        (WebCore::HTMLElement::addHTMLAlignment):
        (WebCore::HTMLElement::setContentEditable):
        * html/html_blockimpl.cpp:
        (WebCore::HTMLDivElement::parseMappedAttribute):
        (WebCore::HTMLParagraphElement::parseMappedAttribute):
        (WebCore::HTMLMarqueeElement::parseMappedAttribute):
        * html/html_inlineimpl.cpp:
        (WebCore::HTMLFontElement::parseMappedAttribute):
        * html/html_tableimpl.cpp:
        (WebCore::HTMLTablePartElement::parseMappedAttribute):
        (WebCore::HTMLTableCellElement::parseMappedAttribute):
        * page/Frame.cpp:
        (WebCore::Frame::canMouseDownStartSelect):
        * page/Frame.h:
        * rendering/RenderObject.cpp:
        (WebCore::RenderObject::draggableNode):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@13874 268f45cc-cd09-0410-ab3c-d52691b4dbfc

31 files changed:
WebCore/ChangeLog
WebCore/bindings/js/kjs_css.cpp
WebCore/bindings/objc/DOMCSS.mm
WebCore/bindings/objc/DOMHTML.mm
WebCore/bridge/mac/FrameMac.h
WebCore/bridge/mac/FrameMac.mm
WebCore/css/CSSComputedStyleDeclaration.cpp
WebCore/css/CSSGrammar.y
WebCore/css/CSSPropertyNames.in
WebCore/css/CSSValueKeywords.in
WebCore/css/css_base.cpp
WebCore/css/css_valueimpl.cpp
WebCore/css/css_valueimpl.h
WebCore/css/cssparser.cpp
WebCore/css/cssstyleselector.cpp
WebCore/css/cssstyleselector.h
WebCore/css/html4.css
WebCore/css/quirks.css
WebCore/css/tokenizer.flex
WebCore/editing/ApplyStyleCommand.cpp
WebCore/editing/CompositeEditCommand.cpp
WebCore/editing/JSEditor.cpp
WebCore/editing/ReplaceSelectionCommand.cpp
WebCore/editing/htmlediting.cpp
WebCore/html/HTMLElement.cpp
WebCore/html/html_blockimpl.cpp
WebCore/html/html_inlineimpl.cpp
WebCore/html/html_tableimpl.cpp
WebCore/page/Frame.cpp
WebCore/page/Frame.h
WebCore/rendering/RenderObject.cpp

index 6f1a95e..9cff70f 100644 (file)
@@ -1,3 +1,81 @@
+2006-04-14  David Hyatt  <hyatt@apple.com>
+
+        CSS vendor-specific property/value cleanup.  Properly qualify background-clip,
+        background-origin, border-image and the border-radius properties.  Make sure
+        our overflow extensions of marquee and overlay are qualified as well.  Rename
+        the -khtml- extension to -webkit.
+
+        Reviewed by beth
+
+        * bindings/js/kjs_css.cpp:
+        (KJS::cssPropertyName):
+        * bindings/objc/DOMCSS.mm:
+        (-[DOMCSSStyleDeclaration _fontSizeDelta]):
+        (-[DOMCSSStyleDeclaration _setFontSizeDelta:]):
+        * bindings/objc/DOMHTML.mm:
+        (-[DOMHTMLInputElement _setAutofilled:]):
+        * bridge/mac/FrameMac.h:
+        * bridge/mac/FrameMac.mm:
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::):
+        (WebCore::valueForTextAlign):
+        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
+        * css/CSSGrammar.y:
+        * css/CSSPropertyNames.in:
+        * css/CSSValueKeywords.in:
+        * css/css_base.cpp:
+        (WebCore::CSSSelector::extractPseudoType):
+        * css/css_valueimpl.cpp:
+        (WebCore::):
+        * css/css_valueimpl.h:
+        * css/cssparser.cpp:
+        (WebCore::CSSParser::parseRule):
+        (WebCore::CSSParser::parseValue):
+        (WebCore::CSSParser::parseColor):
+        (WebCore::CSSParser::parseDeclaration):
+        (WebCore::CSSParser::parseBackgroundShorthand):
+        (WebCore::CSSParser::parseBackgroundColor):
+        (WebCore::CSSParser::parseBackgroundProperty):
+        (WebCore::CSSParser::parseFontFamily):
+        (WebCore::CSSParser::parseShadow):
+        * css/cssstyleselector.cpp:
+        (WebCore::CSSStyleSelector::applyDeclarations):
+        (WebCore::CSSStyleSelector::applyProperty):
+        (WebCore::CSSStyleSelector::getColorFromPrimitiveValue):
+        * css/cssstyleselector.h:
+        * css/html4.css:
+        * css/quirks.css:
+        * css/tokenizer.flex:
+        * editing/ApplyStyleCommand.cpp:
+        (WebCore::StyleChange::init):
+        (WebCore::ApplyStyleCommand::applyRelativeFontStyleChange):
+        (WebCore::ApplyStyleCommand::removeInlineStyle):
+        * editing/CompositeEditCommand.cpp:
+        (WebCore::blockPlaceholderClassString):
+        * editing/JSEditor.cpp:
+        * editing/ReplaceSelectionCommand.cpp:
+        (WebCore::ReplaceSelectionCommand::fixupNodeStyles):
+        (WebCore::styleForNode):
+        * editing/htmlediting.cpp:
+        (WebCore::rebalanceWhitespaceInTextNode):
+        * html/HTMLElement.cpp:
+        (WebCore::HTMLElement::addHTMLAlignment):
+        (WebCore::HTMLElement::setContentEditable):
+        * html/html_blockimpl.cpp:
+        (WebCore::HTMLDivElement::parseMappedAttribute):
+        (WebCore::HTMLParagraphElement::parseMappedAttribute):
+        (WebCore::HTMLMarqueeElement::parseMappedAttribute):
+        * html/html_inlineimpl.cpp:
+        (WebCore::HTMLFontElement::parseMappedAttribute):
+        * html/html_tableimpl.cpp:
+        (WebCore::HTMLTablePartElement::parseMappedAttribute):
+        (WebCore::HTMLTableCellElement::parseMappedAttribute):
+        * page/Frame.cpp:
+        (WebCore::Frame::canMouseDownStartSelect):
+        * page/Frame.h:
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::draggableNode):
+
 2006-04-14  Eric Seidel  <eseidel@apple.com>
 
         Reviewed by beth.
index b985081..bd74d61 100644 (file)
@@ -66,7 +66,7 @@ static String cssPropertyName(const Identifier &p, bool *hadPixelOrPosPrefix = 0
         prop = prop.mid(4);
         if (hadPixelOrPosPrefix)
             *hadPixelOrPosPrefix = true;
-    } else if (prop.startsWith("khtml-") || prop.startsWith("apple-") || prop.startsWith("moz-")) {
+    } else if (prop.startsWith("khtml-") || prop.startsWith("apple-") || prop.startsWith("webkit-")) {
         prop.insert(0, '-');
     }
 
index 2473655..2a15e71 100644 (file)
@@ -1758,12 +1758,12 @@ void removeWrapperForRGB(RGBA32 value)
 
 - (NSString *)_fontSizeDelta
 {
-    return [self getPropertyValue:@"-khtml-font-size-delta"];
+    return [self getPropertyValue:@"-webkit-font-size-delta"];
 }
 
 - (void)_setFontSizeDelta:(NSString *)fontSizeDelta
 {
-    [self setProperty:@"-khtml-font-size-delta" :fontSizeDelta :@""];
+    [self setProperty:@"-webkit-font-size-delta" :fontSizeDelta :@""];
 }
 
 - (NSString *)fontStretch
index dfa1652..e3caaef 100644 (file)
@@ -4037,7 +4037,7 @@ static NSView *viewForElement(DOMElement *element)
 - (void)_setAutofilled:(BOOL)filled
 {
     // This notifies the input element that the content has been autofilled
-    // This allows WebKit to obey the -khtml-autofill pseudo style, which
+    // This allows WebKit to obey the -webkit-autofill pseudo style, which
     // changes the background color.
     HTMLInputElement* input = [self _inputElement];
     if (input)
index 5928029..ca25632 100644 (file)
@@ -283,7 +283,7 @@ public:
     
     virtual void partClearedInBegin();
     
-    // Implementation of CSS property -khtml-user-drag == auto
+    // Implementation of CSS property -webkit-user-drag == auto
     virtual bool shouldDragAutoNode(Node*, const IntPoint&) const;
 
     void setMarkedTextRange(const Range* , NSArray* attributes, NSArray* ranges);
index 31e53cd..b9dd3e0 100644 (file)
@@ -2106,7 +2106,7 @@ void FrameMac::mouseMoved(NSEvent *event)
     END_BLOCK_OBJC_EXCEPTIONS;
 }
 
-// Called as we walk up the element chain for nodes with CSS property -khtml-user-drag == auto
+// Called as we walk up the element chain for nodes with CSS property -webkit-user-drag == auto
 bool FrameMac::shouldDragAutoNode(Node* node, const IntPoint& point) const
 {
     // We assume that WebKit only cares about dragging things that can be leaf nodes (text, images, urls).
index a5fc324..9eee060 100644 (file)
@@ -40,15 +40,15 @@ static const int computedProperties[] = {
     CSS_PROP_BACKGROUND_IMAGE,
     CSS_PROP_BACKGROUND_REPEAT,
     CSS_PROP_BACKGROUND_ATTACHMENT,
-    CSS_PROP_BACKGROUND_CLIP,
-    CSS_PROP_BACKGROUND_ORIGIN,
+    CSS_PROP__WEBKIT_BACKGROUND_CLIP,
+    CSS_PROP__WEBKIT_BACKGROUND_ORIGIN,
     CSS_PROP_BACKGROUND_POSITION,
     CSS_PROP_BACKGROUND_POSITION_X,
     CSS_PROP_BACKGROUND_POSITION_Y,
     CSS_PROP_BORDER_COLLAPSE,
     CSS_PROP_BORDER_SPACING,
-    CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING,
-    CSS_PROP__KHTML_BORDER_VERTICAL_SPACING,
+    CSS_PROP__WEBKIT_BORDER_HORIZONTAL_SPACING,
+    CSS_PROP__WEBKIT_BORDER_VERTICAL_SPACING,
     CSS_PROP_BORDER_TOP_COLOR,
     CSS_PROP_BORDER_RIGHT_COLOR,
     CSS_PROP_BORDER_BOTTOM_COLOR,
@@ -62,20 +62,20 @@ static const int computedProperties[] = {
     CSS_PROP_BORDER_BOTTOM_WIDTH,
     CSS_PROP_BORDER_LEFT_WIDTH,
     CSS_PROP_BOTTOM,
-    CSS_PROP__KHTML_BOX_ALIGN,
-    CSS_PROP__KHTML_BOX_DIRECTION,
-    CSS_PROP__KHTML_BOX_FLEX,
-    CSS_PROP__KHTML_BOX_FLEX_GROUP,
-    CSS_PROP__KHTML_BOX_LINES,
-    CSS_PROP__KHTML_BOX_ORDINAL_GROUP,
-    CSS_PROP__KHTML_BOX_ORIENT,
-    CSS_PROP__KHTML_BOX_PACK,
+    CSS_PROP__WEBKIT_BOX_ALIGN,
+    CSS_PROP__WEBKIT_BOX_DIRECTION,
+    CSS_PROP__WEBKIT_BOX_FLEX,
+    CSS_PROP__WEBKIT_BOX_FLEX_GROUP,
+    CSS_PROP__WEBKIT_BOX_LINES,
+    CSS_PROP__WEBKIT_BOX_ORDINAL_GROUP,
+    CSS_PROP__WEBKIT_BOX_ORIENT,
+    CSS_PROP__WEBKIT_BOX_PACK,
     CSS_PROP_CAPTION_SIDE,
     CSS_PROP_CLEAR,
     CSS_PROP_COLOR,
     CSS_PROP_CURSOR,
 #if __APPLE__
-    CSS_PROP__KHTML_DASHBOARD_REGION,
+    CSS_PROP__WEBKIT_DASHBOARD_REGION,
 #endif
     CSS_PROP_DIRECTION,
     CSS_PROP_DISPLAY,
@@ -89,8 +89,8 @@ static const int computedProperties[] = {
     CSS_PROP_HEIGHT,
     CSS_PROP_LEFT,
     CSS_PROP_LETTER_SPACING,
-    CSS_PROP__KHTML_LINE_BREAK,
-    CSS_PROP__KHTML_LINE_CLAMP,
+    CSS_PROP__WEBKIT_LINE_BREAK,
+    CSS_PROP__WEBKIT_LINE_CLAMP,
     CSS_PROP_LINE_HEIGHT,
     CSS_PROP_LIST_STYLE_IMAGE,
     CSS_PROP_LIST_STYLE_POSITION,
@@ -99,15 +99,15 @@ static const int computedProperties[] = {
     CSS_PROP_MARGIN_RIGHT,
     CSS_PROP_MARGIN_BOTTOM,
     CSS_PROP_MARGIN_LEFT,
-    CSS_PROP__KHTML_MARQUEE_DIRECTION,
-    CSS_PROP__KHTML_MARQUEE_INCREMENT,
-    CSS_PROP__KHTML_MARQUEE_REPETITION,
-    CSS_PROP__KHTML_MARQUEE_STYLE,
+    CSS_PROP__WEBKIT_MARQUEE_DIRECTION,
+    CSS_PROP__WEBKIT_MARQUEE_INCREMENT,
+    CSS_PROP__WEBKIT_MARQUEE_REPETITION,
+    CSS_PROP__WEBKIT_MARQUEE_STYLE,
     CSS_PROP_MAX_HEIGHT,
     CSS_PROP_MAX_WIDTH,
     CSS_PROP_MIN_HEIGHT,
     CSS_PROP_MIN_WIDTH,
-    CSS_PROP__KHTML_NBSP_MODE,
+    CSS_PROP__WEBKIT_NBSP_MODE,
     CSS_PROP_OPACITY,
     CSS_PROP_ORPHANS,
     CSS_PROP_OUTLINE_STYLE,
@@ -124,13 +124,13 @@ static const int computedProperties[] = {
     CSS_PROP_TABLE_LAYOUT,
     CSS_PROP_TEXT_ALIGN,
     CSS_PROP_TEXT_DECORATION,
-    CSS_PROP__KHTML_TEXT_DECORATIONS_IN_EFFECT,
+    CSS_PROP__WEBKIT_TEXT_DECORATIONS_IN_EFFECT,
     CSS_PROP_TEXT_INDENT,
     CSS_PROP_TEXT_SHADOW,
     CSS_PROP_TEXT_TRANSFORM,
     CSS_PROP_TOP,
     CSS_PROP_UNICODE_BIDI,
-    CSS_PROP__KHTML_USER_MODIFY,
+    CSS_PROP__WEBKIT_USER_MODIFY,
     CSS_PROP_VERTICAL_ALIGN,
     CSS_PROP_VISIBILITY,
     CSS_PROP_WHITE_SPACE,
@@ -197,11 +197,11 @@ static CSSValue *valueForTextAlign(ETextAlign align)
         case JUSTIFY:
             return new CSSPrimitiveValue(CSS_VAL_JUSTIFY);
         case KHTML_LEFT:
-            return new CSSPrimitiveValue(CSS_VAL__KHTML_LEFT);
+            return new CSSPrimitiveValue(CSS_VAL__WEBKIT_LEFT);
         case KHTML_RIGHT:
-            return new CSSPrimitiveValue(CSS_VAL__KHTML_RIGHT);
+            return new CSSPrimitiveValue(CSS_VAL__WEBKIT_RIGHT);
         case KHTML_CENTER:
-            return new CSSPrimitiveValue(CSS_VAL__KHTML_CENTER);
+            return new CSSPrimitiveValue(CSS_VAL__WEBKIT_CENTER);
     }
     ASSERT_NOT_REACHED();
     return 0;
@@ -345,9 +345,9 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
         if (style->backgroundAttachment())
             return new CSSPrimitiveValue(CSS_VAL_SCROLL);
         return new CSSPrimitiveValue(CSS_VAL_FIXED);
-    case CSS_PROP_BACKGROUND_CLIP:
-    case CSS_PROP_BACKGROUND_ORIGIN: {
-        EBackgroundBox box = (propertyID == CSS_PROP_BACKGROUND_CLIP ? style->backgroundClip() : style->backgroundOrigin());
+    case CSS_PROP__WEBKIT_BACKGROUND_CLIP:
+    case CSS_PROP__WEBKIT_BACKGROUND_ORIGIN: {
+        EBackgroundBox box = (propertyID == CSS_PROP__WEBKIT_BACKGROUND_CLIP ? style->backgroundClip() : style->backgroundOrigin());
         if (box == BGBORDER)
             return new CSSPrimitiveValue(CSS_VAL_BORDER);
         if (box == BGPADDING)
@@ -375,7 +375,7 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
     case CSS_PROP_BACKGROUND_POSITION_Y:
         return valueForLength(style->backgroundYPosition());
 #ifndef KHTML_NO_XBL
-    case CSS_PROP__KHTML_BINDING:
+    case CSS_PROP__WEBKIT_BINDING:
         // FIXME: unimplemented
         break;
 #endif
@@ -389,9 +389,9 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
         String string(numberAsString(style->horizontalBorderSpacing()) + "px " + numberAsString(style->verticalBorderSpacing()) + "px");
         return new CSSPrimitiveValue(string, CSSPrimitiveValue::CSS_STRING);
     }
-    case CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING:
+    case CSS_PROP__WEBKIT_BORDER_HORIZONTAL_SPACING:
         return new CSSPrimitiveValue(style->horizontalBorderSpacing(), CSSPrimitiveValue::CSS_PX);
-    case CSS_PROP__KHTML_BORDER_VERTICAL_SPACING:
+    case CSS_PROP__WEBKIT_BORDER_VERTICAL_SPACING:
         return new CSSPrimitiveValue(style->verticalBorderSpacing(), CSSPrimitiveValue::CSS_PX);
     case CSS_PROP_BORDER_TOP_COLOR:
         return new CSSPrimitiveValue(style->borderLeftColor().rgb());
@@ -419,7 +419,7 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
         return new CSSPrimitiveValue(style->borderLeftWidth(), CSSPrimitiveValue::CSS_PX);
     case CSS_PROP_BOTTOM:
         return getPositionOffsetValue(renderer, CSS_PROP_BOTTOM);
-    case CSS_PROP__KHTML_BOX_ALIGN:
+    case CSS_PROP__WEBKIT_BOX_ALIGN:
         switch (style->boxAlign()) {
             case BSTRETCH:
                 return new CSSPrimitiveValue(CSS_VAL_STRETCH);
@@ -436,7 +436,7 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
         }
         ASSERT_NOT_REACHED();
         return 0;
-    case CSS_PROP__KHTML_BOX_DIRECTION:
+    case CSS_PROP__WEBKIT_BOX_DIRECTION:
         switch (style->boxDirection()) {
             case BNORMAL:
                 return new CSSPrimitiveValue(CSS_VAL_NORMAL);
@@ -445,11 +445,11 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
         }
         ASSERT_NOT_REACHED();
         return 0;
-    case CSS_PROP__KHTML_BOX_FLEX:
+    case CSS_PROP__WEBKIT_BOX_FLEX:
         return new CSSPrimitiveValue(style->boxFlex(), CSSPrimitiveValue::CSS_NUMBER);
-    case CSS_PROP__KHTML_BOX_FLEX_GROUP:
+    case CSS_PROP__WEBKIT_BOX_FLEX_GROUP:
         return new CSSPrimitiveValue(style->boxFlexGroup(), CSSPrimitiveValue::CSS_NUMBER);
-    case CSS_PROP__KHTML_BOX_LINES:
+    case CSS_PROP__WEBKIT_BOX_LINES:
         switch (style->boxLines()) {
             case SINGLE:
                 return new CSSPrimitiveValue(CSS_VAL_SINGLE);
@@ -458,9 +458,9 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
         }
         ASSERT_NOT_REACHED();
         return 0;
-    case CSS_PROP__KHTML_BOX_ORDINAL_GROUP:
+    case CSS_PROP__WEBKIT_BOX_ORDINAL_GROUP:
         return new CSSPrimitiveValue(style->boxOrdinalGroup(), CSSPrimitiveValue::CSS_NUMBER);
-    case CSS_PROP__KHTML_BOX_ORIENT:
+    case CSS_PROP__WEBKIT_BOX_ORIENT:
         switch (style->boxOrient()) {
             case HORIZONTAL:
                 return new CSSPrimitiveValue(CSS_VAL_HORIZONTAL);
@@ -469,7 +469,7 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
         }
         ASSERT_NOT_REACHED();
         return 0;
-    case CSS_PROP__KHTML_BOX_PACK:
+    case CSS_PROP__WEBKIT_BOX_PACK:
         switch (style->boxPack()) {
             case BSTART:
                 return new CSSPrimitiveValue(CSS_VAL_START);
@@ -608,9 +608,9 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
             case TABLE_CAPTION:
                 return new CSSPrimitiveValue(CSS_VAL_TABLE_CAPTION);
             case BOX:
-                return new CSSPrimitiveValue(CSS_VAL__KHTML_BOX);
+                return new CSSPrimitiveValue(CSS_VAL__WEBKIT_BOX);
             case INLINE_BOX:
-                return new CSSPrimitiveValue(CSS_VAL__KHTML_INLINE_BOX);
+                return new CSSPrimitiveValue(CSS_VAL__WEBKIT_INLINE_BOX);
             case NONE:
                 return new CSSPrimitiveValue(CSS_VAL_NONE);
         }
@@ -685,7 +685,7 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
         if (style->letterSpacing() == 0)
             return new CSSPrimitiveValue(CSS_VAL_NORMAL);
         return new CSSPrimitiveValue(style->letterSpacing(), CSSPrimitiveValue::CSS_PX);
-    case CSS_PROP__KHTML_LINE_CLAMP:
+    case CSS_PROP__WEBKIT_LINE_CLAMP:
         return new CSSPrimitiveValue(style->lineClamp(), CSSPrimitiveValue::CSS_PERCENTAGE);
     case CSS_PROP_LINE_HEIGHT: {
         Length length(style->lineHeight());
@@ -771,10 +771,10 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
         return valueForLength(style->marginBottom());
     case CSS_PROP_MARGIN_LEFT:
         return valueForLength(style->marginLeft());
-    case CSS_PROP__KHTML_MARQUEE:
+    case CSS_PROP__WEBKIT_MARQUEE:
         // FIXME: unimplemented
         break;
-    case CSS_PROP__KHTML_MARQUEE_DIRECTION:
+    case CSS_PROP__WEBKIT_MARQUEE_DIRECTION:
         switch (style->marqueeDirection()) {
             case MFORWARD:
                 return new CSSPrimitiveValue(CSS_VAL_FORWARDS);
@@ -793,16 +793,16 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
         }
         ASSERT_NOT_REACHED();
         return 0;
-    case CSS_PROP__KHTML_MARQUEE_INCREMENT:
+    case CSS_PROP__WEBKIT_MARQUEE_INCREMENT:
         return valueForLength(style->marqueeIncrement());
-    case CSS_PROP__KHTML_MARQUEE_REPETITION:
+    case CSS_PROP__WEBKIT_MARQUEE_REPETITION:
         if (style->marqueeLoopCount() < 0)
             return new CSSPrimitiveValue(CSS_VAL_INFINITE);
         return new CSSPrimitiveValue(style->marqueeLoopCount(), CSSPrimitiveValue::CSS_NUMBER);
-    case CSS_PROP__KHTML_MARQUEE_SPEED:
+    case CSS_PROP__WEBKIT_MARQUEE_SPEED:
         // FIXME: unimplemented
         break;
-    case CSS_PROP__KHTML_MARQUEE_STYLE:
+    case CSS_PROP__WEBKIT_MARQUEE_STYLE:
         switch (style->marqueeBehavior()) {
             case MNONE:
                 return new CSSPrimitiveValue(CSS_VAL_NONE);
@@ -817,7 +817,7 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
         }
         ASSERT_NOT_REACHED();
         return 0;
-    case CSS_PROP__KHTML_USER_MODIFY:
+    case CSS_PROP__WEBKIT_USER_MODIFY:
         switch (style->userModify()) {
             case READ_ONLY:
                 return new CSSPrimitiveValue(CSS_VAL_READ_ONLY);
@@ -864,9 +864,9 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
             case OAUTO:
                 return new CSSPrimitiveValue(CSS_VAL_AUTO);
             case OMARQUEE:
-                return new CSSPrimitiveValue(CSS_VAL_MARQUEE);
+                return new CSSPrimitiveValue(CSS_VAL__WEBKIT_MARQUEE);
             case OOVERLAY:
-                return new CSSPrimitiveValue(CSS_VAL_OVERLAY);
+                return new CSSPrimitiveValue(CSS_VAL__WEBKIT_OVERLAY);
         }
         ASSERT_NOT_REACHED();
         return 0;
@@ -970,7 +970,7 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
             return new CSSPrimitiveValue(CSS_VAL_NONE);
         return new CSSPrimitiveValue(string, CSSPrimitiveValue::CSS_STRING);
     }
-    case CSS_PROP__KHTML_TEXT_DECORATIONS_IN_EFFECT:
+    case CSS_PROP__WEBKIT_TEXT_DECORATIONS_IN_EFFECT:
     {
         String string;
         if (style->textDecorationsInEffect() & UNDERLINE)
@@ -998,7 +998,7 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
         return valueForLength(style->textIndent());
     case CSS_PROP_TEXT_SHADOW:
         return valueForShadow(style->textShadow());
-    case CSS_PROP__KHTML_TEXT_SIZE_ADJUST:
+    case CSS_PROP__WEBKIT_TEXT_SIZE_ADJUST:
         if (style->textSizeAdjust()) 
             return new CSSPrimitiveValue(CSS_VAL_AUTO);
         else
@@ -1048,7 +1048,7 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
             case BOTTOM:
                 return new CSSPrimitiveValue(CSS_VAL_BOTTOM);
             case BASELINE_MIDDLE:
-                return new CSSPrimitiveValue(CSS_VAL__KHTML_BASELINE_MIDDLE);
+                return new CSSPrimitiveValue(CSS_VAL__WEBKIT_BASELINE_MIDDLE);
             case LENGTH:
                 return valueForLength(style->verticalAlignLength());
         }
@@ -1078,7 +1078,7 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
             case NOWRAP:
                 return new CSSPrimitiveValue(CSS_VAL_NOWRAP);
             case KHTML_NOWRAP:
-                return new CSSPrimitiveValue(CSS_VAL__KHTML_NOWRAP);
+                return new CSSPrimitiveValue(CSS_VAL__WEBKIT_NOWRAP);
         }
         ASSERT_NOT_REACHED();
         return 0;
@@ -1097,7 +1097,7 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
         }
         ASSERT_NOT_REACHED();
         return 0;
-    case CSS_PROP__KHTML_LINE_BREAK:
+    case CSS_PROP__WEBKIT_LINE_BREAK:
         switch (style->khtmlLineBreak()) {
             case LBNORMAL:
                 return new CSSPrimitiveValue(CSS_VAL_NORMAL);
@@ -1106,7 +1106,7 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
         }
         ASSERT_NOT_REACHED();
         return 0;
-    case CSS_PROP__KHTML_NBSP_MODE:
+    case CSS_PROP__WEBKIT_NBSP_MODE:
         switch (style->nbspMode()) {
             case NBNORMAL:
                 return new CSSPrimitiveValue(CSS_VAL_NORMAL);
@@ -1115,7 +1115,7 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
         }
         ASSERT_NOT_REACHED();
         return 0;
-    case CSS_PROP__KHTML_MATCH_NEAREST_MAIL_BLOCKQUOTE_COLOR:
+    case CSS_PROP__WEBKIT_MATCH_NEAREST_MAIL_BLOCKQUOTE_COLOR:
         switch (style->matchNearestMailBlockquoteColor()) {
             case BCNORMAL:
                 return new CSSPrimitiveValue(CSS_VAL_NORMAL);
@@ -1171,7 +1171,7 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
         // FIXME: unimplemented
         break;
 #if __APPLE__
-        case CSS_PROP__KHTML_DASHBOARD_REGION: {
+        case CSS_PROP__WEBKIT_DASHBOARD_REGION: {
             DeprecatedValueList<StyleDashboardRegion> regions = style->dashboardRegions();
             unsigned count = regions.count();
             if (count == 1 && regions[0].type == StyleDashboardRegion::None)
index 04429f8..7e4e147 100644 (file)
@@ -62,16 +62,17 @@ int getPropertyID(const char *tagStr, int len)
     if (len && tagStr[0] == '-') {
         prop = DeprecatedString(tagStr, len);
         if (prop.startsWith("-apple-")) {
-            prop = "-khtml-" + prop.mid(7);
+            prop = "-webkit-" + prop.mid(7);
             tagStr = prop.ascii();
-        } else if (prop.startsWith("-webkit-")) {
-            prop = "-khtml-" + prop.mid(8);
-            len--;
+            len++;
+        } else if (prop.startsWith("-khtml-")) {
+            prop = "-webkit-" + prop.mid(7);
+            len++;
             tagStr = prop.ascii();
         }
         
-        // Honor the use of -khtml-opacity (for Safari 1.1).
-        if (prop == "-khtml-opacity") {
+        // Honor the use of old-style opacity (for Safari 1.1).
+        if (prop == "-webkit-opacity") {
             const char * const opacity = "opacity";
             tagStr = opacity;
             len = strlen(opacity);
@@ -93,11 +94,12 @@ static inline int getValueID(const char *tagStr, int len)
     if (len && tagStr[0] == '-') {
         prop = DeprecatedString(tagStr, len);
         if (prop.startsWith("-apple-")) {
-            prop = "-khtml-" + prop.mid(7);
+            prop = "-webkit-" + prop.mid(7);
             tagStr = prop.ascii();
-        } else if (prop.startsWith("-moz-")) {
-            prop = "-khtml-" + prop.mid(5);
-            len += 2;
+            len++;
+        } else if (prop.startsWith("-khtml-")) {
+            prop = "-webkit-" + prop.mid(7);
+            len++;
             tagStr = prop.ascii();
         }
     }
@@ -172,9 +174,9 @@ static int cssyylex(YYSTYPE *yylval) { return CSSParser::current()->lex(yylval);
 %token FONT_FACE_SYM
 %token CHARSET_SYM
 %token NAMESPACE_SYM
-%token KHTML_RULE_SYM
-%token KHTML_DECLS_SYM
-%token KHTML_VALUE_SYM
+%token WEBKIT_RULE_SYM
+%token WEBKIT_DECLS_SYM
+%token WEBKIT_VALUE_SYM
 
 %token IMPORTANT_SYM
 
@@ -262,25 +264,25 @@ static int cssyylex(YYSTYPE *yylval) { return CSSParser::current()->lex(yylval);
 
 stylesheet:
     maybe_charset maybe_sgml import_list namespace_list rule_list
-  | khtml_rule maybe_space
-  | khtml_decls maybe_space
-  | khtml_value maybe_space
+  | webkit_rule maybe_space
+  | webkit_decls maybe_space
+  | webkit_value maybe_space
   ;
 
-khtml_rule:
-    KHTML_RULE_SYM '{' maybe_space ruleset maybe_space '}' {
+webkit_rule:
+    WEBKIT_RULE_SYM '{' maybe_space ruleset maybe_space '}' {
         static_cast<CSSParser*>(parser)->rule = $4;
     }
 ;
 
-khtml_decls:
-    KHTML_DECLS_SYM '{' maybe_space declaration_list '}' {
+webkit_decls:
+    WEBKIT_DECLS_SYM '{' maybe_space declaration_list '}' {
         /* can be empty */
     }
 ;
 
-khtml_value:
-    KHTML_VALUE_SYM '{' maybe_space expr '}' {
+webkit_value:
+    WEBKIT_VALUE_SYM '{' maybe_space expr '}' {
         CSSParser *p = static_cast<CSSParser *>(parser);
         if ($4) {
             p->valueList = p->sinkFloatingValueList($4);
index af55fa7..ce5569e 100644 (file)
@@ -7,27 +7,27 @@
 # Microsoft extensions are documented here:
 # http://msdn.microsoft.com/workshop/author/css/reference/attributes.asp
 #
--khtml-appearance
+-webkit-appearance
 background-attachment
-background-clip
+-webkit-background-clip
 background-color
 background-image
-background-origin
+-webkit-background-origin
 background-position
 background-position-x
 background-position-y
 background-repeat
--khtml-binding
+-webkit-binding
 border-collapse
-border-image
+-webkit-border-image
 border-spacing
--khtml-border-horizontal-spacing
--khtml-border-vertical-spacing
-border-radius
-border-top-left-radius
-border-top-right-radius
-border-bottom-left-radius
-border-bottom-right-radius
+-webkit-border-horizontal-spacing
+-webkit-border-vertical-spacing
+-webkit-border-radius
+-webkit-border-top-left-radius
+-webkit-border-top-right-radius
+-webkit-border-bottom-left-radius
+-webkit-border-bottom-right-radius
 border-top-color
 border-right-color
 border-bottom-color
@@ -41,14 +41,14 @@ border-right-width
 border-bottom-width
 border-left-width
 bottom
--khtml-box-align
--khtml-box-direction
--khtml-box-flex
--khtml-box-flex-group
--khtml-box-lines
--khtml-box-ordinal-group
--khtml-box-orient
--khtml-box-pack
+-webkit-box-align
+-webkit-box-direction
+-webkit-box-flex
+-webkit-box-flex-group
+-webkit-box-lines
+-webkit-box-ordinal-group
+-webkit-box-orient
+-webkit-box-pack
 box-sizing
 caption-side
 clear
@@ -64,7 +64,7 @@ empty-cells
 float
 font-family
 font-size
--khtml-font-size-delta
+-webkit-font-size-delta
 font-stretch
 font-style
 font-variant
@@ -72,7 +72,7 @@ font-weight
 height
 left
 letter-spacing
--khtml-line-clamp
+-webkit-line-clamp
 line-height
 list-style-image
 list-style-position
@@ -81,23 +81,23 @@ margin-top
 margin-right
 margin-bottom
 margin-left
--khtml-line-break
--khtml-margin-collapse
--khtml-margin-top-collapse
--khtml-margin-bottom-collapse
--khtml-margin-start
--khtml-marquee
--khtml-marquee-direction
--khtml-marquee-increment
--khtml-marquee-repetition
--khtml-marquee-speed
--khtml-marquee-style
--khtml-match-nearest-mail-blockquote-color
+-webkit-line-break
+-webkit-margin-collapse
+-webkit-margin-top-collapse
+-webkit-margin-bottom-collapse
+-webkit-margin-start
+-webkit-marquee
+-webkit-marquee-direction
+-webkit-marquee-increment
+-webkit-marquee-repetition
+-webkit-marquee-speed
+-webkit-marquee-style
+-webkit-match-nearest-mail-blockquote-color
 max-height
 max-width
 min-height
 min-width
--khtml-nbsp-mode
+-webkit-nbsp-mode
 opacity
 orphans
 outline-color
@@ -109,7 +109,7 @@ padding-top
 padding-right
 padding-bottom
 padding-left
--khtml-padding-start
+-webkit-padding-start
 page
 page-break-after
 page-break-before
@@ -140,13 +140,13 @@ text-underline-color
 text-underline-mode
 text-underline-style
 text-underline-width
--khtml-text-size-adjust
--khtml-dashboard-region
+-webkit-text-size-adjust
+-webkit-dashboard-region
 top
 unicode-bidi
--khtml-user-drag
--khtml-user-modify
--khtml-user-select
+-webkit-user-drag
+-webkit-user-modify
+-webkit-user-select
 vertical-align
 visibility
 white-space
@@ -176,5 +176,5 @@ scrollbar-3dlight-color
 scrollbar-darkshadow-color
 scrollbar-track-color
 scrollbar-arrow-color
--khtml-text-decorations-in-effect
--khtml-rtl-ordering
+-webkit-text-decorations-in-effect
+-webkit-rtl-ordering
index 2aff2b9..c78dafc 100644 (file)
@@ -72,7 +72,7 @@ medium
 large
 x-large
 xx-large
--khtml-xxx-large
+-webkit-xxx-large
 smaller
 larger
 #
@@ -97,7 +97,7 @@ sans-serif
 cursive
 fantasy
 monospace
--khtml-body
+-webkit-body
 #
 #
 # CSS_PROP_*_COLOR
@@ -120,8 +120,8 @@ teal
 white
 yellow
 transparent
--khtml-link
--khtml-activelink
+-webkit-link
+-webkit-activelink
 activeborder
 activecaption
 appworkspace
@@ -150,11 +150,11 @@ threedshadow
 window
 windowframe
 windowtext
--khtml-focus-ring-color
+-webkit-focus-ring-color
 #
 # colors in non strict mode
 grey
--khtml-text
+-webkit-text
 #
 # CSS_PROP_BACKGROUND_REPEAT:
 #
@@ -174,18 +174,18 @@ text-bottom
 top
 bottom
 # HTML alignment MIDDLE has no corresponding CSS alignment
--khtml-baseline-middle
+-webkit-baseline-middle
 #
 # CSS_PROP_TEXT_ALIGN:
 #
--khtml-auto
+-webkit-auto
 left
 right
 center
 justify
--khtml-left
--khtml-right
--khtml-center
+-webkit-left
+-webkit-right
+-webkit-center
 #
 # CSS_PROP_LIST_STYLE_POSITION:
 #
@@ -234,8 +234,8 @@ table-column-group
 table-column
 table-cell
 table-caption
--khtml-box
--khtml-inline-box
+-webkit-box
+-webkit-inline-box
 #none
 #
 # CSS_PROP_CURSOR:
@@ -299,13 +299,13 @@ level
 line-through
 loud
 lower
-marquee
+-webkit-marquee
 mix
 no-close-quote
 no-open-quote
 nowrap
 open-quote
-overlay
+-webkit-overlay
 overline
 portrait
 pre
@@ -319,7 +319,7 @@ static
 thick
 thin
 underline
--khtml-nowrap
+-webkit-nowrap
 
 # CSS3 Values
 # CSS_PROP_BOX_ALIGN
index 3c70150..6e5d974 100644 (file)
@@ -139,12 +139,12 @@ void CSSSelector::extractPseudoType() const
     
     static AtomicString active("active");
     static AtomicString after("after");
-    static AtomicString anyLink("-khtml-any-link");
-    static AtomicString autofill("-khtml-autofill");
+    static AtomicString anyLink("-webkit-any-link");
+    static AtomicString autofill("-webkit-autofill");
     static AtomicString before("before");
     static AtomicString checked("checked");
     static AtomicString disabled("disabled");
-    static AtomicString drag("-khtml-drag");
+    static AtomicString drag("-webkit-drag");
     static AtomicString empty("empty");
     static AtomicString enabled("enabled");
     static AtomicString firstChild("first-child");
index 8532280..98db0bc 100644 (file)
@@ -569,9 +569,9 @@ const int inheritableProperties[] = {
     CSS_PROP_LETTER_SPACING,
     CSS_PROP_LINE_HEIGHT,
     CSS_PROP_TEXT_ALIGN,
-    CSS_PROP__KHTML_TEXT_DECORATIONS_IN_EFFECT,
+    CSS_PROP__WEBKIT_TEXT_DECORATIONS_IN_EFFECT,
     CSS_PROP_TEXT_INDENT,
-    CSS_PROP__KHTML_TEXT_SIZE_ADJUST,
+    CSS_PROP__WEBKIT_TEXT_SIZE_ADJUST,
     CSS_PROP_TEXT_TRANSFORM,
     CSS_PROP_ORPHANS,
     CSS_PROP_WHITE_SPACE,
index 4078448..499b554 100644 (file)
@@ -331,7 +331,7 @@ protected:
 // A primitive value representing a pair.  This is useful for properties like border-radius, background-size/position,
 // and border-spacing (all of which are space-separated sets of two values).  At the moment we are only using it for
 // border-radius, but (FIXME) border-spacing and background-position could be converted over to use it
-// (eliminating some extra -khtml- internal properties).
+// (eliminating some extra -webkit- internal properties).
 class Pair : public Shared<Pair> {
 public:
     virtual ~Pair();
index 08c00b2..edfa4e6 100644 (file)
@@ -163,7 +163,7 @@ PassRefPtr<CSSRule> CSSParser::parseRule(CSSStyleSheet *sheet, const String &str
 {
     styleElement = sheet;
     
-    setupParser("@-khtml-rule{", string, "} ");
+    setupParser("@-webkit-rule{", string, "} ");
 
     CSSParser* old = currentParser;
     currentParser = this;
@@ -177,7 +177,7 @@ bool CSSParser::parseValue(CSSMutableStyleDeclaration *declaration, int _id, con
 {
     styleElement = declaration->stylesheet();
 
-    setupParser("@-khtml-value{", string, "} ");
+    setupParser("@-webkit-value{", string, "} ");
 
     id = _id;
     important = _important;
@@ -226,7 +226,7 @@ bool CSSParser::parseColor(CSSMutableStyleDeclaration *declaration, const String
 {
     styleElement = declaration->stylesheet();
 
-    setupParser("@-khtml-decls{color:", string, "} ");
+    setupParser("@-webkit-decls{color:", string, "} ");
 
     CSSParser* old = currentParser;
     currentParser = this;
@@ -246,7 +246,7 @@ bool CSSParser::parseDeclaration(CSSMutableStyleDeclaration *declaration, const
 {
     styleElement = declaration->stylesheet();
 
-    setupParser("@-khtml-decls{", string, "} ");
+    setupParser("@-webkit-decls{", string, "} ");
 
     CSSParser* old = currentParser;
     currentParser = this;
@@ -457,7 +457,7 @@ bool CSSParser::parseValue(int propId, bool important)
         break;
 
 #if __APPLE__
-    case CSS_PROP__KHTML_DASHBOARD_REGION:                 // <dashboard-region> | <dashboard-region> 
+    case CSS_PROP__WEBKIT_DASHBOARD_REGION:                 // <dashboard-region> | <dashboard-region> 
         if (value->unit == Value::Function || id == CSS_VAL_NONE)
             return parseDashboardRegions(propId, important);
         break;
@@ -484,7 +484,7 @@ bool CSSParser::parseValue(int propId, bool important)
 
     case CSS_PROP_OVERFLOW:             // visible | hidden | scroll | auto | marquee | overlay | inherit
         if (id == CSS_VAL_VISIBLE || id == CSS_VAL_HIDDEN || id == CSS_VAL_SCROLL || id == CSS_VAL_AUTO ||
-            id == CSS_VAL_MARQUEE || id == CSS_VAL_OVERLAY)
+            id == CSS_VAL__WEBKIT_MARQUEE || id == CSS_VAL__WEBKIT_OVERLAY)
             valid_primitive = true;
         break;
 
@@ -506,7 +506,7 @@ bool CSSParser::parseValue(int propId, bool important)
         // inline | block | list-item | run-in | inline-block | table |
         // inline-table | table-row-group | table-header-group | table-footer-group | table-row |
         // table-column-group | table-column | table-cell | table-caption | box | inline-box | none | inherit
-        if ((id >= CSS_VAL_INLINE && id <= CSS_VAL__KHTML_INLINE_BOX) || id == CSS_VAL_NONE)
+        if ((id >= CSS_VAL_INLINE && id <= CSS_VAL__WEBKIT_INLINE_BOX) || id == CSS_VAL_NONE)
             valid_primitive = true;
         break;
 
@@ -534,7 +534,7 @@ bool CSSParser::parseValue(int propId, bool important)
 
     case CSS_PROP_TEXT_ALIGN:
         // left | right | center | justify | khtml_left | khtml_right | khtml_center | <string> | inherit
-        if ((id >= CSS_VAL__KHTML_AUTO && id <= CSS_VAL__KHTML_CENTER) ||
+        if ((id >= CSS_VAL__WEBKIT_AUTO && id <= CSS_VAL__WEBKIT_CENTER) ||
              value->unit == CSSPrimitiveValue::CSS_STRING)
             valid_primitive = true;
         break;
@@ -570,8 +570,8 @@ bool CSSParser::parseValue(int propId, bool important)
         break;
 
     case CSS_PROP_BORDER_SPACING: {
-        const int properties[2] = { CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING,
-                                    CSS_PROP__KHTML_BORDER_VERTICAL_SPACING };
+        const int properties[2] = { CSS_PROP__WEBKIT_BORDER_HORIZONTAL_SPACING,
+                                    CSS_PROP__WEBKIT_BORDER_VERTICAL_SPACING };
         if (num == 1) {
             ShorthandScope scope(this, CSS_PROP_BORDER_SPACING);
             if (!parseValue(properties[0], important))
@@ -588,8 +588,8 @@ bool CSSParser::parseValue(int propId, bool important)
         }
         return false;
     }
-    case CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING:
-    case CSS_PROP__KHTML_BORDER_VERTICAL_SPACING:
+    case CSS_PROP__WEBKIT_BORDER_HORIZONTAL_SPACING:
+    case CSS_PROP__WEBKIT_BORDER_VERTICAL_SPACING:
         valid_primitive = validUnit(value, FLength|FNonNeg, strict);
         break;
     case CSS_PROP_SCROLLBAR_FACE_COLOR:         // IE5.5
@@ -605,7 +605,7 @@ bool CSSParser::parseValue(int propId, bool important)
     case CSS_PROP_OUTLINE_COLOR:        // <color> | invert | inherit
         // Outline color has "invert" as additional keyword.
         // Also, we want to allow the special focus color even in strict parsing mode.
-        if (propId == CSS_PROP_OUTLINE_COLOR && (id == CSS_VAL_INVERT || id == CSS_VAL__KHTML_FOCUS_RING_COLOR)) {
+        if (propId == CSS_PROP_OUTLINE_COLOR && (id == CSS_VAL_INVERT || id == CSS_VAL__WEBKIT_FOCUS_RING_COLOR)) {
             valid_primitive = true;
             break;
         }
@@ -619,11 +619,11 @@ bool CSSParser::parseValue(int propId, bool important)
     case CSS_PROP_TEXT_LINE_THROUGH_COLOR: // CSS3 text decoration colors
     case CSS_PROP_TEXT_UNDERLINE_COLOR:
     case CSS_PROP_TEXT_OVERLINE_COLOR:
-        if (id == CSS_VAL__KHTML_TEXT)
+        if (id == CSS_VAL__WEBKIT_TEXT)
             valid_primitive = true; // Always allow this, even when strict parsing is on,
                                     // since we use this in our UA sheets.
         else if (id >= CSS_VAL_AQUA && id <= CSS_VAL_WINDOWTEXT || id == CSS_VAL_MENU ||
-             (id >= CSS_VAL__KHTML_FOCUS_RING_COLOR && id < CSS_VAL__KHTML_TEXT && !strict)) {
+             (id >= CSS_VAL__WEBKIT_FOCUS_RING_COLOR && id < CSS_VAL__WEBKIT_TEXT && !strict)) {
             valid_primitive = true;
         } else {
             parsedValue = parseColor();
@@ -651,9 +651,9 @@ bool CSSParser::parseValue(int propId, bool important)
         break;
 
     case CSS_PROP_BACKGROUND_ATTACHMENT:
-    case CSS_PROP_BACKGROUND_CLIP:
+    case CSS_PROP__WEBKIT_BACKGROUND_CLIP:
     case CSS_PROP_BACKGROUND_IMAGE:
-    case CSS_PROP_BACKGROUND_ORIGIN:
+    case CSS_PROP__WEBKIT_BACKGROUND_ORIGIN:
     case CSS_PROP_BACKGROUND_POSITION:
     case CSS_PROP_BACKGROUND_POSITION_X:
     case CSS_PROP_BACKGROUND_POSITION_Y:
@@ -709,21 +709,21 @@ bool CSSParser::parseValue(int propId, bool important)
             valid_primitive = true;
         break;
 
-    case CSS_PROP__KHTML_FONT_SIZE_DELTA:           // <length>
+    case CSS_PROP__WEBKIT_FONT_SIZE_DELTA:           // <length>
         valid_primitive = validUnit(value, FLength, strict);
         break;
 
-    case CSS_PROP__KHTML_NBSP_MODE:     // normal | space
+    case CSS_PROP__WEBKIT_NBSP_MODE:     // normal | space
         if (id == CSS_VAL_NORMAL || id == CSS_VAL_SPACE)
             valid_primitive = true;
         break;
 
-    case CSS_PROP__KHTML_LINE_BREAK:   // normal | after-white-space
+    case CSS_PROP__WEBKIT_LINE_BREAK:   // normal | after-white-space
         if (id == CSS_VAL_NORMAL || id == CSS_VAL_AFTER_WHITE_SPACE)
             valid_primitive = true;
         break;
 
-    case CSS_PROP__KHTML_MATCH_NEAREST_MAIL_BLOCKQUOTE_COLOR:   // normal | match
+    case CSS_PROP__WEBKIT_MATCH_NEAREST_MAIL_BLOCKQUOTE_COLOR:   // normal | match
         if (id == CSS_VAL_NORMAL || id == CSS_VAL_MATCH)
             valid_primitive = true;
         break;
@@ -733,7 +733,7 @@ bool CSSParser::parseValue(int propId, bool important)
     case CSS_PROP_PADDING_RIGHT:        //   Which is defined as
     case CSS_PROP_PADDING_BOTTOM:       //   <length> | <percentage>
     case CSS_PROP_PADDING_LEFT:         ////
-    case CSS_PROP__KHTML_PADDING_START:
+    case CSS_PROP__WEBKIT_PADDING_START:
         valid_primitive = (!id && validUnit(value, FLength|FPercent, strict));
         break;
 
@@ -774,7 +774,7 @@ bool CSSParser::parseValue(int propId, bool important)
         // baseline | sub | super | top | text-top | middle | bottom | text-bottom |
         // <percentage> | <length> | inherit
 
-        if (id >= CSS_VAL_BASELINE && id <= CSS_VAL__KHTML_BASELINE_MIDDLE)
+        if (id >= CSS_VAL_BASELINE && id <= CSS_VAL__WEBKIT_BASELINE_MIDDLE)
             valid_primitive = true;
         else
             valid_primitive = (!id && validUnit(value, FLength|FPercent, strict));
@@ -797,7 +797,7 @@ bool CSSParser::parseValue(int propId, bool important)
     case CSS_PROP_MARGIN_RIGHT:         //   Which is defined as
     case CSS_PROP_MARGIN_BOTTOM:        //   <length> | <percentage> | auto | inherit
     case CSS_PROP_MARGIN_LEFT:          ////
-    case CSS_PROP__KHTML_MARGIN_START:
+    case CSS_PROP__WEBKIT_MARGIN_START:
         if (id == CSS_VAL_AUTO)
             valid_primitive = true;
         else
@@ -830,7 +830,7 @@ bool CSSParser::parseValue(int propId, bool important)
     }
 
     case CSS_PROP_TEXT_DECORATION:
-    case CSS_PROP__KHTML_TEXT_DECORATIONS_IN_EFFECT:
+    case CSS_PROP__WEBKIT_TEXT_DECORATIONS_IN_EFFECT:
         // none | [ underline || overline || line-through || blink ] | inherit
         if (id == CSS_VAL_NONE) {
             valid_primitive = true;
@@ -865,12 +865,12 @@ bool CSSParser::parseValue(int propId, bool important)
         break;
 
     /* CSS3 properties */
-    case CSS_PROP__KHTML_APPEARANCE:
+    case CSS_PROP__WEBKIT_APPEARANCE:
         if ((id >= CSS_VAL_CHECKBOX && id <= CSS_VAL_TEXTFIELD) || id == CSS_VAL_NONE)
             valid_primitive = true;
         break;
 
-    case CSS_PROP__KHTML_BINDING:
+    case CSS_PROP__WEBKIT_BINDING:
 #ifndef KHTML_NO_XBL
         if (id == CSS_VAL_NONE)
             valid_primitive = true;
@@ -902,17 +902,17 @@ bool CSSParser::parseValue(int propId, bool important)
         }
 #endif
         break;
-    case CSS_PROP_BORDER_IMAGE:
+    case CSS_PROP__WEBKIT_BORDER_IMAGE:
         if (id == CSS_VAL_NONE)
             valid_primitive = true;
         else
             return parseBorderImage(propId, important);
         break;
-    case CSS_PROP_BORDER_TOP_RIGHT_RADIUS:
-    case CSS_PROP_BORDER_TOP_LEFT_RADIUS:
-    case CSS_PROP_BORDER_BOTTOM_LEFT_RADIUS:
-    case CSS_PROP_BORDER_BOTTOM_RIGHT_RADIUS:
-    case CSS_PROP_BORDER_RADIUS: {
+    case CSS_PROP__WEBKIT_BORDER_TOP_RIGHT_RADIUS:
+    case CSS_PROP__WEBKIT_BORDER_TOP_LEFT_RADIUS:
+    case CSS_PROP__WEBKIT_BORDER_BOTTOM_LEFT_RADIUS:
+    case CSS_PROP__WEBKIT_BORDER_BOTTOM_RIGHT_RADIUS:
+    case CSS_PROP__WEBKIT_BORDER_RADIUS: {
         if (num != 1 && num != 2)
             return false;
         valid_primitive = validUnit(value, FLength, strict);
@@ -950,88 +950,88 @@ bool CSSParser::parseValue(int propId, bool important)
     case CSS_PROP_OPACITY:
         valid_primitive = validUnit(value, FNumber, strict);
         break;
-    case CSS_PROP__KHTML_BOX_ALIGN:
+    case CSS_PROP__WEBKIT_BOX_ALIGN:
         if (id == CSS_VAL_STRETCH || id == CSS_VAL_START || id == CSS_VAL_END ||
             id == CSS_VAL_CENTER || id == CSS_VAL_BASELINE)
             valid_primitive = true;
         break;
-    case CSS_PROP__KHTML_BOX_DIRECTION:
+    case CSS_PROP__WEBKIT_BOX_DIRECTION:
         if (id == CSS_VAL_NORMAL || id == CSS_VAL_REVERSE)
             valid_primitive = true;
         break;
-    case CSS_PROP__KHTML_BOX_LINES:
+    case CSS_PROP__WEBKIT_BOX_LINES:
         if (id == CSS_VAL_SINGLE || id == CSS_VAL_MULTIPLE)
             valid_primitive = true;
         break;
-    case CSS_PROP__KHTML_BOX_ORIENT:
+    case CSS_PROP__WEBKIT_BOX_ORIENT:
         if (id == CSS_VAL_HORIZONTAL || id == CSS_VAL_VERTICAL ||
             id == CSS_VAL_INLINE_AXIS || id == CSS_VAL_BLOCK_AXIS)
             valid_primitive = true;
         break;
-    case CSS_PROP__KHTML_BOX_PACK:
+    case CSS_PROP__WEBKIT_BOX_PACK:
         if (id == CSS_VAL_START || id == CSS_VAL_END ||
             id == CSS_VAL_CENTER || id == CSS_VAL_JUSTIFY)
             valid_primitive = true;
         break;
-    case CSS_PROP__KHTML_BOX_FLEX:
+    case CSS_PROP__WEBKIT_BOX_FLEX:
         valid_primitive = validUnit(value, FNumber, strict);
         break;
-    case CSS_PROP__KHTML_BOX_FLEX_GROUP:
-    case CSS_PROP__KHTML_BOX_ORDINAL_GROUP:
+    case CSS_PROP__WEBKIT_BOX_FLEX_GROUP:
+    case CSS_PROP__WEBKIT_BOX_ORDINAL_GROUP:
         valid_primitive = validUnit(value, FInteger|FNonNeg, true);
         break;
     case CSS_PROP_BOX_SIZING: {
-        // We don't preface this with -khtml, since MacIE defined this property without the prefix.
+        // We don't preface this with -webkit, since MacIE defined this property without the prefix.
         // Thus the damage has been done, and it's known that this property's definition isn't going
         // to fluctuate.
         if (id == CSS_VAL_BORDER_BOX || id == CSS_VAL_CONTENT_BOX)
             valid_primitive = true;
         break;
     }
-    case CSS_PROP__KHTML_MARQUEE: {
-        const int properties[5] = { CSS_PROP__KHTML_MARQUEE_DIRECTION, CSS_PROP__KHTML_MARQUEE_INCREMENT,
-                                    CSS_PROP__KHTML_MARQUEE_REPETITION,
-                                    CSS_PROP__KHTML_MARQUEE_STYLE, CSS_PROP__KHTML_MARQUEE_SPEED };
+    case CSS_PROP__WEBKIT_MARQUEE: {
+        const int properties[5] = { CSS_PROP__WEBKIT_MARQUEE_DIRECTION, CSS_PROP__WEBKIT_MARQUEE_INCREMENT,
+                                    CSS_PROP__WEBKIT_MARQUEE_REPETITION,
+                                    CSS_PROP__WEBKIT_MARQUEE_STYLE, CSS_PROP__WEBKIT_MARQUEE_SPEED };
         return parseShorthand(propId, properties, 5, important);
     }
-    case CSS_PROP__KHTML_MARQUEE_DIRECTION:
+    case CSS_PROP__WEBKIT_MARQUEE_DIRECTION:
         if (id == CSS_VAL_FORWARDS || id == CSS_VAL_BACKWARDS || id == CSS_VAL_AHEAD ||
             id == CSS_VAL_REVERSE || id == CSS_VAL_LEFT || id == CSS_VAL_RIGHT || id == CSS_VAL_DOWN ||
             id == CSS_VAL_UP || id == CSS_VAL_AUTO)
             valid_primitive = true;
         break;
-    case CSS_PROP__KHTML_MARQUEE_INCREMENT:
+    case CSS_PROP__WEBKIT_MARQUEE_INCREMENT:
         if (id == CSS_VAL_SMALL || id == CSS_VAL_LARGE || id == CSS_VAL_MEDIUM)
             valid_primitive = true;
         else
             valid_primitive = validUnit(value, FLength|FPercent, strict);
         break;
-    case CSS_PROP__KHTML_MARQUEE_STYLE:
+    case CSS_PROP__WEBKIT_MARQUEE_STYLE:
         if (id == CSS_VAL_NONE || id == CSS_VAL_SLIDE || id == CSS_VAL_SCROLL || id == CSS_VAL_ALTERNATE ||
             id == CSS_VAL_UNFURL)
             valid_primitive = true;
         break;
-    case CSS_PROP__KHTML_MARQUEE_REPETITION:
+    case CSS_PROP__WEBKIT_MARQUEE_REPETITION:
         if (id == CSS_VAL_INFINITE)
             valid_primitive = true;
         else
             valid_primitive = validUnit(value, FInteger|FNonNeg, strict);
         break;
-    case CSS_PROP__KHTML_MARQUEE_SPEED:
+    case CSS_PROP__WEBKIT_MARQUEE_SPEED:
         if (id == CSS_VAL_NORMAL || id == CSS_VAL_SLOW || id == CSS_VAL_FAST)
             valid_primitive = true;
         else
             valid_primitive = validUnit(value, FTime|FInteger|FNonNeg, strict);
         break;
-    case CSS_PROP__KHTML_USER_DRAG: // auto | none | element
+    case CSS_PROP__WEBKIT_USER_DRAG: // auto | none | element
         if (id == CSS_VAL_AUTO || id == CSS_VAL_NONE || id == CSS_VAL_ELEMENT)
             valid_primitive = true;
         break;
-    case CSS_PROP__KHTML_USER_MODIFY: // read-only | read-write
+    case CSS_PROP__WEBKIT_USER_MODIFY: // read-only | read-write
         if (id == CSS_VAL_READ_ONLY || id == CSS_VAL_READ_WRITE || CSS_VAL_READ_WRITE_PLAINTEXT_ONLY)
             valid_primitive = true;
         break;
-    case CSS_PROP__KHTML_USER_SELECT: // auto | none | text
+    case CSS_PROP__WEBKIT_USER_SELECT: // auto | none | text
         if (id == CSS_VAL_AUTO || id == CSS_VAL_NONE || id == CSS_VAL_TEXT || id == CSS_VAL_IGNORE)
             valid_primitive = true;
         break;
@@ -1039,11 +1039,11 @@ bool CSSParser::parseValue(int propId, bool important)
         if (id == CSS_VAL_CLIP || id == CSS_VAL_ELLIPSIS)
             valid_primitive = true;
         break;
-    case CSS_PROP__KHTML_MARGIN_COLLAPSE: {
-        const int properties[2] = { CSS_PROP__KHTML_MARGIN_TOP_COLLAPSE,
-            CSS_PROP__KHTML_MARGIN_BOTTOM_COLLAPSE };
+    case CSS_PROP__WEBKIT_MARGIN_COLLAPSE: {
+        const int properties[2] = { CSS_PROP__WEBKIT_MARGIN_TOP_COLLAPSE,
+            CSS_PROP__WEBKIT_MARGIN_BOTTOM_COLLAPSE };
         if (num == 1) {
-            ShorthandScope scope(this, CSS_PROP__KHTML_MARGIN_COLLAPSE);
+            ShorthandScope scope(this, CSS_PROP__WEBKIT_MARGIN_COLLAPSE);
             if (!parseValue(properties[0], important))
                 return false;
             CSSValue* value = parsedProperties[numParsedProperties-1]->value();
@@ -1051,15 +1051,15 @@ bool CSSParser::parseValue(int propId, bool important)
             return true;
         }
         else if (num == 2) {
-            ShorthandScope scope(this, CSS_PROP__KHTML_MARGIN_COLLAPSE);
+            ShorthandScope scope(this, CSS_PROP__WEBKIT_MARGIN_COLLAPSE);
             if (!parseValue(properties[0], important) || !parseValue(properties[1], important))
                 return false;
             return true;
         }
         return false;
     }
-    case CSS_PROP__KHTML_MARGIN_TOP_COLLAPSE:
-    case CSS_PROP__KHTML_MARGIN_BOTTOM_COLLAPSE:
+    case CSS_PROP__WEBKIT_MARGIN_TOP_COLLAPSE:
+    case CSS_PROP__WEBKIT_MARGIN_BOTTOM_COLLAPSE:
         if (id == CSS_VAL_COLLAPSE || id == CSS_VAL_SEPARATE || id == CSS_VAL_DISCARD)
             valid_primitive = true;
         break;
@@ -1091,14 +1091,14 @@ bool CSSParser::parseValue(int propId, bool important)
 
     // Apple specific properties.  These will never be standardized and are purely to
     // support custom WebKit-based Apple applications.
-    case CSS_PROP__KHTML_LINE_CLAMP:
+    case CSS_PROP__WEBKIT_LINE_CLAMP:
         valid_primitive = (!id && validUnit(value, FPercent, false));
         break;
-    case CSS_PROP__KHTML_TEXT_SIZE_ADJUST:
+    case CSS_PROP__WEBKIT_TEXT_SIZE_ADJUST:
         if (id == CSS_VAL_AUTO || id == CSS_VAL_NONE)
             valid_primitive = true;
         break;
-    case CSS_PROP__KHTML_RTL_ORDERING:
+    case CSS_PROP__WEBKIT_RTL_ORDERING:
         if (id == CSS_VAL_LOGICAL || id == CSS_VAL_VISUAL)
             valid_primitive = true;
         break;
@@ -1251,8 +1251,8 @@ bool CSSParser::parseBackgroundShorthand(bool important)
     // in quirks mode but it's usually the X coordinate of a position.
     const int numProperties = 7;
     const int properties[numProperties] = { CSS_PROP_BACKGROUND_IMAGE, CSS_PROP_BACKGROUND_REPEAT,
-        CSS_PROP_BACKGROUND_ATTACHMENT, CSS_PROP_BACKGROUND_POSITION, CSS_PROP_BACKGROUND_CLIP,
-        CSS_PROP_BACKGROUND_ORIGIN, CSS_PROP_BACKGROUND_COLOR };
+        CSS_PROP_BACKGROUND_ATTACHMENT, CSS_PROP_BACKGROUND_POSITION, CSS_PROP__WEBKIT_BACKGROUND_CLIP,
+        CSS_PROP__WEBKIT_BACKGROUND_ORIGIN, CSS_PROP_BACKGROUND_COLOR };
     
     ShorthandScope scope(this, CSS_PROP_BACKGROUND);
 
@@ -1485,8 +1485,8 @@ bool CSSParser::parseContent(int propId, bool important)
 CSSValue* CSSParser::parseBackgroundColor()
 {
     int id = valueList->current()->id;
-    if (id == CSS_VAL__KHTML_TEXT || (id >= CSS_VAL_AQUA && id <= CSS_VAL_WINDOWTEXT) || id == CSS_VAL_MENU ||
-        (id >= CSS_VAL_GREY && id < CSS_VAL__KHTML_TEXT && !strict))
+    if (id == CSS_VAL__WEBKIT_TEXT || (id >= CSS_VAL_AQUA && id <= CSS_VAL_WINDOWTEXT) || id == CSS_VAL_MENU ||
+        (id >= CSS_VAL_GREY && id < CSS_VAL__WEBKIT_TEXT && !strict))
        return new CSSPrimitiveValue(id);
     return parseColor();
 }
@@ -1626,8 +1626,8 @@ bool CSSParser::parseBackgroundProperty(int propId, int& propId1, int& propId2,
                     if (currValue)
                         valueList->next();
                     break;
-                case CSS_PROP_BACKGROUND_CLIP:
-                case CSS_PROP_BACKGROUND_ORIGIN:
+                case CSS_PROP__WEBKIT_BACKGROUND_CLIP:
+                case CSS_PROP__WEBKIT_BACKGROUND_ORIGIN:
                     if (val->id == CSS_VAL_BORDER || val->id == CSS_VAL_PADDING || val->id == CSS_VAL_CONTENT) {
                         currValue = new CSSPrimitiveValue(val->id);
                         valueList->next();
@@ -2031,10 +2031,10 @@ CSSValueList *CSSParser::parseFontFamily()
         bool nextValBreaksFont = !nextValue ||
                                  (nextValue->unit == Value::Operator && nextValue->iValue == ',');
         bool nextValIsFontName = nextValue &&
-            ((nextValue->id >= CSS_VAL_SERIF && nextValue->id <= CSS_VAL__KHTML_BODY) ||
+            ((nextValue->id >= CSS_VAL_SERIF && nextValue->id <= CSS_VAL__WEBKIT_BODY) ||
             (nextValue->unit == CSSPrimitiveValue::CSS_STRING || nextValue->unit == CSSPrimitiveValue::CSS_IDENT));
 
-        if (value->id >= CSS_VAL_SERIF && value->id <= CSS_VAL__KHTML_BODY) {
+        if (value->id >= CSS_VAL_SERIF && value->id <= CSS_VAL__WEBKIT_BODY) {
             if (currFamily) {
                 currFamily->parsedFontName += ' ';
                 currFamily->parsedFontName += deprecatedString(value->string);
@@ -2313,7 +2313,7 @@ bool CSSParser::parseShadow(int propId, bool important)
             // The only other type of value that's ok is a color value.
             CSSPrimitiveValue* parsedColor = 0;
             bool isColor = (val->id >= CSS_VAL_AQUA && val->id <= CSS_VAL_WINDOWTEXT || val->id == CSS_VAL_MENU ||
-                            (val->id >= CSS_VAL__KHTML_FOCUS_RING_COLOR && val->id <= CSS_VAL__KHTML_TEXT && !strict));
+                            (val->id >= CSS_VAL__WEBKIT_FOCUS_RING_COLOR && val->id <= CSS_VAL__WEBKIT_TEXT && !strict));
             if (isColor) {
                 if (!context.allowColor)
                     return context.failed();
index 9470145..51f62d2 100644 (file)
@@ -1654,7 +1654,7 @@ void CSSStyleSelector::applyDeclarations(bool applyFirst, bool isImportant,
                     case CSS_PROP_FONT_STYLE:
                     case CSS_PROP_FONT_FAMILY:
                     case CSS_PROP_FONT_WEIGHT:
-                    case CSS_PROP__KHTML_TEXT_SIZE_ADJUST:
+                    case CSS_PROP__WEBKIT_TEXT_SIZE_ADJUST:
                     case CSS_PROP_FONT_VARIANT:
                         // these have to be applied first, because other properties use the computed
                         // values of these porperties.
@@ -1686,9 +1686,9 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
     bool isInitial = valueType == CSSValue::CSS_INITIAL || (!parentNode && valueType == CSSValue::CSS_INHERIT);
 
     // These properties are used to set the correct margins/padding on RTL lists.
-    if (id == CSS_PROP__KHTML_MARGIN_START)
+    if (id == CSS_PROP__WEBKIT_MARGIN_START)
         id = style->direction() == LTR ? CSS_PROP_MARGIN_LEFT : CSS_PROP_MARGIN_RIGHT;
-    else if (id == CSS_PROP__KHTML_PADDING_START)
+    else if (id == CSS_PROP__WEBKIT_PADDING_START)
         id = style->direction() == LTR ? CSS_PROP_PADDING_LEFT : CSS_PROP_PADDING_RIGHT;
 
     // What follows is a list that maps the CSS properties into their corresponding front-end
@@ -1700,10 +1700,10 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
     case CSS_PROP_BACKGROUND_ATTACHMENT:
         HANDLE_BACKGROUND_VALUE(backgroundAttachment, BackgroundAttachment, value)
         break;
-    case CSS_PROP_BACKGROUND_CLIP:
+    case CSS_PROP__WEBKIT_BACKGROUND_CLIP:
         HANDLE_BACKGROUND_VALUE(backgroundClip, BackgroundClip, value)
         break;
-    case CSS_PROP_BACKGROUND_ORIGIN:
+    case CSS_PROP__WEBKIT_BACKGROUND_ORIGIN:
         HANDLE_BACKGROUND_VALUE(backgroundOrigin, BackgroundOrigin, value)
         break;
     case CSS_PROP_BACKGROUND_REPEAT:
@@ -1988,9 +1988,9 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
             o = OSCROLL; break;
         case CSS_VAL_AUTO:
             o = OAUTO; break;
-        case CSS_VAL_MARQUEE:
+        case CSS_VAL__WEBKIT_MARQUEE:
             o = OMARQUEE; break;
-        case CSS_VAL_OVERLAY:
+        case CSS_VAL__WEBKIT_OVERLAY:
             o = OOVERLAY; break;
         default:
             return;
@@ -2157,7 +2157,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
 
         EWhiteSpace s;
         switch(primitiveValue->getIdent()) {
-        case CSS_VAL__KHTML_NOWRAP:
+        case CSS_VAL__WEBKIT_NOWRAP:
             s = KHTML_NOWRAP;
             break;
         case CSS_VAL_NOWRAP:
@@ -2203,14 +2203,14 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
         }
         break;
     }
-    case CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING: {
+    case CSS_PROP__WEBKIT_BORDER_HORIZONTAL_SPACING: {
         HANDLE_INHERIT_AND_INITIAL(horizontalBorderSpacing, HorizontalBorderSpacing)
         if (!primitiveValue) break;
         short spacing =  primitiveValue->computeLengthShort(style);
         style->setHorizontalBorderSpacing(spacing);
         break;
     }
-    case CSS_PROP__KHTML_BORDER_VERTICAL_SPACING: {
+    case CSS_PROP__WEBKIT_BORDER_VERTICAL_SPACING: {
         HANDLE_INHERIT_AND_INITIAL(verticalBorderSpacing, VerticalBorderSpacing)
         if (!primitiveValue) break;
         short spacing =  primitiveValue->computeLengthShort(style);
@@ -2430,7 +2430,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
         break;
     }
 
-    case CSS_PROP__KHTML_NBSP_MODE:
+    case CSS_PROP__WEBKIT_NBSP_MODE:
     {
         HANDLE_INHERIT_AND_INITIAL(nbspMode, NBSPMode)
 
@@ -2450,7 +2450,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
         break;
     }
 
-    case CSS_PROP__KHTML_LINE_BREAK:
+    case CSS_PROP__WEBKIT_LINE_BREAK:
     {
         HANDLE_INHERIT_AND_INITIAL(khtmlLineBreak, KHTMLLineBreak)
 
@@ -2470,7 +2470,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
         break;
     }
 
-    case CSS_PROP__KHTML_MATCH_NEAREST_MAIL_BLOCKQUOTE_COLOR:
+    case CSS_PROP__WEBKIT_MATCH_NEAREST_MAIL_BLOCKQUOTE_COLOR:
     {
         HANDLE_INHERIT_AND_INITIAL(matchNearestMailBlockquoteColor, MatchNearestMailBlockquoteColor)
 
@@ -2697,7 +2697,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
                     align = SUB; break;
                 case CSS_VAL_SUPER:
                     align = SUPER; break;
-                case CSS_VAL__KHTML_BASELINE_MIDDLE:
+                case CSS_VAL__WEBKIT_BASELINE_MIDDLE:
                     align = BASELINE_MIDDLE; break;
                 default:
                     return;
@@ -2743,7 +2743,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
             case CSS_VAL_LARGE:
             case CSS_VAL_X_LARGE:
             case CSS_VAL_XX_LARGE:
-            case CSS_VAL__KHTML_XXX_LARGE:
+            case CSS_VAL__WEBKIT_XXX_LARGE:
                 size = fontSizeForKeyword(primitiveValue->getIdent(), style->htmlHacks());
                 break;
             case CSS_VAL_LARGER:
@@ -2858,7 +2858,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
         HANDLE_INHERIT_AND_INITIAL(textAlign, TextAlign)
         if (!primitiveValue) return;
         if (primitiveValue->getIdent())
-            style->setTextAlign((ETextAlign) (primitiveValue->getIdent() - CSS_VAL__KHTML_AUTO));
+            style->setTextAlign((ETextAlign) (primitiveValue->getIdent() - CSS_VAL__WEBKIT_AUTO));
         return;
     }
 
@@ -2986,7 +2986,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
                 face = static_cast<FontFamilyValue *>(val)->fontName();
             else if (val->primitiveType() == CSSPrimitiveValue::CSS_IDENT) {
                 switch (val->getIdent()) {
-                    case CSS_VAL__KHTML_BODY:
+                    case CSS_VAL__WEBKIT_BODY:
                         face = settings->stdFontName();
                         break;
                     case CSS_VAL_SERIF:
@@ -3248,7 +3248,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
         break;
 
     // CSS3 Properties
-    case CSS_PROP__KHTML_APPEARANCE: {
+    case CSS_PROP__WEBKIT_APPEARANCE: {
         HANDLE_INHERIT_AND_INITIAL(appearance, Appearance)
         if (!primitiveValue) break;
         int id = primitiveValue->getIdent();
@@ -3259,7 +3259,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
             appearance = EAppearance(id - CSS_VAL_CHECKBOX + 1);
         style->setAppearance(appearance);
     }
-    case CSS_PROP__KHTML_BINDING: {
+    case CSS_PROP__WEBKIT_BINDING: {
 #ifndef KHTML_NO_XBL
         if (isInitial || (primitiveValue && primitiveValue->getIdent() == CSS_VAL_NONE)) {
             style->deleteBindingURIs();
@@ -3291,7 +3291,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
         break;
     }
 
-    case CSS_PROP_BORDER_IMAGE: {
+    case CSS_PROP__WEBKIT_BORDER_IMAGE: {
         HANDLE_INHERIT_AND_INITIAL(borderImage, BorderImage)
         BorderImage image;
         if (primitiveValue) {
@@ -3354,7 +3354,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
         break;
     }
 
-    case CSS_PROP_BORDER_RADIUS:
+    case CSS_PROP__WEBKIT_BORDER_RADIUS:
         if (isInherit) {
             style->setBorderTopLeftRadius(parentStyle->borderTopLeftRadius());
             style->setBorderTopRightRadius(parentStyle->borderTopRightRadius());
@@ -3367,23 +3367,23 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
             return;
         }
         // Fall through
-    case CSS_PROP_BORDER_TOP_LEFT_RADIUS:
-    case CSS_PROP_BORDER_TOP_RIGHT_RADIUS:
-    case CSS_PROP_BORDER_BOTTOM_LEFT_RADIUS:
-    case CSS_PROP_BORDER_BOTTOM_RIGHT_RADIUS: {
+    case CSS_PROP__WEBKIT_BORDER_TOP_LEFT_RADIUS:
+    case CSS_PROP__WEBKIT_BORDER_TOP_RIGHT_RADIUS:
+    case CSS_PROP__WEBKIT_BORDER_BOTTOM_LEFT_RADIUS:
+    case CSS_PROP__WEBKIT_BORDER_BOTTOM_RIGHT_RADIUS: {
         if (isInherit) {
-            HANDLE_INHERIT_COND(CSS_PROP_BORDER_TOP_LEFT_RADIUS, borderTopLeftRadius, BorderTopLeftRadius)
-            HANDLE_INHERIT_COND(CSS_PROP_BORDER_TOP_RIGHT_RADIUS, borderTopRightRadius, BorderTopRightRadius)
-            HANDLE_INHERIT_COND(CSS_PROP_BORDER_BOTTOM_LEFT_RADIUS, borderBottomLeftRadius, BorderBottomLeftRadius)
-            HANDLE_INHERIT_COND(CSS_PROP_BORDER_BOTTOM_RIGHT_RADIUS, borderBottomRightRadius, BorderBottomRightRadius)
+            HANDLE_INHERIT_COND(CSS_PROP__WEBKIT_BORDER_TOP_LEFT_RADIUS, borderTopLeftRadius, BorderTopLeftRadius)
+            HANDLE_INHERIT_COND(CSS_PROP__WEBKIT_BORDER_TOP_RIGHT_RADIUS, borderTopRightRadius, BorderTopRightRadius)
+            HANDLE_INHERIT_COND(CSS_PROP__WEBKIT_BORDER_BOTTOM_LEFT_RADIUS, borderBottomLeftRadius, BorderBottomLeftRadius)
+            HANDLE_INHERIT_COND(CSS_PROP__WEBKIT_BORDER_BOTTOM_RIGHT_RADIUS, borderBottomRightRadius, BorderBottomRightRadius)
             return;
         }
         
         if (isInitial) {
-            HANDLE_INITIAL_COND_WITH_VALUE(CSS_PROP_BORDER_TOP_LEFT_RADIUS, BorderTopLeftRadius, BorderRadius)
-            HANDLE_INITIAL_COND_WITH_VALUE(CSS_PROP_BORDER_TOP_RIGHT_RADIUS, BorderTopRightRadius, BorderRadius)
-            HANDLE_INITIAL_COND_WITH_VALUE(CSS_PROP_BORDER_BOTTOM_LEFT_RADIUS, BorderBottomLeftRadius, BorderRadius)
-            HANDLE_INITIAL_COND_WITH_VALUE(CSS_PROP_BORDER_BOTTOM_RIGHT_RADIUS, BorderBottomRightRadius, BorderRadius)
+            HANDLE_INITIAL_COND_WITH_VALUE(CSS_PROP__WEBKIT_BORDER_TOP_LEFT_RADIUS, BorderTopLeftRadius, BorderRadius)
+            HANDLE_INITIAL_COND_WITH_VALUE(CSS_PROP__WEBKIT_BORDER_TOP_RIGHT_RADIUS, BorderTopRightRadius, BorderRadius)
+            HANDLE_INITIAL_COND_WITH_VALUE(CSS_PROP__WEBKIT_BORDER_BOTTOM_LEFT_RADIUS, BorderBottomLeftRadius, BorderRadius)
+            HANDLE_INITIAL_COND_WITH_VALUE(CSS_PROP__WEBKIT_BORDER_BOTTOM_RIGHT_RADIUS, BorderBottomRightRadius, BorderRadius)
             return;
         }
 
@@ -3406,16 +3406,16 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
 
         IntSize size(width, height);
         switch (id) {
-            case CSS_PROP_BORDER_TOP_LEFT_RADIUS:
+            case CSS_PROP__WEBKIT_BORDER_TOP_LEFT_RADIUS:
                 style->setBorderTopLeftRadius(size);
                 break;
-            case CSS_PROP_BORDER_TOP_RIGHT_RADIUS:
+            case CSS_PROP__WEBKIT_BORDER_TOP_RIGHT_RADIUS:
                 style->setBorderTopRightRadius(size);
                 break;
-            case CSS_PROP_BORDER_BOTTOM_LEFT_RADIUS:
+            case CSS_PROP__WEBKIT_BORDER_BOTTOM_LEFT_RADIUS:
                 style->setBorderBottomLeftRadius(size);
                 break;
-            case CSS_PROP_BORDER_BOTTOM_RIGHT_RADIUS:
+            case CSS_PROP__WEBKIT_BORDER_BOTTOM_RIGHT_RADIUS:
                 style->setBorderBottomRightRadius(size);
                 break;
             default:
@@ -3468,7 +3468,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
         // Clamp opacity to the range 0-1
         style->setOpacity(min(1.0, max(0.0, primitiveValue->getFloatValue(CSSPrimitiveValue::CSS_NUMBER))));
         return;
-    case CSS_PROP__KHTML_BOX_ALIGN:
+    case CSS_PROP__WEBKIT_BOX_ALIGN:
         HANDLE_INHERIT_AND_INITIAL(boxAlign, BoxAlign)
         if (!primitiveValue) return;
         switch (primitiveValue->getIdent()) {
@@ -3491,7 +3491,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
                 return;
         }
         return;        
-    case CSS_PROP__KHTML_BOX_DIRECTION:
+    case CSS_PROP__WEBKIT_BOX_DIRECTION:
         HANDLE_INHERIT_AND_INITIAL(boxDirection, BoxDirection)
         if (!primitiveValue) return;
         if (primitiveValue->getIdent() == CSS_VAL_NORMAL)
@@ -3499,7 +3499,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
         else
             style->setBoxDirection(BREVERSE);
         return;        
-    case CSS_PROP__KHTML_BOX_LINES:
+    case CSS_PROP__WEBKIT_BOX_LINES:
         HANDLE_INHERIT_AND_INITIAL(boxLines, BoxLines)
         if(!primitiveValue) return;
         if (primitiveValue->getIdent() == CSS_VAL_SINGLE)
@@ -3507,7 +3507,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
         else
             style->setBoxLines(MULTIPLE);
         return;     
-    case CSS_PROP__KHTML_BOX_ORIENT:
+    case CSS_PROP__WEBKIT_BOX_ORIENT:
         HANDLE_INHERIT_AND_INITIAL(boxOrient, BoxOrient)
         if (!primitiveValue) return;
         if (primitiveValue->getIdent() == CSS_VAL_HORIZONTAL ||
@@ -3516,7 +3516,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
         else
             style->setBoxOrient(VERTICAL);
         return;     
-    case CSS_PROP__KHTML_BOX_PACK:
+    case CSS_PROP__WEBKIT_BOX_PACK:
         HANDLE_INHERIT_AND_INITIAL(boxPack, BoxPack)
         if (!primitiveValue) return;
         switch (primitiveValue->getIdent()) {
@@ -3536,19 +3536,19 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
                 return;
         }
         return;        
-    case CSS_PROP__KHTML_BOX_FLEX:
+    case CSS_PROP__WEBKIT_BOX_FLEX:
         HANDLE_INHERIT_AND_INITIAL(boxFlex, BoxFlex)
         if (!primitiveValue || primitiveValue->primitiveType() != CSSPrimitiveValue::CSS_NUMBER)
             return; // Error case.
         style->setBoxFlex(primitiveValue->getFloatValue(CSSPrimitiveValue::CSS_NUMBER));
         return;
-    case CSS_PROP__KHTML_BOX_FLEX_GROUP:
+    case CSS_PROP__WEBKIT_BOX_FLEX_GROUP:
         HANDLE_INHERIT_AND_INITIAL(boxFlexGroup, BoxFlexGroup)
         if (!primitiveValue || primitiveValue->primitiveType() != CSSPrimitiveValue::CSS_NUMBER)
             return; // Error case.
         style->setBoxFlexGroup((unsigned int)(primitiveValue->getFloatValue(CSSPrimitiveValue::CSS_NUMBER)));
         return;        
-    case CSS_PROP__KHTML_BOX_ORDINAL_GROUP:
+    case CSS_PROP__WEBKIT_BOX_ORDINAL_GROUP:
         HANDLE_INHERIT_AND_INITIAL(boxOrdinalGroup, BoxOrdinalGroup)
         if (!primitiveValue || primitiveValue->primitiveType() != CSSPrimitiveValue::CSS_NUMBER)
             return; // Error case.
@@ -3562,7 +3562,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
         else
             style->setBoxSizing(BORDER_BOX);
         break;
-    case CSS_PROP__KHTML_MARQUEE:
+    case CSS_PROP__WEBKIT_MARQUEE:
         if (valueType != CSSValue::CSS_INHERIT || !parentNode) return;
         style->setMarqueeDirection(parentStyle->marqueeDirection());
         style->setMarqueeIncrement(parentStyle->marqueeIncrement());
@@ -3570,7 +3570,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
         style->setMarqueeLoopCount(parentStyle->marqueeLoopCount());
         style->setMarqueeBehavior(parentStyle->marqueeBehavior());
         break;
-    case CSS_PROP__KHTML_MARQUEE_REPETITION: {
+    case CSS_PROP__WEBKIT_MARQUEE_REPETITION: {
         HANDLE_INHERIT_AND_INITIAL(marqueeLoopCount, MarqueeLoopCount)
         if (!primitiveValue) return;
         if (primitiveValue->getIdent() == CSS_VAL_INFINITE)
@@ -3579,7 +3579,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
             style->setMarqueeLoopCount((int)(primitiveValue->getFloatValue(CSSPrimitiveValue::CSS_NUMBER)));
         break;
     }
-    case CSS_PROP__KHTML_MARQUEE_SPEED: {
+    case CSS_PROP__WEBKIT_MARQUEE_SPEED: {
         HANDLE_INHERIT_AND_INITIAL(marqueeSpeed, MarqueeSpeed)      
         if (!primitiveValue) return;
         if (primitiveValue->getIdent()) {
@@ -3604,7 +3604,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
             style->setMarqueeSpeed(int(primitiveValue->getFloatValue(CSSPrimitiveValue::CSS_NUMBER)));
         break;
     }
-    case CSS_PROP__KHTML_MARQUEE_INCREMENT: {
+    case CSS_PROP__WEBKIT_MARQUEE_INCREMENT: {
         HANDLE_INHERIT_AND_INITIAL(marqueeIncrement, MarqueeIncrement)
         if (!primitiveValue) return;
         if (primitiveValue->getIdent()) {
@@ -3629,7 +3629,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
         }
         break;
     }
-    case CSS_PROP__KHTML_MARQUEE_STYLE: {
+    case CSS_PROP__WEBKIT_MARQUEE_STYLE: {
         HANDLE_INHERIT_AND_INITIAL(marqueeBehavior, MarqueeBehavior)      
         if (!primitiveValue || !primitiveValue->getIdent()) return;
         switch (primitiveValue->getIdent())
@@ -3652,7 +3652,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
         }
         break;
     }
-    case CSS_PROP__KHTML_MARQUEE_DIRECTION: {
+    case CSS_PROP__WEBKIT_MARQUEE_DIRECTION: {
         HANDLE_INHERIT_AND_INITIAL(marqueeDirection, MarqueeDirection)
         if (!primitiveValue || !primitiveValue->getIdent()) return;
         switch (primitiveValue->getIdent())
@@ -3683,7 +3683,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
         }
         break;
     }
-    case CSS_PROP__KHTML_USER_DRAG: {
+    case CSS_PROP__WEBKIT_USER_DRAG: {
         HANDLE_INHERIT_AND_INITIAL(userDrag, UserDrag)      
         if (!primitiveValue || !primitiveValue->getIdent())
             return;
@@ -3701,7 +3701,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
         }
         break;
     }
-    case CSS_PROP__KHTML_USER_MODIFY: {
+    case CSS_PROP__WEBKIT_USER_MODIFY: {
         HANDLE_INHERIT_AND_INITIAL(userModify, UserModify)      
         if (!primitiveValue || !primitiveValue->getIdent())
             return;
@@ -3709,7 +3709,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
         style->setUserModify(userModify);
         break;
     }
-    case CSS_PROP__KHTML_USER_SELECT: {
+    case CSS_PROP__WEBKIT_USER_SELECT: {
         HANDLE_INHERIT_AND_INITIAL(userSelect, UserSelect)      
         if (!primitiveValue || !primitiveValue->getIdent())
             return;
@@ -3731,7 +3731,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
         break;
     }
     case CSS_PROP_TEXT_OVERFLOW: {
-        // This property is supported by WinIE, and so we leave off the "-khtml-" in order to
+        // This property is supported by WinIE, and so we leave off the "-webkit-" in order to
         // work with WinIE-specific pages that use the property.
         HANDLE_INHERIT_AND_INITIAL(textOverflow, TextOverflow)
         if (!primitiveValue || !primitiveValue->getIdent())
@@ -3739,7 +3739,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
         style->setTextOverflow(primitiveValue->getIdent() == CSS_VAL_ELLIPSIS);
         break;
     }
-    case CSS_PROP__KHTML_MARGIN_COLLAPSE: {
+    case CSS_PROP__WEBKIT_MARGIN_COLLAPSE: {
         if (isInherit) {
             style->setMarginTopCollapse(parentStyle->marginTopCollapse());
             style->setMarginBottomCollapse(parentStyle->marginBottomCollapse());
@@ -3750,7 +3750,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
         }
         break;
     }
-    case CSS_PROP__KHTML_MARGIN_TOP_COLLAPSE: {
+    case CSS_PROP__WEBKIT_MARGIN_TOP_COLLAPSE: {
         HANDLE_INHERIT_AND_INITIAL(marginTopCollapse, MarginTopCollapse)
         if (!primitiveValue || !primitiveValue->getIdent()) return;
         EMarginCollapse val;
@@ -3767,7 +3767,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
         style->setMarginTopCollapse(val);
         break;
     }
-    case CSS_PROP__KHTML_MARGIN_BOTTOM_COLLAPSE: {
+    case CSS_PROP__WEBKIT_MARGIN_BOTTOM_COLLAPSE: {
         HANDLE_INHERIT_AND_INITIAL(marginBottomCollapse, MarginBottomCollapse)
         if (!primitiveValue || !primitiveValue->getIdent()) return;
         EMarginCollapse val;
@@ -3786,13 +3786,13 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
     }
 
     // Apple-specific changes.  Do not merge these properties into KHTML.
-    case CSS_PROP__KHTML_LINE_CLAMP: {
+    case CSS_PROP__WEBKIT_LINE_CLAMP: {
         HANDLE_INHERIT_AND_INITIAL(lineClamp, LineClamp)
         if (!primitiveValue) return;
         style->setLineClamp((int)primitiveValue->getFloatValue(CSSPrimitiveValue::CSS_PERCENTAGE));
         break;
     }
-    case CSS_PROP__KHTML_TEXT_SIZE_ADJUST: {
+    case CSS_PROP__WEBKIT_TEXT_SIZE_ADJUST: {
         HANDLE_INHERIT_AND_INITIAL(textSizeAdjust, TextSizeAdjust)
         if (!primitiveValue || !primitiveValue->getIdent()) return;
         style->setTextSizeAdjust(primitiveValue->getIdent() == CSS_VAL_AUTO);
@@ -3800,7 +3800,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
         break;
     }
 #if __APPLE__
-    case CSS_PROP__KHTML_DASHBOARD_REGION: {
+    case CSS_PROP__WEBKIT_DASHBOARD_REGION: {
         HANDLE_INHERIT_AND_INITIAL(dashboardRegions, DashboardRegions)
         if (!primitiveValue)
             return;
@@ -3832,7 +3832,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
         break;
     }
 #endif
-    case CSS_PROP__KHTML_RTL_ORDERING:
+    case CSS_PROP__WEBKIT_RTL_ORDERING:
         HANDLE_INHERIT_AND_INITIAL(visuallyOrdered, VisuallyOrdered)
         if (!primitiveValue || !primitiveValue->getIdent())
             return;
@@ -4217,9 +4217,9 @@ Color CSSStyleSelector::getColorFromPrimitiveValue(CSSPrimitiveValue* primitiveV
     Color col;
     int ident = primitiveValue->getIdent();
     if (ident) {
-        if (ident == CSS_VAL__KHTML_TEXT)
+        if (ident == CSS_VAL__WEBKIT_TEXT)
             col = element->document()->textColor();
-        else if (ident == CSS_VAL__KHTML_LINK) {
+        else if (ident == CSS_VAL__WEBKIT_LINK) {
             Color linkColor = element->document()->linkColor();
             Color visitedColor = element->document()->visitedLinkColor();
             if (linkColor == visitedColor)
@@ -4229,9 +4229,9 @@ Color CSSStyleSelector::getColorFromPrimitiveValue(CSSPrimitiveValue* primitiveV
                     checkPseudoState(element);
                 col = (pseudoState == PseudoLink) ? linkColor : visitedColor;
             }
-        } else if (ident == CSS_VAL__KHTML_ACTIVELINK)
+        } else if (ident == CSS_VAL__WEBKIT_ACTIVELINK)
             col = element->document()->activeLinkColor();
-        else if (ident == CSS_VAL__KHTML_FOCUS_RING_COLOR)
+        else if (ident == CSS_VAL__WEBKIT_FOCUS_RING_COLOR)
             col = focusRingColor();
         else
             col = colorForCSSValue(ident);
index 4ec9652..027a806 100644 (file)
@@ -108,7 +108,7 @@ class StyledElement;
         } encodedurl;
         void setEncodedURL(const KURL& url);
         
-        // Given a CSS keyword in the range (xx-small to -khtml-xxx-large), this function will return
+        // Given a CSS keyword in the range (xx-small to -webkit-xxx-large), this function will return
         // the correct font size scaled relative to the user's default (medium).
         float fontSizeForKeyword(int keyword, bool quirksMode) const;
         
index 3511e10..fa8ac19 100644 (file)
@@ -74,7 +74,7 @@ layer {
 
 marquee {
     display: inline-block;
-    overflow: marquee
+    overflow: -webkit-marquee
 }
 
 address {
@@ -103,7 +103,7 @@ q:after {
 center {
     display: block;
     /* special centering to be able to emulate the html4/netscape behaviour */
-    text-align: -khtml-center
+    text-align: -webkit-center
 }
 
 hr {
@@ -165,7 +165,7 @@ h6 {
 table {
     display: table;
     border-collapse: separate;
-    text-align: -khtml-auto;
+    text-align: -webkit-auto;
     border-spacing: 2px;
     border-color: gray
 }
@@ -218,7 +218,7 @@ th {
 
 caption {
     display: table-caption;
-    text-align: -khtml-center
+    text-align: -webkit-center
 }
 
 /* lists */
@@ -227,14 +227,14 @@ ul, menu, dir {
     display: block;
     list-style-type: disc;
     margin: 1__qem 0 1em 0;
-    -khtml-padding-start: 40px
+    -webkit-padding-start: 40px
 }
 
 ol {
     display: block;
     list-style-type: decimal;
     margin: 1__qem 0 1em 0;
-    -khtml-padding-start: 40px
+    -webkit-padding-start: 40px
 }
 
 li {
@@ -251,7 +251,7 @@ ol ol ul, ol ul ul, ul ol ul, ul ul ul {
 
 dd {
     display: block;
-    -khtml-margin-start: 40px
+    -webkit-margin-start: 40px
 }
 
 dl {
@@ -291,7 +291,7 @@ fieldset {
 }
 
 button {
-    -khtml-appearance: button;
+    -webkit-appearance: button;
 }
 
 /* If we add support for CSS2 system fonts, then we won't have to hard code Lucida Grande here. */
@@ -299,7 +299,7 @@ input, textarea, select, button {
     margin: 0__qem;
     font: 11px 'Lucida Grande';
     color: initial;
-    text-align: -khtml-auto;
+    text-align: -webkit-auto;
     letter-spacing: normal;
     word-spacing: normal;
     line-height: normal;
@@ -314,28 +314,28 @@ input[type="hidden"] {
 }
 
 input {
-    -khtml-appearance: textfield;
+    -webkit-appearance: textfield;
     padding: 1px;
     background-color: white;
     border: 2px inset;
-    -khtml-rtl-ordering: logical;
+    -webkit-rtl-ordering: logical;
 }
 
 input[type="password"], input[type="search"], input[type="hidden"], input[type="image"], input[type="file"] {
-    -khtml-appearance: initial;
+    -webkit-appearance: initial;
     padding: initial;
     background-color: initial;
     border: initial;
 }
 
-input:-khtml-autofill {
+input:-webkit-autofill {
     background-color: #FAFFBD !important;
     background-image:none !important;
 }
 
 input[type="radio"], input[type="checkbox"] {
     margin: 3px 0.5ex;
-    -khtml-user-select: ignore
+    -webkit-user-select: ignore
     padding: initial;
     background-color: initial;
     border: initial;
@@ -343,12 +343,12 @@ input[type="radio"], input[type="checkbox"] {
 
 input[type="button"], input[type="submit"], input[type="reset"]
 {
-    -khtml-appearance: push-button;
+    -webkit-appearance: push-button;
     white-space: pre
 }
 
 input[type="button"], input[type="submit"], input[type="reset"], button {
-    -khtml-box-align: center;
+    -webkit-box-align: center;
     text-align: center;
     cursor: default;
     color: ButtonText;
@@ -370,7 +370,7 @@ input[type="button"]:active:disabled, input[type="submit"]:active:disabled, inpu
 }
 
 select, button, input[type="button"], input[type="image"], input[type="submit"], input[type="reset"], img {
-    -khtml-user-select: ignore
+    -webkit-user-select: ignore
 }
 
 option, optgroup, area, param {
@@ -378,11 +378,11 @@ option, optgroup, area, param {
 }
 
 input[type="checkbox"] {
-    -khtml-appearance: checkbox
+    -webkit-appearance: checkbox
 }
 
 input[type="radio"] {
-    -khtml-appearance: radio
+    -webkit-appearance: radio
 }
 
 /* inline elements */
@@ -443,7 +443,7 @@ wbr {
 /* states */
 
 :focus { 
-    outline: auto 5px -khtml-focus-ring-color
+    outline: auto 5px -webkit-focus-ring-color
 }
 
 html:focus, body:focus { 
@@ -471,14 +471,14 @@ input[type="submit"]:focus {
     outline-offset: 0
 }
 
-a:-khtml-any-link {
-    color: -khtml-link;
+a:-webkit-any-link {
+    color: -webkit-link;
     text-decoration: underline;
-    -khtml-user-select: ignore
+    -webkit-user-select: ignore
 }
 
-a:-khtml-any-link:active {
-    color: -khtml-activelink
+a:-webkit-any-link:active {
+    color: -webkit-activelink
 }
 
 /* other elements */
index 1f06ee7..e9747a8 100644 (file)
@@ -38,5 +38,5 @@ table {
     font-size: medium;
     font-variant: normal;
     font-style: normal;
-    color: -khtml-text;
+    color: -webkit-text;
 }
index b051784..5b1c74b 100644 (file)
@@ -46,9 +46,9 @@ range           \?{1,6}|{h}(\?{0,5}|{h}(\?{0,4}|{h}(\?{0,3}|{h}(\?{0,2}|{h}(\??|
 "@font-face"            {yyTok = FONT_FACE_SYM; return yyTok;}
 "@charset"              {yyTok = CHARSET_SYM; return yyTok;}
 "@namespace"            {yyTok = NAMESPACE_SYM; return yyTok; }
-"@-khtml-rule"    {yyTok = KHTML_RULE_SYM; return yyTok; }
-"@-khtml-decls"   {yyTok = KHTML_DECLS_SYM; return yyTok; }
-"@-khtml-value"   {yyTok = KHTML_VALUE_SYM; return yyTok; }
+"@-webkit-rule"    {yyTok = WEBKIT_RULE_SYM; return yyTok; }
+"@-webkit-decls"   {yyTok = WEBKIT_DECLS_SYM; return yyTok; }
+"@-webkit-value"   {yyTok = WEBKIT_VALUE_SYM; return yyTok; }
 
 "!"{w}"important"         {yyTok = IMPORTANT_SYM; return yyTok;}
 
index 22c1014..a90b37f 100644 (file)
@@ -114,7 +114,7 @@ void StyleChange::init(PassRefPtr<CSSStyleDeclaration> style, const Position &po
 
         // Add this property
 
-        if (property->id() == CSS_PROP__KHTML_TEXT_DECORATIONS_IN_EFFECT) {
+        if (property->id() == CSS_PROP__WEBKIT_TEXT_DECORATIONS_IN_EFFECT) {
             // we have to special-case text decorations
             CSSProperty alteredProperty = CSSProperty(CSS_PROP_TEXT_DECORATION, property->value(), property->isImportant());
             styleText += alteredProperty.cssText();
@@ -409,12 +409,12 @@ void ApplyStyleCommand::applyRelativeFontStyleChange(CSSMutableStyleDeclaration
     RefPtr<CSSValue> value = style->getPropertyCSSValue(CSS_PROP_FONT_SIZE);
     if (value) {
         // Explicit font size overrides any delta.
-        style->removeProperty(CSS_PROP__KHTML_FONT_SIZE_DELTA);
+        style->removeProperty(CSS_PROP__WEBKIT_FONT_SIZE_DELTA);
         return;
     }
 
     // Get the adjustment amount out of the style.
-    value = style->getPropertyCSSValue(CSS_PROP__KHTML_FONT_SIZE_DELTA);
+    value = style->getPropertyCSSValue(CSS_PROP__WEBKIT_FONT_SIZE_DELTA);
     if (!value)
         return;
     float adjustment = NoFontDelta;
@@ -426,7 +426,7 @@ void ApplyStyleCommand::applyRelativeFontStyleChange(CSSMutableStyleDeclaration
             adjustment = primitiveValue->getFloatValue(CSSPrimitiveValue::CSS_PX);
         }
     }
-    style->removeProperty(CSS_PROP__KHTML_FONT_SIZE_DELTA);
+    style->removeProperty(CSS_PROP__WEBKIT_FONT_SIZE_DELTA);
     if (adjustment == NoFontDelta)
         return;
     
@@ -874,12 +874,12 @@ void ApplyStyleCommand::removeInlineStyle(PassRefPtr<CSSMutableStyleDeclaration>
     ASSERT(end.node()->inDocument());
     ASSERT(Range::compareBoundaryPoints(start, end) <= 0);
     
-    RefPtr<CSSValue> textDecorationSpecialProperty = style->getPropertyCSSValue(CSS_PROP__KHTML_TEXT_DECORATIONS_IN_EFFECT);
+    RefPtr<CSSValue> textDecorationSpecialProperty = style->getPropertyCSSValue(CSS_PROP__WEBKIT_TEXT_DECORATIONS_IN_EFFECT);
 
     if (textDecorationSpecialProperty) {
         pushDownTextDecorationStyleAtBoundaries(start.downstream(), end.upstream());
         style = style->copy();
-        style->setProperty(CSS_PROP_TEXT_DECORATION, textDecorationSpecialProperty->cssText(), style->getPropertyPriority(CSS_PROP__KHTML_TEXT_DECORATIONS_IN_EFFECT));
+        style->setProperty(CSS_PROP_TEXT_DECORATION, textDecorationSpecialProperty->cssText(), style->getPropertyPriority(CSS_PROP__WEBKIT_TEXT_DECORATIONS_IN_EFFECT));
     }
 
     // The s and e variables store the positions used to set the ending selection after style removal
index 26c054c..b0517e8 100644 (file)
@@ -722,7 +722,7 @@ PassRefPtr<Element> createBlockPlaceholderElement(Document* document)
 
 static const String &blockPlaceholderClassString()
 {
-    static String blockPlaceholderClassString = "khtml-block-placeholder";
+    static String blockPlaceholderClassString = "webkit-block-placeholder";
     return blockPlaceholderClassString;
 }
 
index 60f0ac0..83e7ab2 100644 (file)
@@ -244,7 +244,7 @@ bool execFontSize(Frame *frame, bool userInterface, const String &value)
 
 bool execFontSizeDelta(Frame *frame, bool userInterface, const String &value)
 {
-    return execStyleChange(frame,  CSS_PROP__KHTML_FONT_SIZE_DELTA, value);
+    return execStyleChange(frame,  CSS_PROP__WEBKIT_FONT_SIZE_DELTA, value);
 }
 
 bool execForeColor(Frame *frame, bool userInterface, const String &value)
@@ -388,8 +388,8 @@ bool execSelectAll(Frame *frame, bool userInterface, const String &value)
 
 bool execStrikethrough(Frame *frame, bool userInterface, const String &value)
 {
-    bool isStrikethrough = selectionStartHasStyle(frame,  CSS_PROP__KHTML_TEXT_DECORATIONS_IN_EFFECT, "line-through");
-    return execStyleChange(frame,  CSS_PROP__KHTML_TEXT_DECORATIONS_IN_EFFECT, isStrikethrough ? "none" : "line-through");
+    bool isStrikethrough = selectionStartHasStyle(frame,  CSS_PROP__WEBKIT_TEXT_DECORATIONS_IN_EFFECT, "line-through");
+    return execStyleChange(frame,  CSS_PROP__WEBKIT_TEXT_DECORATIONS_IN_EFFECT, isStrikethrough ? "none" : "line-through");
 }
 
 bool execSubscript(Frame *frame, bool userInterface, const String &value)
@@ -410,8 +410,8 @@ bool execTranspose(Frame *frame, bool userInterface, const String &value)
 
 bool execUnderline(Frame *frame, bool userInterface, const String &value)
 {
-    bool isUnderlined = selectionStartHasStyle(frame,  CSS_PROP__KHTML_TEXT_DECORATIONS_IN_EFFECT, "underline");
-    return execStyleChange(frame,  CSS_PROP__KHTML_TEXT_DECORATIONS_IN_EFFECT, isUnderlined ? "none" : "underline");
+    bool isUnderlined = selectionStartHasStyle(frame,  CSS_PROP__WEBKIT_TEXT_DECORATIONS_IN_EFFECT, "underline");
+    return execStyleChange(frame,  CSS_PROP__WEBKIT_TEXT_DECORATIONS_IN_EFFECT, isUnderlined ? "none" : "underline");
 }
 
 bool execUndo(Frame *frame, bool userInterface, const String &value)
@@ -582,7 +582,7 @@ String valueFontSize(Frame *frame)
 
 String valueFontSizeDelta(Frame *frame)
 {
-    return valueStyle(frame,  CSS_PROP__KHTML_FONT_SIZE_DELTA);
+    return valueStyle(frame,  CSS_PROP__WEBKIT_FONT_SIZE_DELTA);
 }
 
 String valueForeColor(Frame *frame)
index 1d3f97d..3a8cb58 100644 (file)
@@ -302,7 +302,7 @@ void ReplaceSelectionCommand::fixupNodeStyles(const NodeVector& nodes, const Ren
 
         // Check for the special "match nearest blockquote color" property and resolve to the correct
         // color if necessary.
-        String matchColorCheck = desiredStyle->getPropertyValue(CSS_PROP__KHTML_MATCH_NEAREST_MAIL_BLOCKQUOTE_COLOR);
+        String matchColorCheck = desiredStyle->getPropertyValue(CSS_PROP__WEBKIT_MATCH_NEAREST_MAIL_BLOCKQUOTE_COLOR);
         if (matchColorCheck == matchNearestBlockquoteColorString()) {
             Node *blockquote = nearestMailBlockquote(node);
             Position pos(blockquote ? blockquote : node->document()->documentElement(), 0);
@@ -312,7 +312,7 @@ void ReplaceSelectionCommand::fixupNodeStyles(const NodeVector& nodes, const Ren
             if (desiredColor != nearestColor)
                 desiredStyle->setProperty(CSS_PROP_COLOR, nearestColor);
         }
-        desiredStyle->removeProperty(CSS_PROP__KHTML_MATCH_NEAREST_MAIL_BLOCKQUOTE_COLOR);
+        desiredStyle->removeProperty(CSS_PROP__WEBKIT_MATCH_NEAREST_MAIL_BLOCKQUOTE_COLOR);
 
         currentStyle->diff(desiredStyle);
         
@@ -343,7 +343,7 @@ static PassRefPtr<CSSMutableStyleDeclaration> styleForNode(Node *node)
         RefPtr<CSSComputedStyleDeclaration> blockquoteStyle = Position(blockquote, 0).computedStyle();
         bool match = (blockquoteStyle->getPropertyValue(CSS_PROP_COLOR) == style->getPropertyValue(CSS_PROP_COLOR));
         if (match) {
-            style->setProperty(CSS_PROP__KHTML_MATCH_NEAREST_MAIL_BLOCKQUOTE_COLOR, matchNearestBlockquoteColorString());
+            style->setProperty(CSS_PROP__WEBKIT_MATCH_NEAREST_MAIL_BLOCKQUOTE_COLOR, matchNearestBlockquoteColorString());
             return style.release();
         }
     }
@@ -351,7 +351,7 @@ static PassRefPtr<CSSMutableStyleDeclaration> styleForNode(Node *node)
     RefPtr<CSSComputedStyleDeclaration> documentStyle = Position(documentElement, 0).computedStyle();
     bool match = (documentStyle->getPropertyValue(CSS_PROP_COLOR) == style->getPropertyValue(CSS_PROP_COLOR));
     if (match)
-        style->setProperty(CSS_PROP__KHTML_MATCH_NEAREST_MAIL_BLOCKQUOTE_COLOR, matchNearestBlockquoteColorString());
+        style->setProperty(CSS_PROP__WEBKIT_MATCH_NEAREST_MAIL_BLOCKQUOTE_COLOR, matchNearestBlockquoteColorString());
         
     return style.release();
 }
index 815c285..2c7589e 100644 (file)
@@ -162,7 +162,7 @@ void rebalanceWhitespaceInTextNode(Node *node, unsigned int start, unsigned int
     
     // The sequence should alternate between spaces and nbsps, always ending in a regular space.
     // Note: This pattern doesn't mimic TextEdit editing behavior on other clients that don't
-    // support our -khtml-nbsp-mode: space, but it comes close.
+    // support our -webkit-nbsp-mode: space, but it comes close.
     static DeprecatedString pattern("\xa0 ");
     int end = length - 1; 
     int i = substring.findRev(twoSpaces, end);
index d5ab5a6..963494d 100644 (file)
@@ -414,7 +414,7 @@ void HTMLElement::addHTMLAlignment(MappedAttribute* attr)
     } else if (equalIgnoringCase(alignment, "top")) {
         propvalign = CSS_VAL_TOP;
     } else if (equalIgnoringCase(alignment, "middle")) {
-        propvalign = CSS_VAL__KHTML_BASELINE_MIDDLE;
+        propvalign = CSS_VAL__WEBKIT_BASELINE_MIDDLE;
     } else if (equalIgnoringCase(alignment, "center")) {
         propvalign = CSS_VAL_MIDDLE;
     } else if (equalIgnoringCase(alignment, "bottom")) {
@@ -475,25 +475,25 @@ void HTMLElement::setContentEditable(MappedAttribute* attr)
 {
     const AtomicString& enabled = attr->value();
     if (enabled.isEmpty() || equalIgnoringCase(enabled, "true")) {
-        addCSSProperty(attr, CSS_PROP__KHTML_USER_MODIFY, CSS_VAL_READ_WRITE);
+        addCSSProperty(attr, CSS_PROP__WEBKIT_USER_MODIFY, CSS_VAL_READ_WRITE);
         addCSSProperty(attr, CSS_PROP_WORD_WRAP, CSS_VAL_BREAK_WORD);
-        addCSSProperty(attr, CSS_PROP__KHTML_NBSP_MODE, CSS_VAL_SPACE);
-        addCSSProperty(attr, CSS_PROP__KHTML_LINE_BREAK, CSS_VAL_AFTER_WHITE_SPACE);
+        addCSSProperty(attr, CSS_PROP__WEBKIT_NBSP_MODE, CSS_VAL_SPACE);
+        addCSSProperty(attr, CSS_PROP__WEBKIT_LINE_BREAK, CSS_VAL_AFTER_WHITE_SPACE);
     } else if (equalIgnoringCase(enabled, "false")) {
-        addCSSProperty(attr, CSS_PROP__KHTML_USER_MODIFY, CSS_VAL_READ_ONLY);
+        addCSSProperty(attr, CSS_PROP__WEBKIT_USER_MODIFY, CSS_VAL_READ_ONLY);
         attr->decl()->removeProperty(CSS_PROP_WORD_WRAP, false);
-        attr->decl()->removeProperty(CSS_PROP__KHTML_NBSP_MODE, false);
-        attr->decl()->removeProperty(CSS_PROP__KHTML_LINE_BREAK, false);
+        attr->decl()->removeProperty(CSS_PROP__WEBKIT_NBSP_MODE, false);
+        attr->decl()->removeProperty(CSS_PROP__WEBKIT_LINE_BREAK, false);
     } else if (equalIgnoringCase(enabled, "inherit")) {
-        addCSSProperty(attr, CSS_PROP__KHTML_USER_MODIFY, CSS_VAL_INHERIT);
+        addCSSProperty(attr, CSS_PROP__WEBKIT_USER_MODIFY, CSS_VAL_INHERIT);
         attr->decl()->removeProperty(CSS_PROP_WORD_WRAP, false);
-        attr->decl()->removeProperty(CSS_PROP__KHTML_NBSP_MODE, false);
-        attr->decl()->removeProperty(CSS_PROP__KHTML_LINE_BREAK, false);
+        attr->decl()->removeProperty(CSS_PROP__WEBKIT_NBSP_MODE, false);
+        attr->decl()->removeProperty(CSS_PROP__WEBKIT_LINE_BREAK, false);
     } else if (equalIgnoringCase(enabled, "plaintext-only")) {
-        addCSSProperty(attr, CSS_PROP__KHTML_USER_MODIFY, CSS_VAL_READ_WRITE_PLAINTEXT_ONLY);
+        addCSSProperty(attr, CSS_PROP__WEBKIT_USER_MODIFY, CSS_VAL_READ_WRITE_PLAINTEXT_ONLY);
         addCSSProperty(attr, CSS_PROP_WORD_WRAP, CSS_VAL_BREAK_WORD);
-        addCSSProperty(attr, CSS_PROP__KHTML_NBSP_MODE, CSS_VAL_SPACE);
-        addCSSProperty(attr, CSS_PROP__KHTML_LINE_BREAK, CSS_VAL_AFTER_WHITE_SPACE);
+        addCSSProperty(attr, CSS_PROP__WEBKIT_NBSP_MODE, CSS_VAL_SPACE);
+        addCSSProperty(attr, CSS_PROP__WEBKIT_LINE_BREAK, CSS_VAL_AFTER_WHITE_SPACE);
     }
 }
 
index 25faa1e..85d7177 100644 (file)
@@ -79,11 +79,11 @@ void HTMLDivElement::parseMappedAttribute(MappedAttribute *attr)
     if (attr->name() == alignAttr) {
         String v = attr->value();
         if (equalIgnoringCase(attr->value(), "middle") || equalIgnoringCase(attr->value(), "center"))
-           addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_CENTER);
+           addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__WEBKIT_CENTER);
         else if (equalIgnoringCase(attr->value(), "left"))
-            addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_LEFT);
+            addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__WEBKIT_LEFT);
         else if (equalIgnoringCase(attr->value(), "right"))
-            addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_RIGHT);
+            addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__WEBKIT_RIGHT);
         else
             addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, v);
     } else
@@ -262,11 +262,11 @@ void HTMLParagraphElement::parseMappedAttribute(MappedAttribute *attr)
     if (attr->name() == alignAttr) {
         String v = attr->value();
         if (equalIgnoringCase(attr->value(), "middle") || equalIgnoringCase(attr->value(), "center"))
-            addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_CENTER);
+            addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__WEBKIT_CENTER);
         else if (equalIgnoringCase(attr->value(), "left"))
-            addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_LEFT);
+            addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__WEBKIT_LEFT);
         else if (equalIgnoringCase(attr->value(), "right"))
-            addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_RIGHT);
+            addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__WEBKIT_RIGHT);
         else
             addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, v);
     } else
@@ -386,23 +386,23 @@ void HTMLMarqueeElement::parseMappedAttribute(MappedAttribute *attr)
         }
     } else if (attr->name() == scrollamountAttr) {
         if (!attr->value().isEmpty())
-            addCSSLength(attr, CSS_PROP__KHTML_MARQUEE_INCREMENT, attr->value());
+            addCSSLength(attr, CSS_PROP__WEBKIT_MARQUEE_INCREMENT, attr->value());
     } else if (attr->name() == scrolldelayAttr) {
         if (!attr->value().isEmpty())
-            addCSSLength(attr, CSS_PROP__KHTML_MARQUEE_SPEED, attr->value());
+            addCSSLength(attr, CSS_PROP__WEBKIT_MARQUEE_SPEED, attr->value());
     } else if (attr->name() == loopAttr) {
         if (!attr->value().isEmpty()) {
             if (attr->value() == "-1" || equalIgnoringCase(attr->value(), "infinite"))
-                addCSSProperty(attr, CSS_PROP__KHTML_MARQUEE_REPETITION, CSS_VAL_INFINITE);
+                addCSSProperty(attr, CSS_PROP__WEBKIT_MARQUEE_REPETITION, CSS_VAL_INFINITE);
             else
-                addCSSLength(attr, CSS_PROP__KHTML_MARQUEE_REPETITION, attr->value());
+                addCSSLength(attr, CSS_PROP__WEBKIT_MARQUEE_REPETITION, attr->value());
         }
     } else if (attr->name() == behaviorAttr) {
         if (!attr->value().isEmpty())
-            addCSSProperty(attr, CSS_PROP__KHTML_MARQUEE_STYLE, attr->value());
+            addCSSProperty(attr, CSS_PROP__WEBKIT_MARQUEE_STYLE, attr->value());
     } else if (attr->name() == directionAttr) {
         if (!attr->value().isEmpty())
-            addCSSProperty(attr, CSS_PROP__KHTML_MARQUEE_DIRECTION, attr->value());
+            addCSSProperty(attr, CSS_PROP__WEBKIT_MARQUEE_DIRECTION, attr->value());
     } else if (attr->name() == truespeedAttr) {
         m_minimumDelay = !attr->isNull() ? 0 : defaultMinimumDelay;
     } else
index 7b4859a..045620f 100644 (file)
@@ -474,7 +474,7 @@ void HTMLFontElement::parseMappedAttribute(MappedAttribute *attr)
             case 6: size = CSS_VAL_XX_LARGE; break;
             default:
                 if (num > 6)
-                    size = CSS_VAL__KHTML_XXX_LARGE;
+                    size = CSS_VAL__WEBKIT_XXX_LARGE;
                 else
                     size = CSS_VAL_X_SMALL;
             }
index ce87d76..ef4ad94 100644 (file)
@@ -668,13 +668,13 @@ void HTMLTablePartElement::parseMappedAttribute(MappedAttribute *attr)
     } else if (attr->name() == alignAttr) {
         const AtomicString& v = attr->value();
         if (equalIgnoringCase(v, "middle") || equalIgnoringCase(v, "center"))
-            addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_CENTER);
+            addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__WEBKIT_CENTER);
         else if (equalIgnoringCase(v, "absmiddle"))
             addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL_CENTER);
         else if (equalIgnoringCase(v, "left"))
-            addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_LEFT);
+            addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__WEBKIT_LEFT);
         else if (equalIgnoringCase(v, "right"))
-            addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_RIGHT);
+            addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__WEBKIT_RIGHT);
         else
             addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, v);
     } else if (attr->name() == heightAttr) {
@@ -1047,7 +1047,7 @@ void HTMLTableCellElement::parseMappedAttribute(MappedAttribute *attr)
             static_cast<RenderTableCell*>(renderer())->updateFromElement();
     } else if (attr->name() == nowrapAttr) {
         if (!attr->isNull())
-            addCSSProperty(attr, CSS_PROP_WHITE_SPACE, CSS_VAL__KHTML_NOWRAP);
+            addCSSProperty(attr, CSS_PROP_WHITE_SPACE, CSS_VAL__WEBKIT_NOWRAP);
     } else if (attr->name() == widthAttr) {
         if (!attr->value().isEmpty()) {
             int widthInt = attr->value().toInt();
index eee0d2c..4833fed 100644 (file)
@@ -2980,7 +2980,7 @@ bool Frame::canMouseDownStartSelect(Node* node)
     if (!node || !node->renderer())
         return true;
     
-    // Check to see if khtml-user-select has been set to none
+    // Check to see if -webkit-user-select has been set to none
     if (!node->renderer()->canSelect())
         return false;
     
index ffb586c..a041221 100644 (file)
@@ -144,7 +144,7 @@ public:
   KJS::JSValue* executeScript(Node*, const DeprecatedString& script, bool forceUserGesture = false);
 
   /**
-   * Implementation of CSS property -khtml-user-drag == auto
+   * Implementation of CSS property -webkit-user-drag == auto
    */
   virtual bool shouldDragAutoNode(Node*, const IntPoint&) const;
   
index 0767947..d36d981 100644 (file)
@@ -1645,7 +1645,7 @@ Node* RenderObject::draggableNode(bool dhtmlOK, bool uaOK, int x, int y, bool& d
     while (curr) {
         Node *elt = curr->element();
         if (elt && elt->nodeType() == Node::TEXT_NODE) {
-            // Since there's no way for the author to address the -khtml-user-drag style for a text node,
+            // Since there's no way for the author to address the -webkit-user-drag style for a text node,
             // we use our own judgement.
             if (uaOK && canvas()->view()->frame()->shouldDragAutoNode(curr->node(), IntPoint(x, y))) {
                 dhtmlWillDrag = false;