Add support for WebURLRequest::TargetIsXHR (part I)

webkit/glue/weburlloader_impl.cc

 // 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.
 
 // An implementation of WebURLLoader in terms of ResourceLoaderBridge.
 
 #include "webkit/glue/weburlloader_impl.h"
 
 #include "base/file_path.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 121 matching lines @@
     case WebURLRequest::TargetIsWorker:
       return ResourceType::WORKER;
     case WebURLRequest::TargetIsSharedWorker:
       return ResourceType::SHARED_WORKER;
     case WebURLRequest::TargetIsPrefetch:
       return ResourceType::PREFETCH;
     case WebURLRequest::TargetIsPrerender:
       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;
   }
 }
 
 // Extracts the information from a data: url.
 bool GetInfoFromDataURL(const GURL& url,
                         ResourceResponseInfo* info,
                         std::string* data,
@@ skipping 604 matching lines @@
 
 void WebURLLoaderImpl::cancel() {
   context_->Cancel();
 }
 
 void WebURLLoaderImpl::setDefersLoading(bool value) {
   context_->SetDefersLoading(value);
 }
 
 }  // namespace webkit_glue