diff options
| -rw-r--r-- | webkit/glue/resource_handle_impl.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/resource_type.h | 5 | ||||
| -rw-r--r-- | webkit/port/platform/network/chromium/ResourceRequest.h | 3 |
3 files changed, 8 insertions, 2 deletions
diff --git a/webkit/glue/resource_handle_impl.cc b/webkit/glue/resource_handle_impl.cc index 37528d6..322e0b8 100644 --- a/webkit/glue/resource_handle_impl.cc +++ b/webkit/glue/resource_handle_impl.cc @@ -75,6 +75,8 @@ static ResourceType::Type FromTargetType(ResourceRequest::TargetType type) { return ResourceType::SUB_RESOURCE; case ResourceRequest::TargetIsObject: return ResourceType::OBJECT; + case ResourceRequest::TargetIsMedia: + return ResourceType::MEDIA; default: NOTREACHED(); return ResourceType::SUB_RESOURCE; diff --git a/webkit/glue/resource_type.h b/webkit/glue/resource_type.h index 1d8e22b..98091b6 100644 --- a/webkit/glue/resource_type.h +++ b/webkit/glue/resource_type.h @@ -15,10 +15,13 @@ class ResourceType { SUB_RESOURCE, // a resource like images, js, css OBJECT, // an object (or embed) tag for a plugin, // or a resource that a plugin requested. + MEDIA, // a media resource. + LAST_TYPE // Place holder so we don't need to change ValidType + // everytime. }; static bool ValidType(int32 type) { - return type >= MAIN_FRAME && type <= OBJECT; + return type >= MAIN_FRAME && type < LAST_TYPE; } static Type FromInt(int32 type) { diff --git a/webkit/port/platform/network/chromium/ResourceRequest.h b/webkit/port/platform/network/chromium/ResourceRequest.h index a0c1bb7..8e142c68 100644 --- a/webkit/port/platform/network/chromium/ResourceRequest.h +++ b/webkit/port/platform/network/chromium/ResourceRequest.h @@ -41,7 +41,8 @@ namespace WebCore { TargetIsMainFrame, TargetIsSubFrame, TargetIsSubResource, - TargetIsObject + TargetIsObject, + TargetIsMedia }; ResourceRequest(const String& url) |