Fix problems with PPB_URLLoader_Impl and PPAPITests.URLLoader.

webkit/plugins/ppapi/ppb_url_loader_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.
 
 #include "webkit/plugins/ppapi/ppb_url_loader_impl.h"
 
 #include "base/logging.h"
+#include "net/base/net_errors.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_url_loader.h"
 #include "ppapi/c/trusted/ppb_url_loader_trusted.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKitClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebURLError.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLLoader.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLLoaderOptions.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLResponse.h"
 #include "webkit/appcache/web_application_cache_host_impl.h"
 #include "webkit/plugins/ppapi/common.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/ppb_url_request_info_impl.h"
 #include "webkit/plugins/ppapi/ppb_url_response_info_impl.h"
@@ skipping 211 matching lines @@
   }
 }
 
 int32_t PPB_URLLoader_Impl::Open(PPB_URLRequestInfo_Impl* request,
                                  PP_CompletionCallback callback) {
   int32_t rv = ValidateCallback(callback);
   if (rv != PP_OK)
     return rv;
 
   if (request->RequiresUniversalAccess() && !has_universal_access_)
     return PP_ERROR_BADARGUMENT;

[bbudge, 2011/06/15 22:56:56]

I'm going to change this to PP_ERROR_NOACCESS per Polina's request.

 
   if (loader_.get())
     return PP_ERROR_INPROGRESS;
 
   WebFrame* frame = GetFrame(instance());
   if (!frame)
     return PP_ERROR_FAILED;
   WebURLRequest web_request(request->ToWebURLRequest(frame));
 
   WebURLLoaderOptions options;
@@ skipping 11 matching lines @@
 
   is_asynchronous_load_suspended_ = false;
   loader_.reset(frame->createAssociatedURLLoader(options));
   if (!loader_.get())
     return PP_ERROR_FAILED;
 
   loader_->loadAsynchronously(web_request, this);
   // Check for immediate failure; The AssociatedURLLoader will call our
   // didFail method synchronously for certain kinds of access violations
   // so we must return an error to the caller.
-  // TODO(bbudge) Modify the underlying AssociatedURLLoader to only call
-  // back asynchronously.
-  if (done_status_ == PP_ERROR_FAILED)
-    return PP_ERROR_NOACCESS;
+  // TODO(bbudge) Remove this code when AssociatedURLLoader is changed to
+  // return errors asynchronously.
+  if (done_status_ == PP_ERROR_FAILED ||
+      done_status_ == PP_ERROR_NOACCESS)
+    return done_status_;
 
   request_info_ = scoped_refptr<PPB_URLRequestInfo_Impl>(request);
 
   // Notify completion when we receive a redirect or response headers.
   RegisterCallback(callback);
   return PP_OK_COMPLETIONPENDING;
 }
 
 int32_t PPB_URLLoader_Impl::FollowRedirect(PP_CompletionCallback callback) {
   int32_t rv = ValidateCallback(callback);
@@ skipping 172 matching lines @@
 }
 
 void PPB_URLLoader_Impl::didFinishLoading(WebURLLoader* loader,
                                           double finish_time) {
   done_status_ = PP_OK;
   RunCallback(done_status_);
 }
 
 void PPB_URLLoader_Impl::didFail(WebURLLoader* loader,
                                  const WebURLError& error) {
-  // TODO(darin): Provide more detailed error information.
-  done_status_ = PP_ERROR_FAILED;
+  // By default report PP_ERROR_NOACCESS. This assumes that errors from WebKit
+  // are access errors.
+  done_status_ = PP_ERROR_NOACCESS;
+  // For our 'net' error domain, report all non-access errors as

[darin (slow to review), 2011/06/15 23:00:20]

nit: these comments just summarize what the code does.  maybe they aren't
needed?

I think the code might be plenty readable without so many comments:

  if (...conditions...) {
    // TODO(bbudge): Extend pp_errors.h to cover interesting network errors.
    done_status_ = PP_ERROR_FAILED;
  } else {
    // Assume we encountered some kind of access error.
    done_status_ = PP_ERROR_NOACCESS;
  }

It would probably be very nice to extend pp_errors.h to have interesting network
related error codes like "connection failed", "host not found", etc.  I'd expect
to replace PP_ERROR_FAILED with some kind of mapping function that understands
net_errors.h.

[bbudge, 2011/06/15 23:50:21]

Done.

+  // PP_ERROR_FAILED.
+  if (error.domain.equals(WebString::fromUTF8(net::kErrorDomain)) &&
+      error.reason != net::ERR_ACCESS_DENIED &&
+      error.reason != net::ERR_NETWORK_ACCESS_DENIED)
+    done_status_ = PP_ERROR_FAILED;
+
   RunCallback(done_status_);
 }
 
 int32_t PPB_URLLoader_Impl::ValidateCallback(PP_CompletionCallback callback) {
   // We only support non-blocking calls.
   if (!callback.func)
     return PP_ERROR_BADARGUMENT;
 
   if (pending_callback_.get() && !pending_callback_->completed())
     return PP_ERROR_INPROGRESS;
@@ skipping 83 matching lines @@
 bool PPB_URLLoader_Impl::RecordDownloadProgress() const {
   return request_info_ && request_info_->record_download_progress();
 }
 
 bool PPB_URLLoader_Impl::RecordUploadProgress() const {
   return request_info_ && request_info_->record_upload_progress();
 }
 
 }  // namespace ppapi
 }  // namespace webkit