Title: [100567] branches/chromium/912
- Revision
- 100567
- Author
- [email protected]
- Date
- 2011-11-16 23:46:42 -0800 (Wed, 16 Nov 2011)
Log Message
Merge 99565
BUG=102810
Review URL: http://codereview.chromium.org/8588025
Modified Paths
Added Paths
Diff
Copied: branches/chromium/912/LayoutTests/fast/dom/HTMLLinkElement/cachedresource-types-expected.txt (from rev 99565, trunk/LayoutTests/fast/dom/HTMLLinkElement/cachedresource-types-expected.txt) (0 => 100567)
--- branches/chromium/912/LayoutTests/fast/dom/HTMLLinkElement/cachedresource-types-expected.txt (rev 0)
+++ branches/chromium/912/LayoutTests/fast/dom/HTMLLinkElement/cachedresource-types-expected.txt 2011-11-17 07:46:42 UTC (rev 100567)
@@ -0,0 +1 @@
+ This test passes if it does not crash.
Copied: branches/chromium/912/LayoutTests/fast/dom/HTMLLinkElement/cachedresource-types.html (from rev 99565, trunk/LayoutTests/fast/dom/HTMLLinkElement/cachedresource-types.html) (0 => 100567)
--- branches/chromium/912/LayoutTests/fast/dom/HTMLLinkElement/cachedresource-types.html (rev 0)
+++ branches/chromium/912/LayoutTests/fast/dom/HTMLLinkElement/cachedresource-types.html 2011-11-17 07:46:42 UTC (rev 100567)
@@ -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: branches/chromium/912/Source/WebCore/loader/cache/CachedResource.cpp (100566 => 100567)
--- branches/chromium/912/Source/WebCore/loader/cache/CachedResource.cpp 2011-11-17 07:42:47 UTC (rev 100566)
+++ branches/chromium/912/Source/WebCore/loader/cache/CachedResource.cpp 2011-11-17 07:46:42 UTC (rev 100567)
@@ -111,6 +111,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: branches/chromium/912/Source/WebCore/loader/cache/CachedResource.h (100566 => 100567)
--- branches/chromium/912/Source/WebCore/loader/cache/CachedResource.h 2011-11-17 07:42:47 UTC (rev 100566)
+++ branches/chromium/912/Source/WebCore/loader/cache/CachedResource.h 2011-11-17 07:46:42 UTC (rev 100567)
@@ -281,7 +281,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
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
