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/script_traits/lib.rs | |
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/script_traits/lib.rs')
-rw-r--r-- | components/script_traits/lib.rs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs index 45e31ca3a0a..5f450a65911 100644 --- a/components/script_traits/lib.rs +++ b/components/script_traits/lib.rs @@ -246,6 +246,10 @@ pub enum UpdatePipelineIdReason { /// Messages sent from the constellation or layout to the script thread. #[derive(Deserialize, Serialize)] pub enum ConstellationControlMsg { + /// Takes the associated window proxy out of "delaying-load-events-mode", + /// used if a scheduled navigated was refused by the embedder. + /// https://html.spec.whatwg.org/multipage/#delaying-load-events-mode + StopDelayingLoadEventsMode(PipelineId), /// Sends the final response to script thread for fetching after all redirections /// have been resolved NavigationResponse(PipelineId, FetchResponseMsg), @@ -338,6 +342,7 @@ impl fmt::Debug for ConstellationControlMsg { fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result { use self::ConstellationControlMsg::*; let variant = match *self { + StopDelayingLoadEventsMode(..) => "StopDelayingLoadsEventMode", NavigationResponse(..) => "NavigationResponse", AttachLayout(..) => "AttachLayout", Resize(..) => "Resize", @@ -724,6 +729,8 @@ pub enum ConstellationMsg { IsReadyToSaveImage(HashMap<PipelineId, Epoch>), /// Inform the constellation of a key event. Keyboard(KeyboardEvent), + /// Whether to allow script to navigate. + AllowNavigationResponse(PipelineId, bool), /// Request to load a page. LoadUrl(TopLevelBrowsingContextId, ServoUrl), /// Request to traverse the joint session history of the provided browsing context. @@ -768,6 +775,7 @@ impl fmt::Debug for ConstellationMsg { GetFocusTopLevelBrowsingContext(..) => "GetFocusTopLevelBrowsingContext", IsReadyToSaveImage(..) => "IsReadyToSaveImage", Keyboard(..) => "Keyboard", + AllowNavigationResponse(..) => "AllowNavigationResponse", LoadUrl(..) => "LoadUrl", TraverseHistory(..) => "TraverseHistory", WindowSize(..) => "WindowSize", |