Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / dom / ScriptLoader.h

diff --git a/src/third_party/WebKit/Source/core/dom/ScriptLoader.h b/src/third_party/WebKit/Source/core/dom/ScriptLoader.h
index 3e5775c..3f1c391 100644 (file)
--- a/src/third_party/WebKit/Source/core/dom/ScriptLoader.h
+++ b/src/third_party/WebKit/Source/core/dom/ScriptLoader.h
@@ -21,20 +21,21 @@
 #ifndef ScriptLoader_h
 #define ScriptLoader_h
 
+#include "core/fetch/FetchRequest.h"
 #include "core/fetch/ResourceClient.h"
 #include "core/fetch/ResourcePtr.h"
+#include "core/fetch/ScriptResource.h"
 #include "wtf/text/TextPosition.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
-class ScriptResource;
 class Element;
 class ScriptLoaderClient;
 class ScriptSourceCode;
 
 
-class ScriptLoader FINAL : private ResourceClient {
+class ScriptLoader FINAL : private ScriptResourceClient {
 public:
     static PassOwnPtr<ScriptLoader> create(Element*, bool createdByParser, bool isEvaluated);
     virtual ~ScriptLoader();
@@ -46,7 +47,7 @@ public:
 
     String scriptCharset() const { return m_characterEncoding; }
     String scriptContent() const;
-    void executeScript(const ScriptSourceCode&);
+    void executeScript(const ScriptSourceCode&, double* compilationFinishTime = 0);
     void execute(ScriptResource*);
 
     // XML parser calls these
@@ -77,7 +78,7 @@ private:
     bool ignoresLoadRequest() const;
     bool isScriptForEventSupported() const;
 
-    bool fetchScript(const String& sourceUrl);
+    bool fetchScript(const String& sourceUrl, FetchRequest::DeferOption);
     void stopLoadRequest();
 
     ScriptLoaderClient* client() const;