Title: [101176] trunk/Source/WebKit/chromium
- Revision
- 101176
- Author
- yu...@chromium.org
- Date
- 2011-11-25 09:47:56 -0800 (Fri, 25 Nov 2011)
Log Message
[Chromium] Web Inspector: assertion failure in InspectorController::restoreInspectorStateFromCookie
https://bugs.webkit.org/show_bug.cgi?id=73136
Don't call connectFrontend twice on reattach.
Reviewed by Pavel Feldman.
* src/WebDevToolsAgentImpl.cpp:
(WebKit::WebDevToolsAgentImpl::reattach):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (101175 => 101176)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-11-25 16:46:42 UTC (rev 101175)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-11-25 17:47:56 UTC (rev 101176)
@@ -1,5 +1,17 @@
2011-11-25 Yury Semikhatsky <yu...@chromium.org>
+ [Chromium] Web Inspector: assertion failure in InspectorController::restoreInspectorStateFromCookie
+ https://bugs.webkit.org/show_bug.cgi?id=73136
+
+ Don't call connectFrontend twice on reattach.
+
+ Reviewed by Pavel Feldman.
+
+ * src/WebDevToolsAgentImpl.cpp:
+ (WebKit::WebDevToolsAgentImpl::reattach):
+
+2011-11-25 Yury Semikhatsky <yu...@chromium.org>
+
Unreviewed. Chromium build fix.
* public/WebDevToolsFrontendClient.h:
Modified: trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp (101175 => 101176)
--- trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp 2011-11-25 16:46:42 UTC (rev 101175)
+++ trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp 2011-11-25 17:47:56 UTC (rev 101176)
@@ -201,8 +201,12 @@
void WebDevToolsAgentImpl::reattach(const WebString& savedState)
{
- attach();
+ if (m_attached)
+ return;
+
+ ClientMessageLoopAdapter::ensureClientMessageLoopCreated(m_client);
inspectorController()->restoreInspectorStateFromCookie(savedState);
+ m_attached = true;
}
void WebDevToolsAgentImpl::detach()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
