Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(225)

Side by Side Diff: third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.h

Issue 1781613002: Fix data race problem in createImageBitmap(Blob) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix data rance layout test Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013, Google Inc. All rights reserved. 2 * Copyright (c) 2013, Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 22 matching lines...) Expand all
33 33
34 #include "bindings/core/v8/ScriptPromise.h" 34 #include "bindings/core/v8/ScriptPromise.h"
35 #include "bindings/core/v8/ScriptPromiseResolver.h" 35 #include "bindings/core/v8/ScriptPromiseResolver.h"
36 #include "bindings/core/v8/ScriptState.h" 36 #include "bindings/core/v8/ScriptState.h"
37 #include "bindings/core/v8/UnionTypesCore.h" 37 #include "bindings/core/v8/UnionTypesCore.h"
38 #include "core/fileapi/FileReaderLoader.h" 38 #include "core/fileapi/FileReaderLoader.h"
39 #include "core/fileapi/FileReaderLoaderClient.h" 39 #include "core/fileapi/FileReaderLoaderClient.h"
40 #include "core/imagebitmap/ImageBitmapOptions.h" 40 #include "core/imagebitmap/ImageBitmapOptions.h"
41 #include "platform/Supplementable.h" 41 #include "platform/Supplementable.h"
42 #include "platform/geometry/IntRect.h" 42 #include "platform/geometry/IntRect.h"
43 #include "third_party/skia/include/core/SkImage.h"
43 44
44 namespace blink { 45 namespace blink {
45 46
46 class Blob; 47 class Blob;
47 class EventTarget; 48 class EventTarget;
48 class ExceptionState; 49 class ExceptionState;
49 class ExecutionContext; 50 class ExecutionContext;
50 class ImageBitmapSource; 51 class ImageBitmapSource;
51 class ImageBitmapOptions; 52 class ImageBitmapOptions;
52 class ImageDecoder; 53 class ImageDecoder;
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 88
88 ~ImageBitmapLoader() override { } 89 ~ImageBitmapLoader() override { }
89 90
90 private: 91 private:
91 ImageBitmapLoader(ImageBitmapFactories&, const IntRect&, ScriptState*, c onst ImageBitmapOptions&); 92 ImageBitmapLoader(ImageBitmapFactories&, const IntRect&, ScriptState*, c onst ImageBitmapOptions&);
92 93
93 void rejectPromise(); 94 void rejectPromise();
94 95
95 void scheduleAsyncImageBitmapDecoding(); 96 void scheduleAsyncImageBitmapDecoding();
96 void decodeImageOnDecoderThread(WebTaskRunner*); 97 void decodeImageOnDecoderThread(WebTaskRunner*);
97 void resolvePromiseOnOriginalThread(PassOwnPtr<ImageDecoder>); 98 void resolvePromiseOnOriginalThread(PassRefPtr<SkImage>);
98 99
99 // FileReaderLoaderClient 100 // FileReaderLoaderClient
100 void didStartLoading() override { } 101 void didStartLoading() override { }
101 void didReceiveData() override { } 102 void didReceiveData() override { }
102 void didFinishLoading() override; 103 void didFinishLoading() override;
103 void didFail(FileError::ErrorCode) override; 104 void didFail(FileError::ErrorCode) override;
104 105
105 FileReaderLoader m_loader; 106 FileReaderLoader m_loader;
106 RawPtrWillBeMember<ImageBitmapFactories> m_factory; 107 RawPtrWillBeMember<ImageBitmapFactories> m_factory;
107 Member<ScriptPromiseResolver> m_resolver; 108 Member<ScriptPromiseResolver> m_resolver;
108 IntRect m_cropRect; 109 IntRect m_cropRect;
109 ImageBitmapOptions m_options; 110 ImageBitmapOptions m_options;
110 }; 111 };
111 112
112 static ImageBitmapFactories& from(EventTarget&); 113 static ImageBitmapFactories& from(EventTarget&);
113 114
114 template<class GlobalObject> 115 template<class GlobalObject>
115 static ImageBitmapFactories& fromInternal(GlobalObject&); 116 static ImageBitmapFactories& fromInternal(GlobalObject&);
116 117
117 void addLoader(ImageBitmapLoader*); 118 void addLoader(ImageBitmapLoader*);
118 void didFinishLoading(ImageBitmapLoader*); 119 void didFinishLoading(ImageBitmapLoader*);
119 120
120 PersistentHeapHashSetWillBeHeapHashSet<Member<ImageBitmapLoader>> m_pendingL oaders; 121 PersistentHeapHashSetWillBeHeapHashSet<Member<ImageBitmapLoader>> m_pendingL oaders;
121 }; 122 };
122 123
123 } // namespace blink 124 } // namespace blink
124 125
125 #endif // ImageBitmapFactories_h 126 #endif // ImageBitmapFactories_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698