Rename PPB_Flash::NavigateToURL() (to Navigate()) and make it take an URLRequestInfo.

webkit/plugins/ppapi/ppapi_plugin_instance.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/ppapi_plugin_instance.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/scoped_ptr.h"
@@ skipping 19 matching lines @@
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.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/WebInputEvent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/skia_util.h"
 #include "webkit/plugins/ppapi/common.h"
 #include "webkit/plugins/ppapi/event_conversion.h"
 #include "webkit/plugins/ppapi/fullscreen_container.h"
 #include "webkit/plugins/ppapi/message_channel.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/plugin_object.h"
 #include "webkit/plugins/ppapi/ppb_buffer_impl.h"
 #include "webkit/plugins/ppapi/ppb_graphics_2d_impl.h"
 #include "webkit/plugins/ppapi/ppb_image_data_impl.h"
 #include "webkit/plugins/ppapi/ppb_surface_3d_impl.h"
 #include "webkit/plugins/ppapi/ppb_url_loader_impl.h"
+#include "webkit/plugins/ppapi/ppb_url_request_info_impl.h"
 #include "webkit/plugins/ppapi/ppp_pdf.h"
 #include "webkit/plugins/ppapi/string.h"
 #include "webkit/plugins/ppapi/var.h"
 #include "webkit/plugins/sad_plugin.h"
 
 #if defined(OS_POSIX)
 #include "printing/native_metafile.h"
 #endif
 
 #if defined(OS_MACOSX)
@@ skipping 1057 matching lines @@
     fullscreen_ = false;
     if (!delay_report) {
       ReportGeometry();
     } else {
       MessageLoop::current()->PostTask(
           FROM_HERE, NewRunnableMethod(this, &PluginInstance::ReportGeometry));
     }
   }
 }
 
-bool PluginInstance::NavigateToURL(const char* url, const char* target) {
-  if (!url || !target || !container_)
-    return false;
+int32_t PluginInstance::Navigate(PPB_URLRequestInfo_Impl* request,
+                                 const char* target,
+                                 bool from_user_action) {
+  if (!container_)
+    return PP_ERROR_FAILED;
 
   WebDocument document = container_->element().document();
-  GURL complete_url = document.completeURL(WebString::fromUTF8(url));
-  // Don't try to deal with the security issues of javascript.
-  if (complete_url.SchemeIs("javascript"))
-    return false;
+  WebFrame* frame = document.frame();
+  if (!frame)
+    return PP_ERROR_FAILED;
+  WebURLRequest web_request(request->ToWebURLRequest(frame));
+  web_request.setFirstPartyForCookies(document.firstPartyForCookies());
+  web_request.setHasUserGesture(from_user_action);
 
-  WebURLRequest request(complete_url);
-  document.frame()->setReferrerForRequest(request, GURL());
-  request.setHTTPMethod(WebString::fromUTF8("GET"));
-  request.setFirstPartyForCookies(document.firstPartyForCookies());
-  request.setHasUserGesture(true);
+  if (GURL(web_request.url()).SchemeIs("javascript")) {
+    // TODO(vtl)
+    NOTIMPLEMENTED();
+    return PP_ERROR_FAILED;
+  }
+
+  // Only GETs and POSTs are supported.
+  if (web_request.httpMethod() != "GET" &&
+      web_request.httpMethod() != "POST")
+    return PP_ERROR_BADARGUMENT;
 
   WebString target_str = WebString::fromUTF8(target);
-  container_->loadFrameRequest(request, target_str, false, NULL);
-  return true;
+  container_->loadFrameRequest(web_request, target_str, false, NULL);
+  return PP_OK;
 }
 
 PluginDelegate::PlatformContext3D* PluginInstance::CreateContext3D() {
   if (fullscreen_container_)
     return fullscreen_container_->CreateContext3D();
   else
     return delegate_->CreateContext3D();
 }
 
 bool PluginInstance::PrintPDFOutput(PP_Resource print_output,
@@ skipping 287 matching lines @@
   return found->second;
 }
 
 bool PluginInstance::IsFullPagePlugin() const {
   WebFrame* frame = container()->element().document().frame();
   return frame->view()->mainFrame()->document().isPluginDocument();
 }
 
 }  // namespace ppapi
 }  // namespace webkit