Title: [92740] branches/chromium/835/Source/WebCore
- Revision
- 92740
- Author
- [email protected]
- Date
- 2011-08-09 18:40:01 -0700 (Tue, 09 Aug 2011)
Log Message
Merge 92678 - Web Inspector: assertion failure in InspectorDOMStorageResource::bind when opening inspector
https://bugs.webkit.org/show_bug.cgi?id=65912
Reviewed by Pavel Feldman.
* inspector/InspectorDOMStorageAgent.cpp:
(WebCore::InspectorDOMStorageAgent::didUseDOMStorage):
[email protected]
Review URL: http://codereview.chromium.org/7552031
Modified Paths
Diff
Modified: branches/chromium/835/Source/WebCore/ChangeLog (92739 => 92740)
--- branches/chromium/835/Source/WebCore/ChangeLog 2011-08-10 01:35:54 UTC (rev 92739)
+++ branches/chromium/835/Source/WebCore/ChangeLog 2011-08-10 01:40:01 UTC (rev 92740)
@@ -1,3 +1,41 @@
+2011-08-09 Andrey Kosyakov <[email protected]>
+
+ Web Inspector: assertion failure in InspectorDOMStorageResource::bind when opening inspector
+ https://bugs.webkit.org/show_bug.cgi?id=65912
+
+ Reviewed by Pavel Feldman.
+
+ * inspector/InspectorDOMStorageAgent.cpp:
+ (WebCore::InspectorDOMStorageAgent::didUseDOMStorage):
+
+2011-08-09 Yury Semikhatsky <[email protected]>
+
+ Web Inspector: get rid of InspectorInstrumentation::inspectorAgents() map
+ https://bugs.webkit.org/show_bug.cgi?id=54678
+
+ Added two functions for retrieving InstrumentingAgents from Page and WorkerContext.
+
+ Reviewed by Pavel Feldman.
+
+ * CMakeLists.txt:
+ * GNUmakefile.list.am:
+ * WebCore.gypi:
+ * WebCore.pro:
+ * WebCore.vcproj/WebCore.vcproj:
+ * WebCore.xcodeproj/project.pbxproj:
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::InspectorController):
+ (WebCore::InspectorController::inspectedPageDestroyed):
+ * inspector/InspectorController.h:
+ * inspector/InspectorInstrumentation.cpp:
+ (WebCore::InspectorInstrumentation::instrumentingAgentsForPage):
+ * inspector/InspectorInstrumentation.h:
+ * inspector/InstrumentingAgents.cpp: Copied from Source/WebCore/inspector/WorkerInspectorController.h.
+ (WebCore::instrumentationForPage):
+ (WebCore::instrumentationForWorkerContext):
+ * inspector/InstrumentingAgents.h:
+ * inspector/WorkerInspectorController.h:
+
2011-08-09 Vsevolod Vlasov <[email protected]>
Web Inspector: Resources panel does not show main resource cookies.
Modified: branches/chromium/835/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp (92739 => 92740)
--- branches/chromium/835/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp 2011-08-10 01:35:54 UTC (rev 92739)
+++ branches/chromium/835/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp 2011-08-10 01:40:01 UTC (rev 92740)
@@ -181,7 +181,7 @@
m_resources.set(resource->id(), resource);
// Resources are only bound while visible.
- if (m_frontend)
+ if (m_enabled)
resource->bind(m_frontend);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
