Changeset 18676 in webkit

Timestamp:

Jan 8, 2007 11:55:56 AM (17 years ago)

Author:

weinig

Message:

Reviewed by Darin.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=12162 The inheritableProperties array is duplicated

No test possible (no change to functionality).

• css/CSSComputedStyleDeclaration.cpp: (WebCore::CSSComputedStyleDeclaration::removeComputedInheritablePropertiesFrom): Added. Removes the inheritable properties that CSSComputedStyleDeclaration knows how to compute from the given mutable declaration.
• css/CSSComputedStyleDeclaration.h:
• css/CSSMutableStyleDeclaration.cpp: Removed one copy of the inheritableProperties array.
• css/CSSMutableStyleDeclaration.h:
• editing/ReplaceSelectionCommand.cpp: (WebCore::ReplaceSelectionCommand::removeRedundantStyles): Changed to call CSSComputedStyleDeclaration::removeComputedInheritablePropertiesFrom.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (2 diffs)
• css/CSSComputedStyleDeclaration.cpp (modified) (2 diffs)
• css/CSSComputedStyleDeclaration.h (modified) (1 diff)
• css/CSSMutableStyleDeclaration.cpp (modified) (2 diffs)
• css/CSSMutableStyleDeclaration.h (modified) (1 diff)
• editing/ReplaceSelectionCommand.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-01-08  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Darin.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=12162
+          The inheritableProperties array is duplicated
+
+        No test possible (no change to functionality).
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::CSSComputedStyleDeclaration::removeComputedInheritablePropertiesFrom): Added.
+        Removes the inheritable properties that CSSComputedStyleDeclaration knows how to compute
+        from the given mutable declaration.
+        * css/CSSComputedStyleDeclaration.h:
+        * css/CSSMutableStyleDeclaration.cpp: Removed one copy of the inheritableProperties array.
+        * css/CSSMutableStyleDeclaration.h:
+        * editing/ReplaceSelectionCommand.cpp:
+        (WebCore::ReplaceSelectionCommand::removeRedundantStyles): Changed to call
+        CSSComputedStyleDeclaration::removeComputedInheritablePropertiesFrom.
+
 2007-01-08  Alexey Proskuryakov  <ap@webkit.org>
 
@@ -39 +59 @@
         Added this method to DOM and IDL, too. Made namedItem() non-virtual.
 
+>>>>>>> .r18675
 2007-01-08  Beth Dakin  <bdakin@apple.com>
 

trunk/WebCore/css/CSSComputedStyleDeclaration.cpp

@@ -1541 +1541 @@
 // It is the intersection of the list of inherited CSS properties and the
 // properties for which we have a computed implementation in this file.
-// FIXME: This array is duplicated in CSSMutableStyleDeclaration.cpp!  Both must be patched if
-// you add something here!
 const int inheritableProperties[] = {
     CSS_PROP_BORDER_COLLAPSE,
@@ -1571 +1569 @@
 const unsigned numInheritableProperties = sizeof(inheritableProperties) / sizeof(inheritableProperties[0]);
 
+void CSSComputedStyleDeclaration::removeComputedInheritablePropertiesFrom(CSSMutableStyleDeclaration* declaration)
+{
+    declaration->removePropertiesInSet(inheritableProperties, numInheritableProperties);
+}
+
 PassRefPtr<CSSMutableStyleDeclaration> CSSComputedStyleDeclaration::copyInheritableProperties() const
 {

trunk/WebCore/css/CSSComputedStyleDeclaration.h

@@ -59 +59 @@
     PassRefPtr<CSSMutableStyleDeclaration> copyInheritableProperties() const;
 
+    static void removeComputedInheritablePropertiesFrom(CSSMutableStyleDeclaration*);
+
 private:
     virtual void setCssText(const String&, ExceptionCode&);

trunk/WebCore/css/CSSMutableStyleDeclaration.cpp

@@ -417 +417 @@
 }
 
-// This is the list of properties we want to copy in the copyInheritableProperties() function.
-// It is the intersection of the list of inherited CSS properties and the
-// properties for which we have a computed implementation in this file.
-// FIXME: This array is duplicated in CSSComputedStyleDeclaration.cpp!  Both must be patched if
-// you add something here!
-const int inheritableProperties[] = {
-    CSS_PROP_BORDER_COLLAPSE,
-    CSS_PROP__WEBKIT_BORDER_HORIZONTAL_SPACING,
-    CSS_PROP__WEBKIT_BORDER_VERTICAL_SPACING,
-    CSS_PROP_COLOR,
-    CSS_PROP_FONT_FAMILY,
-    CSS_PROP_FONT_SIZE,
-    CSS_PROP_FONT_STYLE,
-    CSS_PROP_FONT_VARIANT,
-    CSS_PROP_FONT_WEIGHT,
-    CSS_PROP_LETTER_SPACING,
-    CSS_PROP_LINE_HEIGHT,
-    CSS_PROP_TEXT_ALIGN,
-    CSS_PROP__WEBKIT_TEXT_DECORATIONS_IN_EFFECT,
-    CSS_PROP__WEBKIT_TEXT_FILL_COLOR,
-    CSS_PROP_TEXT_INDENT,
-    CSS_PROP__WEBKIT_TEXT_SIZE_ADJUST,
-    CSS_PROP__WEBKIT_TEXT_STROKE_COLOR,
-    CSS_PROP__WEBKIT_TEXT_STROKE_WIDTH,
-    CSS_PROP_TEXT_TRANSFORM,
-    CSS_PROP_ORPHANS,
-    CSS_PROP_WHITE_SPACE,
-    CSS_PROP_WIDOWS,
-    CSS_PROP_WORD_SPACING,
-};
-
-const unsigned numInheritableProperties = sizeof(inheritableProperties) / sizeof(inheritableProperties[0]);
-
 // This is the list of properties we want to copy in the copyBlockProperties() function.
 // It is the list of CSS properties that apply specially to block-level elements.
@@ -484 +451 @@
 }
 
-void CSSMutableStyleDeclaration::removeInheritableProperties()
-{
-    removePropertiesInSet(inheritableProperties, numInheritableProperties);
-}
-
 void CSSMutableStyleDeclaration::removePropertiesInSet(const int *set, unsigned length)
 {

trunk/WebCore/css/CSSMutableStyleDeclaration.h

@@ -93 +93 @@
     PassRefPtr<CSSMutableStyleDeclaration> copyBlockProperties() const;
     void removeBlockProperties();
-    void removeInheritableProperties();
     void removePropertiesInSet(const int* set, unsigned length);
 

trunk/WebCore/editing/ReplaceSelectionCommand.cpp

@@ -437 +437 @@
         CSSMutableStyleDeclaration* inlineStyleDecl = element->inlineStyleDecl();
         if (inlineStyleDecl) {
-            inlineStyleDecl->removeInheritableProperties();
+            CSSComputedStyleDeclaration::removeComputedInheritablePropertiesFrom(inlineStyleDecl);
             inlineStyleDecl->merge(style, true);
             setNodeAttribute(element, styleAttr, inlineStyleDecl->cssText());