aboutsummaryrefslogtreecommitdiffstats
path: root/components/net_traits/filemanager_thread.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-08-02 03:03:47 -0500
committerGitHub <noreply@github.com>2016-08-02 03:03:47 -0500
commit93b130f3f7571ebb7407e3914d83dc6fc526c7d4 (patch)
tree70df4bb1541e3d526d585f250238aeda829311cf /components/net_traits/filemanager_thread.rs
parent2eeb945807890a9a557cb71a492b3aae159a7bd5 (diff)
parent49ed453a59e80fd70c74df9387b67f17efcfa6b5 (diff)
downloadservo-93b130f3f7571ebb7407e3914d83dc6fc526c7d4.tar.gz
servo-93b130f3f7571ebb7407e3914d83dc6fc526c7d4.zip
Auto merge of #12579 - izgzhen:fix-fileapi-ref, r=Manishearth
Fix FileAPI's refcount implementation Revise several intricate parts of FileAPI's internal refcounting-related implementation. Goal: Get it done right once and for all. r? @Manishearth <!-- 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: --> - [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 it is internal logic change <!-- 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/12579) <!-- Reviewable:end -->
Diffstat (limited to 'components/net_traits/filemanager_thread.rs')
-rw-r--r--components/net_traits/filemanager_thread.rs9
1 files changed, 3 insertions, 6 deletions
diff --git a/components/net_traits/filemanager_thread.rs b/components/net_traits/filemanager_thread.rs
index 4cde7b8203a..d648ec23083 100644
--- a/components/net_traits/filemanager_thread.rs
+++ b/components/net_traits/filemanager_thread.rs
@@ -138,18 +138,15 @@ pub enum FileManagerThreadMsg {
/// as part of a valid Blob URL
AddSlicedURLEntry(SelectedFileId, RelativePos, IpcSender<Result<SelectedFileId, BlobURLStoreError>>, FileOrigin),
- /// Revoke Blob URL and send back the acknowledgement
- RevokeBlobURL(SelectedFileId, FileOrigin, IpcSender<Result<(), BlobURLStoreError>>),
-
/// Decrease reference count and send back the acknowledgement
DecRef(SelectedFileId, FileOrigin, IpcSender<Result<(), BlobURLStoreError>>),
- /// Increase reference count
- IncRef(SelectedFileId, FileOrigin),
-
/// Activate an internal FileID so it becomes valid as part of a Blob URL
ActivateBlobURL(SelectedFileId, IpcSender<Result<(), BlobURLStoreError>>, FileOrigin),
+ /// Revoke Blob URL and send back the acknowledgement
+ RevokeBlobURL(SelectedFileId, FileOrigin, IpcSender<Result<(), BlobURLStoreError>>),
+
/// Shut down this thread
Exit,
}