Decrease call sites of ScriptState::current()

Source/modules/imagebitmap/ImageBitmapFactories.h

 /*
  * Copyright (c) 2013, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 15 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef ImageBitmapFactories_h
 #define ImageBitmapFactories_h
 
 #include "bindings/v8/ScriptPromise.h"
 #include "bindings/v8/ScriptPromiseResolverWithContext.h"
+#include "bindings/v8/ScriptState.h"
 #include "core/fileapi/FileReaderLoader.h"
 #include "core/fileapi/FileReaderLoaderClient.h"
 #include "platform/Supplementable.h"
 #include "platform/geometry/IntRect.h"
 #include "wtf/Forward.h"
 #include "wtf/HashSet.h"
 
 namespace WebCore {
 
 class Blob;
@@ skipping 29 matching lines @@
     virtual ~ImageBitmapFactories() { }
 
     void trace(Visitor*);
 
 protected:
     static const char* supplementName();
 
 private:
     class ImageBitmapLoader FINAL : public RefCountedWillBeGarbageCollectedFinalized<ImageBitmapLoader>, public FileReaderLoaderClient {
     public:
-        static PassRefPtrWillBeRawPtr<ImageBitmapLoader> create(ImageBitmapFactories& factory, ExecutionContext* context, const IntRect& cropRect)
+        static PassRefPtrWillBeRawPtr<ImageBitmapLoader> create(ImageBitmapFactories& factory, const IntRect& cropRect, ScriptState* scriptState)
         {
-            return adoptRefWillBeNoop(new ImageBitmapLoader(factory, context, cropRect));
+            return adoptRefWillBeNoop(new ImageBitmapLoader(factory, cropRect, scriptState));
         }
 
         void loadBlobAsync(ExecutionContext*, Blob*);
         ScriptPromise promise() { return m_resolver->promise(); }
 
         void trace(Visitor*);
 
         virtual ~ImageBitmapLoader() { }
 
     private:
-        ImageBitmapLoader(ImageBitmapFactories&, ExecutionContext*, const IntRect&);
+        ImageBitmapLoader(ImageBitmapFactories&, const IntRect&, ScriptState*);
 
         void rejectPromise();
 
         // FileReaderLoaderClient
         virtual void didStartLoading() OVERRIDE { }
         virtual void didReceiveData() OVERRIDE { }
         virtual void didFinishLoading() OVERRIDE;
         virtual void didFail(FileError::ErrorCode) OVERRIDE;
 
         FileReaderLoader m_loader;
         RawPtrWillBeMember<ImageBitmapFactories> m_factory;
         RefPtr<ScriptPromiseResolverWithContext> m_resolver;
         IntRect m_cropRect;
     };
 
     static ImageBitmapFactories& from(EventTarget&);
 
     template<class GlobalObject>
     static ImageBitmapFactories& fromInternal(GlobalObject&);
 
     void addLoader(PassRefPtrWillBeRawPtr<ImageBitmapLoader>);
     void didFinishLoading(ImageBitmapLoader*);
 
     WillBeHeapHashSet<RefPtrWillBeMember<ImageBitmapLoader> > m_pendingLoaders;
 };
 
 } // namespace WebCore
 
 #endif // ImageBitmapFactories_h