Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "content/renderer/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 4245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4256 } | 4256 } |
| 4257 ChildThreadImpl::current()->quota_dispatcher()->RequestStorageQuota( | 4257 ChildThreadImpl::current()->quota_dispatcher()->RequestStorageQuota( |
| 4258 render_view_->GetRoutingID(), | 4258 render_view_->GetRoutingID(), |
| 4259 blink::WebStringToGURL(origin.toString()), | 4259 blink::WebStringToGURL(origin.toString()), |
| 4260 static_cast<storage::StorageType>(type), | 4260 static_cast<storage::StorageType>(type), |
| 4261 requested_size, | 4261 requested_size, |
| 4262 QuotaDispatcher::CreateWebStorageQuotaCallbacksWrapper(callbacks)); | 4262 QuotaDispatcher::CreateWebStorageQuotaCallbacksWrapper(callbacks)); |
| 4263 } | 4263 } |
| 4264 | 4264 |
| 4265 void RenderFrameImpl::willOpenWebSocket(blink::WebSocketHandle* handle) { | 4265 void RenderFrameImpl::willOpenWebSocket(blink::WebSocketHandle* handle) { |
| 4266 WebSocketBridge* impl = static_cast<WebSocketBridge*>(handle); | 4266 static_cast<WebSocketBridge*>(handle)->Initialize(GetServiceRegistry()); |
|
Ben Goodger (Google)
2016/07/01 21:19:51
Do you have an opinion about whether it'd be bette
darin (slow to review)
2016/07/06 16:57:21
Good question. I'm not sure what is better.
| |
| 4267 impl->set_render_frame_id(routing_id_); | |
| 4268 } | 4267 } |
| 4269 | 4268 |
| 4270 blink::WebPresentationClient* RenderFrameImpl::presentationClient() { | 4269 blink::WebPresentationClient* RenderFrameImpl::presentationClient() { |
| 4271 if (!presentation_dispatcher_) | 4270 if (!presentation_dispatcher_) |
| 4272 presentation_dispatcher_ = new PresentationDispatcher(this); | 4271 presentation_dispatcher_ = new PresentationDispatcher(this); |
| 4273 return presentation_dispatcher_; | 4272 return presentation_dispatcher_; |
| 4274 } | 4273 } |
| 4275 | 4274 |
| 4276 blink::WebPushClient* RenderFrameImpl::pushClient() { | 4275 blink::WebPushClient* RenderFrameImpl::pushClient() { |
| 4277 if (!push_messaging_dispatcher_) | 4276 if (!push_messaging_dispatcher_) |
| (...skipping 1977 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 6255 // event target. Potentially a Pepper plugin will receive the event. | 6254 // event target. Potentially a Pepper plugin will receive the event. |
| 6256 // In order to tell whether a plugin gets the last mouse event and which it | 6255 // In order to tell whether a plugin gets the last mouse event and which it |
| 6257 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets | 6256 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets |
| 6258 // the event, it will notify us via DidReceiveMouseEvent() and set itself as | 6257 // the event, it will notify us via DidReceiveMouseEvent() and set itself as |
| 6259 // |pepper_last_mouse_event_target_|. | 6258 // |pepper_last_mouse_event_target_|. |
| 6260 pepper_last_mouse_event_target_ = nullptr; | 6259 pepper_last_mouse_event_target_ = nullptr; |
| 6261 #endif | 6260 #endif |
| 6262 } | 6261 } |
| 6263 | 6262 |
| 6264 } // namespace content | 6263 } // namespace content |
| OLD | NEW |