Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

webdriver: Move navigation commands to servoshell (#37665)

Browse source 
- Move webdriver `GetViewportSize`, `LoadURL` and `Refresh` to
servoshell.
- Add `GoBack` and `GoFoward` commands.

Testing: Need to finish moving webdriver to servoshell then evaluate
again
Fixes: https://github.com/servo/servo/issues/37370

Signed-off-by: batu_hoang <longvatrong111@gmail.com>
This commit is contained in:
batu_hoang 2025-06-25 20:35:13 +08:00 • committed by GitHub
parent 0346a62214
commit 62a009399f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 61 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

80
components/constellation/constellation.rs
View file

@ -4558,53 +4558,17 @@ where
WebDriverCommandMsg::GetWindowSize(..) => {
unreachable!("This command should be send directly to the embedder.");
},
WebDriverCommandMsg::GetViewportSize(webview_id, response_sender) => {
let browsing_context_id = BrowsingContextId::from(webview_id);
let size = self
.browsing_contexts
.get(&browsing_context_id)
.map(|browsing_context| browsing_context.viewport_details.size)
.unwrap_or_default();
let _ = response_sender.send(size);
WebDriverCommandMsg::GetViewportSize(..) => {
unreachable!("This command should be send directly to the embedder.");
},
WebDriverCommandMsg::SetWindowSize(..) => {
unreachable!("This command should be send directly to the embedder.");
},
WebDriverCommandMsg::LoadUrl(webview_id, url, response_sender) => {
let load_data = LoadData::new(
LoadOrigin::WebDriver,
url,
None,
Referrer::NoReferrer,
ReferrerPolicy::EmptyString,
None,
None,
false,
);
self.load_url_for_webdriver(
webview_id,
load_data,
response_sender,
NavigationHistoryBehavior::Push,
);
WebDriverCommandMsg::LoadUrl(..) => {
unreachable!("This command should be send directly to the embedder.");
},
WebDriverCommandMsg::Refresh(webview_id, response_sender) => {
let browsing_context_id = BrowsingContextId::from(webview_id);
let pipeline_id = self
.browsing_contexts
.get(&browsing_context_id)
.expect("Refresh: Browsing context must exist at this point")
.pipeline_id;
let load_data = match self.pipelines.get(&pipeline_id) {
Some(pipeline) => pipeline.load_data.clone(),
None => return warn!("{}: Refresh after closure", pipeline_id),
};
self.load_url_for_webdriver(
webview_id,
load_data,
response_sender,
NavigationHistoryBehavior::Replace,
);
WebDriverCommandMsg::Refresh(..) => {
unreachable!("This command should be send directly to the embedder.");
},
// TODO: This should use the ScriptThreadMessage::EvaluateJavaScript command
WebDriverCommandMsg::ScriptCommand(browsing_context_id, cmd) => {
@ -4873,38 +4837,6 @@ where
));
}
#[servo_tracing::instrument(skip_all)]
fn load_url_for_webdriver(
&mut self,
webview_id: WebViewId,
load_data: LoadData,
response_sender: IpcSender<WebDriverLoadStatus>,
history_handling: NavigationHistoryBehavior,
) {
let browsing_context_id = BrowsingContextId::from(webview_id);
let pipeline_id = match self.browsing_contexts.get(&browsing_context_id) {
Some(browsing_context) => browsing_context.pipeline_id,
None => {
return warn!(
"{}: Webdriver load for closed browsing context",
browsing_context_id
);
},
};
if let Some(new_pipeline_id) =
self.load_url(webview_id, pipeline_id, load_data, history_handling)
{
debug!(
"Setting up webdriver load notification for {:?}",
new_pipeline_id
);
self.webdriver.load_channel = Some((new_pipeline_id, response_sender));
} else {
let _ = response_sender.send(WebDriverLoadStatus::Canceled);
}
}
#[servo_tracing::instrument(skip_all)]
fn change_session_history(&mut self, change: SessionHistoryChange) {
debug!(