Title: [108354] trunk/Source/WebCore
Revision
108354
Author
pfeld...@chromium.org
Date
2012-02-21 07:56:57 -0800 (Tue, 21 Feb 2012)

Log Message

Web Inspector: [crash] upon style modification after navigation
https://bugs.webkit.org/show_bug.cgi?id=79108

Reviewed by Yury Semikhatsky.

* inspector/InspectorHistory.cpp:
(WebCore::InspectorHistory::undo):
(WebCore::InspectorHistory::redo):
(WebCore::InspectorHistory::reset):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (108353 => 108354)


--- trunk/Source/WebCore/ChangeLog	2012-02-21 15:52:06 UTC (rev 108353)
+++ trunk/Source/WebCore/ChangeLog	2012-02-21 15:56:57 UTC (rev 108354)
@@ -1,3 +1,15 @@
+2012-02-21  Pavel Feldman  <pfeld...@google.com>
+
+        Web Inspector: [crash] upon style modification after navigation
+        https://bugs.webkit.org/show_bug.cgi?id=79108
+
+        Reviewed by Yury Semikhatsky.
+
+        * inspector/InspectorHistory.cpp:
+        (WebCore::InspectorHistory::undo):
+        (WebCore::InspectorHistory::redo):
+        (WebCore::InspectorHistory::reset):
+
 2012-02-21  Patrick Gansterer  <par...@webkit.org>
 
         Use WTF::cryptographicallyRandomValues in FileSystemWin.cpp

Modified: trunk/Source/WebCore/inspector/InspectorHistory.cpp (108353 => 108354)


--- trunk/Source/WebCore/inspector/InspectorHistory.cpp	2012-02-21 15:52:06 UTC (rev 108353)
+++ trunk/Source/WebCore/inspector/InspectorHistory.cpp	2012-02-21 15:56:57 UTC (rev 108354)
@@ -114,8 +114,7 @@
     while (m_afterLastActionIndex > 0) {
         Action* action = "" - 1].get();
         if (!action->undo(ec)) {
-            m_history.clear();
-            m_afterLastActionIndex = 0;
+            reset();
             return false;
         }
         --m_afterLastActionIndex;
@@ -134,7 +133,7 @@
     while (m_afterLastActionIndex < m_history.size()) {
         Action* action = ""
         if (!action->redo(ec)) {
-            m_history.clear();
+            reset();
             return false;
         }
         ++m_afterLastActionIndex;
@@ -146,6 +145,7 @@
 
 void InspectorHistory::reset()
 {
+    m_afterLastActionIndex = 0;
     m_history.clear();
 }
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to