PlzNavigate: AppCache support.

content/renderer/render_frame_impl.cc

 // Copyright 2013 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 "content/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 48 matching lines @@
 #include "content/common/frame_replication_state.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "content/common/input_messages.h"
 #include "content/common/navigation_params.h"
 #include "content/common/page_messages.h"
 #include "content/common/savable_subframe.h"
 #include "content/common/service_worker/service_worker_types.h"
 #include "content/common/site_isolation_policy.h"
 #include "content/common/swapped_out_messages.h"
 #include "content/common/view_messages.h"
+#include "content/public/common/appcache_info.h"
 #include "content/public/common/associated_interface_provider.h"
 #include "content/public/common/bindings_policy.h"
 #include "content/public/common/browser_side_navigation_policy.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/context_menu_params.h"
 #include "content/public/common/file_chooser_file_info.h"
 #include "content/public/common/file_chooser_params.h"
 #include "content/public/common/form_field_data.h"
@@ skipping 1021 matching lines @@
       is_pasting_(false),
       suppress_further_dialogs_(false),
       blame_context_(nullptr),
 #if BUILDFLAG(ENABLE_PLUGINS)
       focused_pepper_plugin_(nullptr),
       pepper_last_mouse_event_target_(nullptr),
 #endif
       frame_binding_(this),
       host_zoom_binding_(this),
       has_accessed_initial_document_(false),
+      appcache_host_id_(kAppCacheNoHostId),
       weak_factory_(this) {
   // We don't have a service_manager::Connection at this point, so use empty
   // identity/specs.
   // TODO(beng): We should fix this, so we can apply policy about which
   //             interfaces get exposed.
   interface_registry_ = base::MakeUnique<service_manager::InterfaceRegistry>(
       mojom::kNavigation_FrameSpec);
   service_manager::mojom::InterfaceProviderPtr remote_interfaces;
   pending_remote_interface_provider_request_ = GetProxy(&remote_interfaces);
   remote_interfaces_.reset(new service_manager::InterfaceProvider);
@@ skipping 1726 matching lines @@
 #endif
   return media_player;
 }
 
 blink::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost(
     blink::WebApplicationCacheHostClient* client) {
   if (!frame_ || !frame_->view())
     return NULL;
   return new RendererWebApplicationCacheHostImpl(
       RenderViewImpl::FromWebView(frame_->view()), client,
-      RenderThreadImpl::current()->appcache_dispatcher()->backend_proxy());
+      RenderThreadImpl::current()->appcache_dispatcher()->backend_proxy(),
+      appcache_host_id_);
 }
 
 blink::WebWorkerContentSettingsClientProxy*
 RenderFrameImpl::createWorkerContentSettingsClientProxy() {
   if (!frame_ || !frame_->view())
     return NULL;
   return GetContentClient()->renderer()->CreateWorkerContentSettingsClientProxy(
       this, frame_);
 }
 
@@ skipping 2125 matching lines @@
   stream_override->response = response;
   stream_override->redirects = request_params.redirects;
   stream_override->redirect_responses = request_params.redirect_response;
 
   // If the request was initiated in the context of a user gesture then make
   // sure that the navigation also executes in the context of a user gesture.
   std::unique_ptr<blink::WebScopedUserGesture> gesture(
       request_params.has_user_gesture ? new blink::WebScopedUserGesture(frame_)
                                       : nullptr);
 
+  appcache_host_id_ = request_params.appcache_host_id;

[clamy, 2016/11/25 13:32:24]

We store the request params in NavigateInternal, so we should manage to get the
id directly from them and avoid adding an extra parameter to RenderFrameImpl.

[ananta, 2016/11/28 21:36:53]

We save the request params in the pending_navigation_params_ member. However
that gets reset before the RenderFrameImpl::createApplicationCacheHost()
function is called. Leaving this as is.

[clamy, 2016/11/30 17:40:22]

You can still access them through the DataSource DocumentState's NavigationState
(in its NavigationStateImpl version). I would prefer we use them rather than
adding a member variable.

[ananta, 2016/12/01 05:14:59]

It looks like the right value is available via the provisionalDataSource()
function in the frame. I changed the code to look for the
RequestNavigationParams() first in the provisional data source and if that is
not available then in the regular data source. This works correctly. Please 
check and see if this is ok.

[clamy, 2016/12/01 10:02:47]

Absolutely, this is what I meant. Sorry my comment wasn't clear: I forgot to
mention that I was talking about the provisional DataSource and not the current
one.

+
   NavigateInternal(common_params, StartNavigationParams(), request_params,
                    std::move(stream_override));
+
+  appcache_host_id_ = kAppCacheNoHostId;
+
   browser_side_navigation_pending_ = false;
 }
 
 // PlzNavigate
 void RenderFrameImpl::OnFailedNavigation(
     const CommonNavigationParams& common_params,
     const RequestNavigationParams& request_params,
     bool has_stale_copy_in_cache,
     int error_code) {
   DCHECK(IsBrowserSideNavigationEnabled());
@@ skipping 1629 matching lines @@
   // event target. Potentially a Pepper plugin will receive the event.
   // In order to tell whether a plugin gets the last mouse event and which it
   // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
   // the event, it will notify us via DidReceiveMouseEvent() and set itself as
   // |pepper_last_mouse_event_target_|.
   pepper_last_mouse_event_target_ = nullptr;
 #endif
 }
 
 }  // namespace content