Merge 99565

Source/WebCore/loader/cache/CachedResource.h

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller <mueller@kde.org>
     Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
     Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
@@ skipping 263 matching lines @@
     unsigned m_preloadCount;
 
     unsigned m_preloadResult : 2; // PreloadResult
 
     bool m_inLiveDecodedResourcesList : 1;
     bool m_requestedFromNetworkingLayer : 1;
 
     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
     bool m_deleted;
     unsigned m_lruIndex;
 #endif
 
     CachedResource* m_nextInAllResourcesList;
     CachedResource* m_prevInAllResourcesList;
     
@@ skipping 11 matching lines @@
     // If this field is non-null, the resource has a proxy for checking whether it is still up to date (see m_resourceToRevalidate).
     CachedResource* m_proxyResource;
 
     // These handles will need to be updated to point to the m_resourceToRevalidate in case we get 304 response.
     HashSet<CachedResourceHandleBase*> m_handlesToRevalidate;
 };
 
 }
 
 #endif