Changeset 39517 in webkit

Timestamp:

Dec 30, 2008 3:08:26 AM (15 years ago)

Author:

cwzwarich@webkit.org

Message:

2008-12-30 Cameron Zwarich <​cwzwarich@uwaterloo.ca>

Reviewed by Antti Koivisto.

Bug 22931: Using the inspector with purgeable resources leads to assertion failures
<​https://bugs.webkit.org/show_bug.cgi?id=22931>

Change InspectorResource::sourceString() so that it doesn't attempt to
unsafely get the data of a purgeable CachedResource.

• inspector/InspectorController.cpp: (WebCore::InspectorResource::sourceString): Attempt to make a purgeable resource unpurgeable, and if this not possible, return an empty string.
• loader/CachedResource.h: Make InspectorResource a friend of CachedResource.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorController.cpp (modified) (1 diff)
• loader/CachedResource.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-12-30  Cameron Zwarich  <cwzwarich@uwaterloo.ca>
+
+        Reviewed by Antti Koivisto.
+
+        Bug 22931: Using the inspector with purgeable resources leads to assertion failures
+        <https://bugs.webkit.org/show_bug.cgi?id=22931>
+
+        Change InspectorResource::sourceString() so that it doesn't attempt to
+        unsafely get the data of a purgeable CachedResource.
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorResource::sourceString): Attempt to make a purgeable
+        resource unpurgeable, and if this not possible, return an empty string.
+        * loader/CachedResource.h: Make InspectorResource a friend of CachedResource.
+
 2008-12-29  Alexey Proskuryakov  <ap@webkit.org>
 

trunk/WebCore/inspector/InspectorController.cpp

@@ -349 +349 @@
                 return String();
 
+            if (cachedResource->isPurgeable()) {
+                // If the resource is purgeable then make it unpurgeable to get
+                // get its data. This might fail, in which case we return an
+                // empty String.
+                // FIXME: should we do something else in the case of a purged
+                // resource that informs the user why there is no data in the
+                // inspector?
+                if (!cachedResource->makePurgeable(false))
+                    return String();
+            }
+
             buffer = cachedResource->data();
             textEncodingName = cachedResource->encoding();

trunk/WebCore/loader/CachedResource.h

@@ -40 +40 @@
 class CachedResourceHandleBase;
 class DocLoader;
+class InspectorResource;
 class Request;
 class PurgeableBuffer;
@@ -48 +49 @@
 class CachedResource {
     friend class Cache;
+    friend class InspectorResource;
     
 public: