Add ResourceRequest target types for worker and shared workers....

webkit/glue/resource_type.h

 // Copyright (c) 2006-2008 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"
 
 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
     SUB_RESOURCE,    // an "other" subresource.
     OBJECT,          // an object (or embed) tag for a plugin,
                      // or a resource that a plugin requested.
     MEDIA,           // a media resource.
+    SHARED_WORKER,   // the main resource of a shared worker.

[Andrew T Wilson (Slow), 2010/04/25 17:13:15]

When workers perform XHR or load scripts like importScripts() I'm guessing these
use SUB_RESOURCE type, then? So the only time WORKER/SHARED_WORKER is used is
when loading the initial script resource via the Worker()/SharedWorker()
constructors? These would go away if/when we ever move script loading to the
worker, right?

(I think that's the correct implementation - just making sure I understand it).

[michaeln, 2010/04/26 21:51:53]

I think right now all resources loaded by workers get tagged as SUB_RESOURCEs
becauses there is no thread marshaling for the 'type' data member. When I do the
webkit/webcore patch we'll have a choice about how to tag those reource
requests.

The most accurate 'type' for importScripts() seems like the SCRIPT_RESOURCE
type. Not posted for review yet but here's a preview of the webcore changes.
http://codereview.chromium.org/1521038/show
Probably makes sense to have those 'types' regardless of how/where the request
for those resources are made. If the callsite to load the main resource for a
worker moved to the worker process itself (not gonna happen any time soon i
think), we'd use the appropriate type at the new callsite.

+    WORKER,          // the main resource of a dedicated worker.
     LAST_TYPE        // Place holder so we don't need to change ValidType
                      // everytime.
   };
 
   static bool ValidType(int32 type) {
     return type >= MAIN_FRAME && type < LAST_TYPE;
   }
 
   static Type FromInt(int32 type) {
     return static_cast<Type>(type);
   }
 
   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 == SUB_RESOURCE ||
+           type == WORKER;
   }
 
  private:
   // Don't instantiate this class.
   ResourceType();
   ~ResourceType();
 };
 #endif  // WEBKIT_GLUE_RESOURCE_TYPE_H__