Add support for WebURLRequest::TargetIsXHR (part I)

webkit/glue/weburlloader_impl.cc

Index: webkit/glue/weburlloader_impl.cc
diff --git a/webkit/glue/weburlloader_impl.cc b/webkit/glue/weburlloader_impl.cc
index 5e3ddef1219fbe1ec87e27d03dbe66667172f14a..8edea6fd70e3f6ae4c316a5d683da206ad49b373 100644
--- a/webkit/glue/weburlloader_impl.cc
+++ b/webkit/glue/weburlloader_impl.cc
@@ -139,6 +139,17 @@ ResourceType::Type FromTargetType(WebURLRequest::TargetType type) {
       return ResourceType::PRERENDER;
     case WebURLRequest::TargetIsFavicon:
       return ResourceType::FAVICON;
+    // TODO(jochen): replace with WebURLRequest::TargetIsXHR and remove the
+    // #pragma as soon as WebKit side has landed.
+#if defined(OS_WIN)

[darin (slow to review), 2011/08/02 19:32:08]

the way we typically accomplish this is with an #if
defined(WEBKIT_HAS_TARGET_TYPE_XHR) or some such macro.  then you would just
write:

 #if defined(WEBKIT_HAS_TARGET_TYPE_XHR)
     case WebURLRequest::TargetIsXHR:
       return ResourceType::XHR;
 #endif

And, in the WebKit patch, WebURLRequest.h would define that macro.

+#pragma warning(push)
+#pragma warning(disable : 4063)
+#endif
+    case 14:
+      return ResourceType::XHR;
+#if defined(OS_WIN)
+#pragma warning(pop)
+#endif
     default:
       NOTREACHED();
       return ResourceType::SUB_RESOURCE;