aboutsummaryrefslogtreecommitdiffstats
path: root/components/script_traits/webdriver_msg.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-05-16 23:10:45 -0500
committerGitHub <noreply@github.com>2017-05-16 23:10:45 -0500
commit837531992864f920342020462830b933d5ed0280 (patch)
treea79281756cb68f6e37c75901de88129c511c3473 /components/script_traits/webdriver_msg.rs
parentfada0eb6607fa746cd88426ebb7bb4052f709cda (diff)
parent607e011b050f22e10a69fc7d57d7e2dc473d979e (diff)
downloadservo-837531992864f920342020462830b933d5ed0280.tar.gz
servo-837531992864f920342020462830b933d5ed0280.zip
Auto merge of #16876 - asajeffrey:constellation-rename-frames, r=cbrewster
Renamed constellation::Frame to constellation::BrowsingContext <!-- Please describe your changes on the following line: --> Now that script has `WindowProxy` rather than `BrowsingContext` objects, we can rename `Frame` in the constellation to `BrowsingContext`. In particular, this means that `FrameId`s are now `BrowsingContextid`s, which better captures their purpose (and they are used in a lot of places, not just the constellation). --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes do not require tests because renaming <!-- 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/16876) <!-- Reviewable:end -->
Diffstat (limited to 'components/script_traits/webdriver_msg.rs')
-rw-r--r--components/script_traits/webdriver_msg.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/components/script_traits/webdriver_msg.rs b/components/script_traits/webdriver_msg.rs
index c09f1f19dae..b92e32ff65c 100644
--- a/components/script_traits/webdriver_msg.rs
+++ b/components/script_traits/webdriver_msg.rs
@@ -31,7 +31,7 @@ pub enum WebDriverScriptCommand {
GetElementRect(String, IpcSender<Result<Rect<f64>, ()>>),
GetElementTagName(String, IpcSender<Result<String, ()>>),
GetElementText(String, IpcSender<Result<String, ()>>),
- GetFrameId(WebDriverFrameId, IpcSender<Result<Option<PipelineId>, ()>>),
+ GetPipelineId(WebDriverFrameId, IpcSender<Result<Option<PipelineId>, ()>>),
GetUrl(IpcSender<ServoUrl>),
IsEnabled(String, IpcSender<Result<bool, ()>>),
IsSelected(String, IpcSender<Result<bool, ()>>),