Changeset 27337 in webkit

Timestamp:

Oct 31, 2007 8:05:41 PM (16 years ago)

Author:

hyatt

Message:

Fix a merge error from when I applied my patch to ToT. A couple of lines should be part of an if.

• rendering/RenderStyle.cpp: (WebCore::RenderStyle::adjustTransitions):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderStyle.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-10-31  David Hyatt  <hyatt@apple.com>
+
+        Fix a merge error from when I applied my patch to ToT.  A couple of lines should be part of an if.
+
+        * rendering/RenderStyle.cpp:
+        (WebCore::RenderStyle::adjustTransitions):
+
 2007-10-31  Anders Carlsson  <andersca@apple.com>
 

trunk/WebCore/rendering/RenderStyle.cpp

@@ -1716 +1716 @@
         for (Transition* p = accessTransitions(); p; p = next) {
             next = p->m_next;
-            if (next && next->isEmpty())
+            if (next && next->isEmpty()) {
                 delete next;
-            p->m_next = 0;
-            break;
+                p->m_next = 0;
+                break;
+            }
         }