OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "components/html_viewer/html_document_oopif.h" | 5 #include "components/html_viewer/html_document_oopif.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "base/single_thread_task_runner.h" | 9 #include "base/single_thread_task_runner.h" |
10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
125 view->viewport_metrics().size_in_pixels.To<gfx::Size>(), | 125 view->viewport_metrics().size_in_pixels.To<gfx::Size>(), |
126 view->viewport_metrics().device_pixel_ratio); | 126 view->viewport_metrics().device_pixel_ratio); |
127 | 127 |
128 view->RemoveObserver(this); | 128 view->RemoveObserver(this); |
129 | 129 |
130 WebURLRequestExtraData* extra_data = new WebURLRequestExtraData; | 130 WebURLRequestExtraData* extra_data = new WebURLRequestExtraData; |
131 extra_data->synthetic_response = | 131 extra_data->synthetic_response = |
132 resource_waiter_->ReleaseURLResponse().Pass(); | 132 resource_waiter_->ReleaseURLResponse().Pass(); |
133 | 133 |
134 frame_ = HTMLFrameTreeManager::CreateFrameAndAttachToTree( | 134 frame_ = HTMLFrameTreeManager::CreateFrameAndAttachToTree( |
135 global_state_, html_document_app_, view, resource_waiter_.Pass(), this); | 135 global_state_, view, resource_waiter_.Pass(), this); |
yzshen1
2015/08/17 05:46:38
Is it included in this patch unintentionally?
msw
2015/08/17 21:25:50
No, this param is unused, so I'm removing it. I wa
| |
136 | 136 |
137 // TODO(yzshen): http://crbug.com/498986 Creating DevToolsAgentImpl instances | 137 // TODO(yzshen): http://crbug.com/498986 Creating DevToolsAgentImpl instances |
138 // causes html_viewer_apptests flakiness currently. Before we fix that we | 138 // causes html_viewer_apptests flakiness currently. Before we fix that we |
139 // cannot enable remote debugging (which is required by Telemetry tests) on | 139 // cannot enable remote debugging (which is required by Telemetry tests) on |
140 // the bots. | 140 // the bots. |
141 if (EnableRemoteDebugging() && !frame_->parent()) { | 141 if (EnableRemoteDebugging() && !frame_->parent()) { |
142 devtools_agent_.reset(new DevToolsAgentImpl( | 142 devtools_agent_.reset(new DevToolsAgentImpl( |
143 frame_->web_frame()->toWebLocalFrame(), html_document_app_->shell())); | 143 frame_->web_frame()->toWebLocalFrame(), html_document_app_->shell())); |
144 } | 144 } |
145 | 145 |
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
245 mojo::ApplicationConnection* connection, | 245 mojo::ApplicationConnection* connection, |
246 mojo::InterfaceRequest<mandoline::FrameTreeClient> request) { | 246 mojo::InterfaceRequest<mandoline::FrameTreeClient> request) { |
247 if (frame_) { | 247 if (frame_) { |
248 DVLOG(1) << "Request for FrameTreeClient after one already vended."; | 248 DVLOG(1) << "Request for FrameTreeClient after one already vended."; |
249 return; | 249 return; |
250 } | 250 } |
251 resource_waiter_->Bind(request.Pass()); | 251 resource_waiter_->Bind(request.Pass()); |
252 } | 252 } |
253 | 253 |
254 } // namespace html_viewer | 254 } // namespace html_viewer |
OLD | NEW |