| 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 4951 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4962 base::debug::SetCrashKeyValue("origin_mismatch_url", params.url.spec()); | 4962 base::debug::SetCrashKeyValue("origin_mismatch_url", params.url.spec()); |
| 4963 base::debug::SetCrashKeyValue("origin_mismatch_origin", | 4963 base::debug::SetCrashKeyValue("origin_mismatch_origin", |
| 4964 params.origin.Serialize()); | 4964 params.origin.Serialize()); |
| 4965 base::debug::SetCrashKeyValue("origin_mismatch_transition", | 4965 base::debug::SetCrashKeyValue("origin_mismatch_transition", |
| 4966 base::IntToString(params.transition)); | 4966 base::IntToString(params.transition)); |
| 4967 base::debug::SetCrashKeyValue("origin_mismatch_redirects", | 4967 base::debug::SetCrashKeyValue("origin_mismatch_redirects", |
| 4968 base::IntToString(params.redirects.size())); | 4968 base::IntToString(params.redirects.size())); |
| 4969 base::debug::SetCrashKeyValue( | 4969 base::debug::SetCrashKeyValue( |
| 4970 "origin_mismatch_same_page", | 4970 "origin_mismatch_same_page", |
| 4971 base::IntToString(params.was_within_same_page)); | 4971 base::IntToString(params.was_within_same_page)); |
| 4972 CHECK(params.origin.IsSameOriginWith(url::Origin(params.url))) | 4972 CHECK(params.origin.IsSamePhysicalOriginWith(url::Origin(params.url))) |
| 4973 << " url:" << params.url << " origin:" << params.origin; | 4973 << " url:" << params.url << " origin:" << params.origin; |
| 4974 } | 4974 } |
| 4975 } | 4975 } |
| 4976 | 4976 |
| 4977 // This message needs to be sent before any of allowScripts(), | 4977 // This message needs to be sent before any of allowScripts(), |
| 4978 // allowImages(), allowPlugins() is called for the new page, so that when | 4978 // allowImages(), allowPlugins() is called for the new page, so that when |
| 4979 // these functions send a ViewHostMsg_ContentBlocked message, it arrives | 4979 // these functions send a ViewHostMsg_ContentBlocked message, it arrives |
| 4980 // after the FrameHostMsg_DidCommitProvisionalLoad message. | 4980 // after the FrameHostMsg_DidCommitProvisionalLoad message. |
| 4981 Send(new FrameHostMsg_DidCommitProvisionalLoad(routing_id_, params)); | 4981 Send(new FrameHostMsg_DidCommitProvisionalLoad(routing_id_, params)); |
| 4982 | 4982 |
| (...skipping 1646 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6629 // event target. Potentially a Pepper plugin will receive the event. | 6629 // event target. Potentially a Pepper plugin will receive the event. |
| 6630 // In order to tell whether a plugin gets the last mouse event and which it | 6630 // In order to tell whether a plugin gets the last mouse event and which it |
| 6631 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets | 6631 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets |
| 6632 // the event, it will notify us via DidReceiveMouseEvent() and set itself as | 6632 // the event, it will notify us via DidReceiveMouseEvent() and set itself as |
| 6633 // |pepper_last_mouse_event_target_|. | 6633 // |pepper_last_mouse_event_target_|. |
| 6634 pepper_last_mouse_event_target_ = nullptr; | 6634 pepper_last_mouse_event_target_ = nullptr; |
| 6635 #endif | 6635 #endif |
| 6636 } | 6636 } |
| 6637 | 6637 |
| 6638 } // namespace content | 6638 } // namespace content |
| OLD | NEW |