Title: [206388] trunk/Source/WebCore
Revision
206388
Author
[email protected]
Date
2016-09-26 13:19:36 -0700 (Mon, 26 Sep 2016)

Log 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 <[email protected]> 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.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (206387 => 206388)


--- trunk/Source/WebCore/ChangeLog	2016-09-26 19:55:08 UTC (rev 206387)
+++ trunk/Source/WebCore/ChangeLog	2016-09-26 20:19:36 UTC (rev 206388)
@@ -1,5 +1,20 @@
 2016-09-26  Youenn Fablet  <[email protected]>
 
+        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  <[email protected]>
+
         [GTK][EFL] imported/w3c/web-platform-tests/fetch/api/basic/accept-header.html is failing
         https://bugs.webkit.org/show_bug.cgi?id=162547
 

Modified: trunk/Source/WebCore/loader/cache/CachedImage.cpp (206387 => 206388)


--- trunk/Source/WebCore/loader/cache/CachedImage.cpp	2016-09-26 19:55:08 UTC (rev 206387)
+++ trunk/Source/WebCore/loader/cache/CachedImage.cpp	2016-09-26 20:19:36 UTC (rev 206388)
@@ -82,7 +82,7 @@
 }
 
 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)
     , m_shouldPaintBrokenImage(true)

Modified: trunk/Source/WebCore/loader/cache/CachedResource.h (206387 => 206388)


--- trunk/Source/WebCore/loader/cache/CachedResource.h	2016-09-26 19:55:08 UTC (rev 206387)
+++ trunk/Source/WebCore/loader/cache/CachedResource.h	2016-09-26 20:19:36 UTC (rev 206388)
@@ -335,7 +335,7 @@
     unsigned m_handleCount { 0 };
     unsigned m_preloadCount { 0 };
 
-    unsigned m_preloadResult { PreloadNotReferenced };
+    PreloadResult m_preloadResult { PreloadNotReferenced };
 
     bool m_requestedFromNetworkingLayer { false };
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to