Join GitHub today
GitHub is home to over 50 million developers working together to host and review code, manage projects, and build software together.
Sign upCheck if represented attributes are cached #14567
Merged
Conversation
highfive
commented
Dec 13, 2016
|
Heads up! This PR modifies the following files:
|
|
r? @jdm |
|
This looks fine, but I'd like to reduce the duplicated code that's being added. |
components/bluetooth/lib.rs
Outdated
| @@ -627,6 +627,10 @@ impl BluetoothManager { | |||
|
|
|||
| // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattserver-connect | |||
| fn gatt_server_connect(&mut self, device_id: String, sender: IpcSender<BluetoothResponseResult>) { | |||
| // Step 2. | |||
| if !self.cached_devices.contains_key(&device_id) || !self.address_to_id.values().any(|v| v == &device_id) { | |||
This comment has been minimized.
This comment has been minimized.
components/bluetooth/lib.rs
Outdated
| @@ -766,7 +770,7 @@ impl BluetoothManager { | |||
| uuid: String, | |||
| sender: IpcSender<BluetoothResponseResult>) { | |||
| // Step 5. | |||
| if !self.cached_services.contains_key(&service_id) { | |||
| if !self.cached_services.contains_key(&service_id) || !self.service_to_device.contains_key(&service_id) { | |||
This comment has been minimized.
This comment has been minimized.
components/bluetooth/lib.rs
Outdated
| @@ -938,7 +942,8 @@ impl BluetoothManager { | |||
| uuid: String, | |||
| sender: IpcSender<BluetoothResponseResult>) { | |||
| // Step 5. | |||
| if !self.cached_characteristics.contains_key(&characteristic_id) { | |||
| if !self.cached_characteristics.contains_key(&characteristic_id) || | |||
| !self.characteristic_to_service.contains_key(&characteristic_id) { | |||
This comment has been minimized.
This comment has been minimized.
|
@bors-servo: delegate=dati91 |
|
|
|
@bors-servo r=jdm |
|
|
|
|
bors-servo
added a commit
that referenced
this pull request
Dec 14, 2016
Check if represented attributes are cached <!-- Please describe your changes on the following line: --> Improve existing cache checks in `/bluetooth/lib.rs`, and update Step comments in `script/dom` corresponding to this. --- <!-- 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] There are tests for these changes OR <!-- 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/14567) <!-- Reviewable:end -->
|
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
zakorgy commentedDec 13, 2016
•
edited by larsbergstrom
Improve existing cache checks in
/bluetooth/lib.rs, and update Step comments inscript/domcorresponding to this../mach build -ddoes not report any errors./mach test-tidydoes not report any errorsThis change is