Title: [124519] branches/safari-536.26-branch/Source/WebCore
Revision
124519
Author
[email protected]
Date
2012-08-02 16:01:06 -0700 (Thu, 02 Aug 2012)

Log Message

Merged r119439.  <rdar://problem/11968335>

Modified Paths

Diff

Modified: branches/safari-536.26-branch/Source/WebCore/ChangeLog (124518 => 124519)


--- branches/safari-536.26-branch/Source/WebCore/ChangeLog	2012-08-02 22:50:52 UTC (rev 124518)
+++ branches/safari-536.26-branch/Source/WebCore/ChangeLog	2012-08-02 23:01:06 UTC (rev 124519)
@@ -1,5 +1,21 @@
 2012-08-02  Lucas Forschler  <[email protected]>
 
+    Merge 119439
+
+    2012-06-04  Jeffrey Pfau  <[email protected]>
+
+            Document cleanup can get confused if parser still exists
+            https://bugs.webkit.org/show_bug.cgi?id=88250
+
+            Reviewed by Geoffrey Garen.
+
+            No new tests; no behavior changes.
+
+            * dom/Document.cpp:
+            (WebCore::Document::removedLastRef): Detach parser earlier
+
+2012-08-02  Lucas Forschler  <[email protected]>
+
     Merge 119050
 
     2012-05-30  Abhishek Arya  <[email protected]>

Modified: branches/safari-536.26-branch/Source/WebCore/dom/Document.cpp (124518 => 124519)


--- branches/safari-536.26-branch/Source/WebCore/dom/Document.cpp	2012-08-02 22:50:52 UTC (rev 124518)
+++ branches/safari-536.26-branch/Source/WebCore/dom/Document.cpp	2012-08-02 23:01:06 UTC (rev 124519)
@@ -653,6 +653,8 @@
         m_fullScreenElementStack.clear();
 #endif
 
+        detachParser();
+
         // removeAllChildren() doesn't always unregister IDs,
         // so tear down scope information upfront to avoid having stale references in the map.
         destroyTreeScopeData();
@@ -660,8 +662,6 @@
 
         m_markers->detach();
 
-        detachParser();
-
         m_cssCanvasElements.clear();
 
 #if ENABLE(REQUEST_ANIMATION_FRAME)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to