diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-12-26 01:53:20 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-26 01:53:20 -0500 |
commit | 66223ee1054a36a093cf5ded065f6fc6d3fecd8b (patch) | |
tree | 71b445b09cad26eef9a815807d85975ed69efd7f /components/embedder_traits | |
parent | 69e90a83bc480c13c4aa4165b9d2c432b54a4069 (diff) | |
parent | cca354b217f4f8c7d92229ec88adde83b8300daa (diff) | |
download | servo-66223ee1054a36a093cf5ded065f6fc6d3fecd8b.tar.gz servo-66223ee1054a36a093cf5ded065f6fc6d3fecd8b.zip |
Auto merge of #22121 - gterzian:remove_constellation_block_in_navigation, r=paulrouget
Remove sync constellation -> embedder communication
<!-- Please describe your changes on the following line: -->
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [ ] `./mach test-tidy` does not report any errors
- [ ] These changes fix #22042 (github issue number if applicable).
<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____
<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22121)
<!-- Reviewable:end -->
Diffstat (limited to 'components/embedder_traits')
-rw-r--r-- | components/embedder_traits/lib.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/components/embedder_traits/lib.rs b/components/embedder_traits/lib.rs index 93c3275522d..e25ad11d13e 100644 --- a/components/embedder_traits/lib.rs +++ b/components/embedder_traits/lib.rs @@ -14,7 +14,7 @@ pub mod resources; use crossbeam_channel::{Receiver, Sender}; use ipc_channel::ipc::IpcSender; use keyboard_types::KeyboardEvent; -use msg::constellation_msg::{InputMethodType, TopLevelBrowsingContextId}; +use msg::constellation_msg::{InputMethodType, PipelineId, TopLevelBrowsingContextId}; use servo_url::ServoUrl; use std::fmt::{Debug, Error, Formatter}; use style_traits::cursor::CursorKind; @@ -79,8 +79,8 @@ pub enum EmbedderMsg { ResizeTo(DeviceIntSize), // Show an alert message. Alert(String, IpcSender<()>), - /// Wether or not to follow a link - AllowNavigation(ServoUrl, IpcSender<bool>), + /// Wether or not to allow a pipeline to load a url. + AllowNavigationRequest(PipelineId, ServoUrl), /// Whether or not to allow script to open a new tab/browser AllowOpeningBrowser(IpcSender<bool>), /// A new browser was created by script @@ -128,7 +128,7 @@ impl Debug for EmbedderMsg { EmbedderMsg::ResizeTo(..) => write!(f, "ResizeTo"), EmbedderMsg::Alert(..) => write!(f, "Alert"), EmbedderMsg::AllowUnload(..) => write!(f, "AllowUnload"), - EmbedderMsg::AllowNavigation(..) => write!(f, "AllowNavigation"), + EmbedderMsg::AllowNavigationRequest(..) => write!(f, "AllowNavigationRequest"), EmbedderMsg::Keyboard(..) => write!(f, "Keyboard"), EmbedderMsg::SetCursor(..) => write!(f, "SetCursor"), EmbedderMsg::NewFavicon(..) => write!(f, "NewFavicon"), |