Changeset 30117 in webkit

Timestamp:

Feb 9, 2008 4:16:39 PM (16 years ago)

Author:

mitz@apple.com

Message:

Reviewed by Sam Weinig.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=17259 Element::recalcStyle() needlessly null-checks the result of styleForElement()

• dom/Element.cpp: (WebCore::Element::recalcStyle): Removed unneeded null checks. styleForElement() can never return null.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Element.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-02-09  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=17259
+          Element::recalcStyle() needlessly null-checks the result of styleForElement()
+
+        * dom/Element.cpp:
+        (WebCore::Element::recalcStyle): Removed unneeded null checks.
+        styleForElement() can never return null.
+
 2008-02-09  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/dom/Element.cpp

@@ -731 +731 @@
         }
 
-        if (currentStyle && newStyle) {
+        if (currentStyle) {
             // Preserve "affected by" bits that were propagated to us from descendants in the case where we didn't do a full
             // style change (e.g., only inline style changed).
@@ -750 +750 @@
         }
 
-        if (ch != NoChange) {
-            if (newStyle)
-                setRenderStyle(newStyle);
-        } else if (changed() && newStyle && (document()->usesSiblingRules() || document()->usesDescendantRules())) {
+        if (ch != NoChange)
+            setRenderStyle(newStyle);
+        else if (changed() && (document()->usesSiblingRules() || document()->usesDescendantRules())) {
             // Although no change occurred, we use the new style so that the cousin style sharing code won't get
             // fooled into believing this style is the same.  This is only necessary if the document actually uses