Title: [117105] branches/safari-536-branch/Source/WebCore
Revision
117105
Author
[email protected]
Date
2012-05-15 11:31:16 -0700 (Tue, 15 May 2012)

Log Message

Merged r116427.

Modified Paths

Diff

Modified: branches/safari-536-branch/Source/WebCore/ChangeLog (117104 => 117105)


--- branches/safari-536-branch/Source/WebCore/ChangeLog	2012-05-15 18:24:56 UTC (rev 117104)
+++ branches/safari-536-branch/Source/WebCore/ChangeLog	2012-05-15 18:31:16 UTC (rev 117105)
@@ -1,5 +1,19 @@
 2012-05-15  Lucas Forschler  <[email protected]>
 
+    Merge 116427
+
+    2012-05-08  Stephen Chenney  <[email protected]>
+
+            Shrink ElementAttributeData by factoring out Attr object count.
+            https://bugs.webkit.org/show_bug.cgi?id=85825
+
+            Unreviewed build fix.
+
+            * dom/ElementAttributeData.cpp:
+            (WebCore::attrListForElement): Was returning false instead of 0 for a pointer value. Now returns 0.
+
+2012-05-15  Lucas Forschler  <[email protected]>
+
     Merge 116419
 
     2012-05-08  Andreas Kling  <[email protected]>

Modified: branches/safari-536-branch/Source/WebCore/dom/ElementAttributeData.cpp (117104 => 117105)


--- branches/safari-536-branch/Source/WebCore/dom/ElementAttributeData.cpp	2012-05-15 18:24:56 UTC (rev 117104)
+++ branches/safari-536-branch/Source/WebCore/dom/ElementAttributeData.cpp	2012-05-15 18:31:16 UTC (rev 117105)
@@ -45,7 +45,7 @@
 {
     ASSERT(element);
     if (!element->hasAttrList())
-        return false;
+        return 0;
     ASSERT(attrListMap().contains(element));
     return attrListMap().get(element);
 }
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to