Changeset 44385 in webkit

Timestamp:

Jun 3, 2009 9:41:49 AM (15 years ago)

Author:

Dimitri Glazkov

Message:

2009-06-03 Pavel Feldman <​pfeldman@chromium.org>

Reviewed by Timothy Hatcher.

• Fix for crash (preceded by assertion) in InspectorController::didCommitLoad when reloading or navigating with the Inspector open.
• Fix for Inspector's Elements panel being empty when Inspector first appears.

​https://bugs.webkit.org/show_bug.cgi?id=26134
​https://bugs.webkit.org/show_bug.cgi?id=26135

• inspector/InspectorController.cpp: (WebCore::InspectorController::scriptObjectReady): (WebCore::InspectorController::didLoadResourceFromMemoryCache): (WebCore::InspectorController::identifierForInitialRequest): (WebCore::InspectorController::ensureResourceTrackingSettingsLoaded):
• inspector/InspectorController.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorController.cpp (modified) (4 diffs)
• inspector/InspectorController.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-06-03  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        - Fix for crash (preceded by assertion) in InspectorController::didCommitLoad
+          when reloading or navigating with the Inspector open.
+        - Fix for Inspector's Elements panel being empty when Inspector first appears.
+
+        https://bugs.webkit.org/show_bug.cgi?id=26134
+        https://bugs.webkit.org/show_bug.cgi?id=26135
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::scriptObjectReady):
+        (WebCore::InspectorController::didLoadResourceFromMemoryCache):
+        (WebCore::InspectorController::identifierForInitialRequest):
+        (WebCore::InspectorController::ensureResourceTrackingSettingsLoaded):
+        * inspector/InspectorController.h:
+
 2009-06-03  Adam Roben  <aroben@apple.com>
 

trunk/WebCore/inspector/InspectorController.cpp

@@ -808 +808 @@
         return;
 
+    ASSERT(m_inspectedPage);
+    bool isMainResource = loader->frame() == m_inspectedPage->mainFrame() && cachedResource->url() == loader->requestURL();
+    ensureResourceTrackingSettingsLoaded();
+    if (!isMainResource && !m_resourceTrackingEnabled)
+        return;
+    
     RefPtr<InspectorResource> resource = InspectorResource::createCached(m_nextIdentifier--, loader, cachedResource);
 
-    ASSERT(m_inspectedPage);
-
-    if (loader->frame() == m_inspectedPage->mainFrame() && cachedResource->url() == loader->requestURL()) {
+    if (isMainResource) {
         m_mainResource = resource;
         resource->markMainResource();
@@ -827 +831 @@
     if (!enabled())
         return;
-
-    if (!m_resourceTrackingSettingsLoaded) {
-        m_resourceTrackingSettingsLoaded = true;
-        Setting resourceTracking = setting(resourceTrackingEnabledSettingName);
-        if (resourceTracking.type() == Setting::BooleanType && resourceTracking.booleanValue())
-            m_resourceTrackingEnabled = true;
-    }
-
-    if (!m_resourceTrackingEnabled)
+    ASSERT(m_inspectedPage);
+
+    bool isMainResource = m_inspectedPage->mainFrame() && request.url() == loader->requestURL();
+    ensureResourceTrackingSettingsLoaded();
+    if (!isMainResource && !m_resourceTrackingEnabled)
         return;
 
@@ -842 +842 @@
     resource->updateRequest(request);
 
-    ASSERT(m_inspectedPage);
-
-    if (loader->frame() == m_inspectedPage->mainFrame() && request.url() == loader->requestURL()) {
+    if (isMainResource) {
         m_mainResource = resource;
         resource->markMainResource();
@@ -1006 +1004 @@
     if (m_frontend)
         m_frontend->resourceTrackingWasDisabled();
+}
+
+void InspectorController::ensureResourceTrackingSettingsLoaded()
+{
+    if (m_resourceTrackingSettingsLoaded)
+        return;
+    m_resourceTrackingSettingsLoaded = true;
+
+    Setting resourceTracking = setting(resourceTrackingEnabledSettingName);
+    if (resourceTracking.type() == Setting::BooleanType && resourceTracking.booleanValue())
+        m_resourceTrackingEnabled = true;
 }
 

trunk/WebCore/inspector/InspectorController.h

@@ -214 +214 @@
     void disableResourceTracking(bool always = false);
     bool resourceTrackingEnabled() const { return m_resourceTrackingEnabled; }
+    void ensureResourceTrackingSettingsLoaded();
 
 #if ENABLE(DATABASE)