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

webdriver: Assume more consistently that the BrowsingContext exists (#37389)

Browse source 
1. Tidy up some WebDriver handling with browsing context
2. Enable more wpt-test which no longer panic

Testing: `./mach test-wpt -r --log-raw "D:\servo test log\all.txt"
.\tests\wpt\tests\webdriver\tests\classic\ --product servodriver`

---------

Signed-off-by: Euclid Ye <yezhizhenjiakang@gmail.com>
This commit is contained in:
Euclid Ye 2025-06-11 22:23:47 +08:00 • committed by GitHub
parent fab958258e
commit c1ee354c38
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 28 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

33
components/constellation/constellation.rs
View file

@ -4780,12 +4780,11 @@ where
},
WebDriverCommandMsg::Refresh(webview_id, response_sender) => {
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!("{}: Refresh after closure", browsing_context_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),
@ -4799,12 +4798,11 @@ where
},
// TODO: This should use the ScriptThreadMessage::EvaluateJavaScript command
WebDriverCommandMsg::ScriptCommand(browsing_context_id, cmd) => {
let pipeline_id = match self.browsing_contexts.get(&browsing_context_id) {
Some(browsing_context) => browsing_context.pipeline_id,
None => {
return warn!("{}: ScriptCommand after closure", browsing_context_id);
},
};
let pipeline_id = self
.browsing_contexts
.get(&browsing_context_id)
.expect("ScriptCommand: Browsing context must exist at this point")
.pipeline_id;
let control_msg = ScriptThreadMessage::WebDriverScriptCommand(pipeline_id, cmd);
let result = match self.pipelines.get(&pipeline_id) {
Some(pipeline) => pipeline.event_loop.send(control_msg),
@ -4815,12 +4813,11 @@ where
}
},
WebDriverCommandMsg::SendKeys(browsing_context_id, cmd) => {
let pipeline_id = match self.browsing_contexts.get(&browsing_context_id) {
Some(browsing_context) => browsing_context.pipeline_id,
None => {
return warn!("{}: SendKeys after closure", browsing_context_id);
},
};
let pipeline_id = self
.browsing_contexts
.get(&browsing_context_id)
.expect("SendKeys: Browsing context must exist at this point")
.pipeline_id;
let event_loop = match self.pipelines.get(&pipeline_id) {
Some(pipeline) => pipeline.event_loop.clone(),
None => return warn!("{}: SendKeys after closure", pipeline_id),