Changeset 206388 in webkit

Timestamp:

Sep 26, 2016, 1:19:36 PM (9 years ago)

Author:

commit-queue@webkit.org

Message:

ASSERTION FAILED: m_origin

m_type == CachedResource::MainResource

​https://bugs.webkit.org/show_bug.cgi?id=162472
<rdar://problem/28431522>

Patch by Youenn Fablet <​youenn@apple.com> on 2016-09-26
Reviewed by Chris Dumez.

Covered by existing tests.

• loader/cache/CachedImage.cpp:

(WebCore::CachedImage::CachedImage): Fixing the last CachedImage constructor.
Using CachedResource protected constructor.

• loader/cache/CachedResource.h: Small clean-up.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/cache/CachedImage.cpp (modified) (1 diff)
• loader/cache/CachedResource.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-26  Youenn Fablet  <youenn@apple.com>
+
+        ASSERTION FAILED: m_origin || m_type == CachedResource::MainResource
+        https://bugs.webkit.org/show_bug.cgi?id=162472
+        <rdar://problem/28431522>
+
+        Reviewed by Chris Dumez.
+
+        Covered by existing tests.
+
+        * loader/cache/CachedImage.cpp:
+        (WebCore::CachedImage::CachedImage): Fixing the last CachedImage constructor.
+        Using CachedResource protected constructor.
+        * loader/cache/CachedResource.h: Small clean-up.
+
 2016-09-26  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/loader/cache/CachedImage.cpp

@@ -83 +83 @@
 
 CachedImage::CachedImage(const URL& url, Image* image, CachedImage::CacheBehaviorType type, SessionID sessionID)
-    : CachedResource(CachedResourceRequest(ResourceRequest(url)), ImageResource, sessionID)
+    : CachedResource(url, ImageResource, sessionID)
     , m_image(image)
     , m_isManuallyCached(type == CachedImage::ManuallyCached)

trunk/Source/WebCore/loader/cache/CachedResource.h

@@ -336 +336 @@
     unsigned m_preloadCount { 0 };
 
-    unsigned m_preloadResult { PreloadNotReferenced };
+    PreloadResult m_preloadResult { PreloadNotReferenced };
 
     bool m_requestedFromNetworkingLayer { false };