Title: [135792] trunk/Source/WebCore
- Revision
- 135792
- Author
- hara...@chromium.org
- Date
- 2012-11-26 17:50:21 -0800 (Mon, 26 Nov 2012)
Log Message
[V8] Refactor WorkerScriptController
https://bugs.webkit.org/show_bug.cgi?id=103330
Reviewed by Adam Barth.
r135703 just moved methods from WorkerContextExecutionProxy
to WorkerScriptController. We should refactor the methods as a follow-up.
No tests. No change in behavior.
* bindings/v8/WorkerScriptController.cpp:
(WebCore::WorkerScriptController::~WorkerScriptController):
(WebCore::WorkerScriptController::disposeContext):
(WebCore::WorkerScriptController::initializeContextIfNeeded):
(WebCore::WorkerScriptController::evaluate):
(WebCore::WorkerScriptController::disableEval):
* bindings/v8/WorkerScriptController.h:
(WorkerScriptController):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (135791 => 135792)
--- trunk/Source/WebCore/ChangeLog 2012-11-27 01:35:08 UTC (rev 135791)
+++ trunk/Source/WebCore/ChangeLog 2012-11-27 01:50:21 UTC (rev 135792)
@@ -1,3 +1,24 @@
+2012-11-26 Kentaro Hara <hara...@chromium.org>
+
+ [V8] Refactor WorkerScriptController
+ https://bugs.webkit.org/show_bug.cgi?id=103330
+
+ Reviewed by Adam Barth.
+
+ r135703 just moved methods from WorkerContextExecutionProxy
+ to WorkerScriptController. We should refactor the methods as a follow-up.
+
+ No tests. No change in behavior.
+
+ * bindings/v8/WorkerScriptController.cpp:
+ (WebCore::WorkerScriptController::~WorkerScriptController):
+ (WebCore::WorkerScriptController::disposeContext):
+ (WebCore::WorkerScriptController::initializeContextIfNeeded):
+ (WebCore::WorkerScriptController::evaluate):
+ (WebCore::WorkerScriptController::disableEval):
+ * bindings/v8/WorkerScriptController.h:
+ (WorkerScriptController):
+
2012-11-26 Varun Jain <varunj...@chromium.org>
LongPress and LongTap gestures should start drag/drop and open context menu respectively.
Modified: trunk/Source/WebCore/bindings/v8/WorkerScriptController.cpp (135791 => 135792)
--- trunk/Source/WebCore/bindings/v8/WorkerScriptController.cpp 2012-11-27 01:35:08 UTC (rev 135791)
+++ trunk/Source/WebCore/bindings/v8/WorkerScriptController.cpp 2012-11-27 01:50:21 UTC (rev 135792)
@@ -79,19 +79,19 @@
// See http://webkit.org/b/83104#c14 for why this is here.
WebKit::Platform::current()->didStopWorkerRunLoop(WebKit::WebWorkerRunLoop(&m_workerContext->thread()->runLoop()));
#endif
- dispose();
+ disposeContext();
V8PerIsolateData::dispose(m_isolate);
m_isolate->Exit();
m_isolate->Dispose();
}
-void WorkerScriptController::dispose()
+void WorkerScriptController::disposeContext()
{
m_perContextData.clear();
m_context.clear();
}
-bool WorkerScriptController::initializeIfNeeded()
+bool WorkerScriptController::initializeContextIfNeeded()
{
if (!m_context.isEmpty())
return true;
@@ -108,7 +108,7 @@
m_perContextData = V8PerContextData::create(m_context.get());
if (!m_perContextData->init()) {
- dispose();
+ disposeContext();
return false;
}
@@ -124,7 +124,7 @@
v8::Handle<v8::Function> workerContextConstructor = m_perContextData->constructorForType(contextType);
v8::Local<v8::Object> jsWorkerContext = V8ObjectConstructor::newInstance(workerContextConstructor);
if (jsWorkerContext.IsEmpty()) {
- dispose();
+ disposeContext();
return false;
}
@@ -143,7 +143,7 @@
v8::HandleScope handleScope;
- if (!initializeIfNeeded())
+ if (!initializeContextIfNeeded())
return ScriptValue();
if (!m_disableEvalPending.isEmpty()) {
@@ -186,16 +186,6 @@
return ScriptValue(result);
}
-void WorkerScriptController::setEvalAllowed(bool enable, const String& errorMessage)
-{
- m_disableEvalPending = enable ? String() : errorMessage;
-}
-
-void WorkerScriptController::evaluate(const ScriptSourceCode& sourceCode)
-{
- evaluate(sourceCode, 0);
-}
-
void WorkerScriptController::evaluate(const ScriptSourceCode& sourceCode, ScriptValue* exception)
{
if (isExecutionForbidden())
@@ -244,7 +234,7 @@
void WorkerScriptController::disableEval(const String& errorMessage)
{
- setEvalAllowed(false, errorMessage);
+ m_disableEvalPending = errorMessage;
}
void WorkerScriptController::setException(const ScriptValue& exception)
Modified: trunk/Source/WebCore/bindings/v8/WorkerScriptController.h (135791 => 135792)
--- trunk/Source/WebCore/bindings/v8/WorkerScriptController.h 2012-11-27 01:35:08 UTC (rev 135791)
+++ trunk/Source/WebCore/bindings/v8/WorkerScriptController.h 2012-11-27 01:50:21 UTC (rev 135792)
@@ -67,8 +67,7 @@
WorkerContext* workerContext() { return m_workerContext; }
- void evaluate(const ScriptSourceCode&);
- void evaluate(const ScriptSourceCode&, ScriptValue* exception);
+ void evaluate(const ScriptSourceCode&, ScriptValue* = 0);
void setException(const ScriptValue&);
@@ -87,9 +86,6 @@
void disableEval(const String&);
- // Alow use of eval() and is equivalents in scripts.
- void setEvalAllowed(bool enable, const String&);
-
// Returns WorkerScriptController for the currently executing context. 0 will be returned if the current executing context is not the worker context.
static WorkerScriptController* controllerForContext();
@@ -100,8 +96,8 @@
v8::Local<v8::Context> context() { return v8::Local<v8::Context>::New(m_context.get()); }
private:
- bool initializeIfNeeded();
- void dispose();
+ bool initializeContextIfNeeded();
+ void disposeContext();
WorkerContext* m_workerContext;
v8::Isolate* m_isolate;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
