Title: [99565] trunk
- Revision
- 99565
- Author
- gav...@chromium.org
- Date
- 2011-11-08 06:42:25 -0800 (Tue, 08 Nov 2011)
Log Message
Fix width of m_type in CachedResource
https://bugs.webkit.org/show_bug.cgi?id=71727
Reviewed by Nate Chapin.
Source/WebCore:
Test: fast/dom/HTMLLinkElement/cachedresource-types.html
* loader/cache/CachedResource.cpp:
(WebCore::CachedResource::CachedResource):
* loader/cache/CachedResource.h:
LayoutTests:
* fast/dom/HTMLLinkElement/cachedresource-types-expected.txt: Added.
* fast/dom/HTMLLinkElement/cachedresource-types.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (99564 => 99565)
--- trunk/LayoutTests/ChangeLog 2011-11-08 14:40:46 UTC (rev 99564)
+++ trunk/LayoutTests/ChangeLog 2011-11-08 14:42:25 UTC (rev 99565)
@@ -1,3 +1,13 @@
+2011-11-08 Gavin Peters <gav...@chromium.org>
+
+ Fix width of m_type in CachedResource
+ https://bugs.webkit.org/show_bug.cgi?id=71727
+
+ Reviewed by Nate Chapin.
+
+ * fast/dom/HTMLLinkElement/cachedresource-types-expected.txt: Added.
+ * fast/dom/HTMLLinkElement/cachedresource-types.html: Added.
+
2011-11-08 Nikolas Zimmermann <nzimmerm...@rim.com>
[Chromium] SVG test failures after r99539
Added: trunk/LayoutTests/fast/dom/HTMLLinkElement/cachedresource-types-expected.txt (0 => 99565)
--- trunk/LayoutTests/fast/dom/HTMLLinkElement/cachedresource-types-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/dom/HTMLLinkElement/cachedresource-types-expected.txt 2011-11-08 14:42:25 UTC (rev 99565)
@@ -0,0 +1 @@
+ This test passes if it does not crash.
Added: trunk/LayoutTests/fast/dom/HTMLLinkElement/cachedresource-types.html (0 => 99565)
--- trunk/LayoutTests/fast/dom/HTMLLinkElement/cachedresource-types.html (rev 0)
+++ trunk/LayoutTests/fast/dom/HTMLLinkElement/cachedresource-types.html 2011-11-08 14:42:25 UTC (rev 99565)
@@ -0,0 +1,9 @@
+<script>
+if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+
+</script>
+<link rel="subresource" href=""
+<img src=""
+
+This test passes if it does not crash.
Modified: trunk/Source/WebCore/ChangeLog (99564 => 99565)
--- trunk/Source/WebCore/ChangeLog 2011-11-08 14:40:46 UTC (rev 99564)
+++ trunk/Source/WebCore/ChangeLog 2011-11-08 14:42:25 UTC (rev 99565)
@@ -1,3 +1,16 @@
+2011-11-08 Gavin Peters <gav...@chromium.org>
+
+ Fix width of m_type in CachedResource
+ https://bugs.webkit.org/show_bug.cgi?id=71727
+
+ Reviewed by Nate Chapin.
+
+ Test: fast/dom/HTMLLinkElement/cachedresource-types.html
+
+ * loader/cache/CachedResource.cpp:
+ (WebCore::CachedResource::CachedResource):
+ * loader/cache/CachedResource.h:
+
2011-11-08 Tor Arne Vestbø <tor.arne.ves...@nokia.com>
[Qt] Don't set OBJECTS_DIR and DEFINES in default_pre
Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (99564 => 99565)
--- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2011-11-08 14:40:46 UTC (rev 99564)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2011-11-08 14:42:25 UTC (rev 99565)
@@ -112,6 +112,7 @@
, m_resourceToRevalidate(0)
, m_proxyResource(0)
{
+ ASSERT(m_type == unsigned(type)); // m_type is a bitfield, so this tests careless updates of the enum.
#ifndef NDEBUG
cachedResourceLeakCounter.increment();
#endif
Modified: trunk/Source/WebCore/loader/cache/CachedResource.h (99564 => 99565)
--- trunk/Source/WebCore/loader/cache/CachedResource.h 2011-11-08 14:40:46 UTC (rev 99564)
+++ trunk/Source/WebCore/loader/cache/CachedResource.h 2011-11-08 14:42:25 UTC (rev 99565)
@@ -290,7 +290,7 @@
bool m_inCache : 1;
bool m_loading : 1;
- unsigned m_type : 3; // Type
+ unsigned m_type : 4; // Type
unsigned m_status : 3; // Status
#ifndef NDEBUG
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
