Inform disk cache of WebKit memory cache hits.

webkit/glue/resource_type.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WEBKIT_GLUE_RESOURCE_TYPE_H__
 #define WEBKIT_GLUE_RESOURCE_TYPE_H__
 
 #include "base/basictypes.h"
+#include "base/logging.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h"
 
 class ResourceType {
  public:
   enum Type {
     MAIN_FRAME = 0,  // top level page
     SUB_FRAME,       // frame or iframe
     STYLESHEET,      // a CSS stylesheet
     SCRIPT,          // an external script
     IMAGE,           // an image (jpg/gif/png/etc)
     FONT_RESOURCE,   // a font
@@ skipping 11 matching lines @@
   };
 
   static bool ValidType(int32 type) {
     return type >= MAIN_FRAME && type < LAST_TYPE;
   }
 
   static Type FromInt(int32 type) {
     return static_cast<Type>(type);
   }
 
+  static Type FromTargetType(WebKit::WebURLRequest::TargetType type) {

[darin (slow to review), 2011/07/30 05:09:32]

this is sizeable enough that it should not be implemented inline.

+    switch (type) {
+      case WebKit::WebURLRequest::TargetIsMainFrame:
+        return ResourceType::MAIN_FRAME;
+      case WebKit::WebURLRequest::TargetIsSubframe:
+        return ResourceType::SUB_FRAME;
+      case WebKit::WebURLRequest::TargetIsSubresource:
+        return ResourceType::SUB_RESOURCE;
+      case WebKit::WebURLRequest::TargetIsStyleSheet:
+        return ResourceType::STYLESHEET;
+      case WebKit::WebURLRequest::TargetIsScript:
+        return ResourceType::SCRIPT;
+      case WebKit::WebURLRequest::TargetIsFontResource:
+        return ResourceType::FONT_RESOURCE;
+      case WebKit::WebURLRequest::TargetIsImage:
+        return ResourceType::IMAGE;
+      case WebKit::WebURLRequest::TargetIsObject:
+        return ResourceType::OBJECT;
+      case WebKit::WebURLRequest::TargetIsMedia:
+        return ResourceType::MEDIA;
+      case WebKit::WebURLRequest::TargetIsWorker:
+        return ResourceType::WORKER;
+      case WebKit::WebURLRequest::TargetIsSharedWorker:
+        return ResourceType::SHARED_WORKER;
+      case WebKit::WebURLRequest::TargetIsPrefetch:
+        return ResourceType::PREFETCH;
+      case WebKit::WebURLRequest::TargetIsPrerender:
+        return ResourceType::PRERENDER;
+      case WebKit::WebURLRequest::TargetIsFavicon:
+        return ResourceType::FAVICON;
+      default:
+        NOTREACHED();
+        return ResourceType::SUB_RESOURCE;
+    }
+  }
+
   static bool IsFrame(ResourceType::Type type) {
     return type == MAIN_FRAME || type == SUB_FRAME;
   }
 
   static bool IsSharedWorker(ResourceType::Type type) {
     return type == SHARED_WORKER;
   }
 
   static bool IsSubresource(ResourceType::Type type) {
     return type == STYLESHEET ||
            type == SCRIPT ||
            type == IMAGE ||
            type == FONT_RESOURCE ||
            type == SUB_RESOURCE ||
            type == WORKER;
   }
 
  private:
   // Don't instantiate this class.
   ResourceType();
   ~ResourceType();
 };
 #endif  // WEBKIT_GLUE_RESOURCE_TYPE_H__