| 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 1618 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1629 // clean this frame up after https://crbug.com/548275 is fixed. | 1629 // clean this frame up after https://crbug.com/548275 is fixed. |
| 1630 if (proxy_routing_id_ != MSG_ROUTING_NONE) { | 1630 if (proxy_routing_id_ != MSG_ROUTING_NONE) { |
| 1631 RenderFrameProxy* proxy = | 1631 RenderFrameProxy* proxy = |
| 1632 RenderFrameProxy::FromRoutingID(proxy_routing_id_); | 1632 RenderFrameProxy::FromRoutingID(proxy_routing_id_); |
| 1633 if (!proxy) | 1633 if (!proxy) |
| 1634 return; | 1634 return; |
| 1635 } | 1635 } |
| 1636 | 1636 |
| 1637 RenderThreadImpl* render_thread_impl = RenderThreadImpl::current(); | 1637 RenderThreadImpl* render_thread_impl = RenderThreadImpl::current(); |
| 1638 // Can be NULL in tests. | 1638 // Can be NULL in tests. |
| 1639 if (render_thread_impl) | 1639 if (render_thread_impl && IsMainFrame()) |
| 1640 render_thread_impl->GetRendererScheduler()->OnNavigationStarted(); | 1640 render_thread_impl->GetRendererScheduler()->OnNavigationStarted(); |
| 1641 DCHECK(!IsBrowserSideNavigationEnabled()); | 1641 DCHECK(!IsBrowserSideNavigationEnabled()); |
| 1642 TRACE_EVENT2("navigation,rail", "RenderFrameImpl::OnNavigate", "id", | 1642 TRACE_EVENT2("navigation,rail", "RenderFrameImpl::OnNavigate", "id", |
| 1643 routing_id_, "url", common_params.url.possibly_invalid_spec()); | 1643 routing_id_, "url", common_params.url.possibly_invalid_spec()); |
| 1644 NavigateInternal(common_params, start_params, request_params, | 1644 NavigateInternal(common_params, start_params, request_params, |
| 1645 std::unique_ptr<StreamOverrideParameters>()); | 1645 std::unique_ptr<StreamOverrideParameters>()); |
| 1646 } | 1646 } |
| 1647 | 1647 |
| 1648 void RenderFrameImpl::Bind(mojom::FrameRequest request, | 1648 void RenderFrameImpl::Bind(mojom::FrameRequest request, |
| 1649 mojom::FrameHostPtr host) { | 1649 mojom::FrameHostPtr host) { |
| (...skipping 4851 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6501 // event target. Potentially a Pepper plugin will receive the event. | 6501 // event target. Potentially a Pepper plugin will receive the event. |
| 6502 // In order to tell whether a plugin gets the last mouse event and which it | 6502 // In order to tell whether a plugin gets the last mouse event and which it |
| 6503 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets | 6503 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets |
| 6504 // the event, it will notify us via DidReceiveMouseEvent() and set itself as | 6504 // the event, it will notify us via DidReceiveMouseEvent() and set itself as |
| 6505 // |pepper_last_mouse_event_target_|. | 6505 // |pepper_last_mouse_event_target_|. |
| 6506 pepper_last_mouse_event_target_ = nullptr; | 6506 pepper_last_mouse_event_target_ = nullptr; |
| 6507 #endif | 6507 #endif |
| 6508 } | 6508 } |
| 6509 | 6509 |
| 6510 } // namespace content | 6510 } // namespace content |
| OLD | NEW |