diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-13 16:23:25 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-16 11:35:02 +0100 |
| commit | 65f03d4f644ce73618e5f4f50dd694b26f55ae12 (patch) | |
| tree | f478babb801e720de7bfaee23443ffe029f58731 /Source/WebCore/workers/WorkerContext.cpp | |
| parent | 47de4a2fb7262c7ebdb9cd133ad2c54c187454d0 (diff) | |
| download | external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.zip external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.gz external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.bz2 | |
Merge WebKit at r75993: Initial merge by git.
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
Diffstat (limited to 'Source/WebCore/workers/WorkerContext.cpp')
| -rw-r--r-- | Source/WebCore/workers/WorkerContext.cpp | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/Source/WebCore/workers/WorkerContext.cpp b/Source/WebCore/workers/WorkerContext.cpp index 345e5b7..d5d1ccc 100644 --- a/Source/WebCore/workers/WorkerContext.cpp +++ b/Source/WebCore/workers/WorkerContext.cpp @@ -38,11 +38,12 @@ #include "DatabaseSync.h" #include "DatabaseTracker.h" #include "DOMTimer.h" +#include "DOMURL.h" #include "DOMWindow.h" #include "ErrorEvent.h" #include "Event.h" #include "EventException.h" -#include "InspectorController.h" +#include "InspectorInstrumentation.h" #include "KURL.h" #include "MessagePort.h" #include "NotImplemented.h" @@ -245,10 +246,7 @@ void WorkerContext::importScripts(const Vector<String>& urls, ExceptionCode& ec) return; } -#if ENABLE(INSPECTOR) - if (InspectorController* inspector = scriptExecutionContext()->inspectorController()) - inspector->scriptImported(scriptLoader.identifier(), scriptLoader.script()); -#endif + InspectorInstrumentation::scriptImported(scriptExecutionContext(), scriptLoader.identifier(), scriptLoader.script()); ScriptValue exception; m_script->evaluate(ScriptSourceCode(scriptLoader.script(), *it), &exception); @@ -341,14 +339,11 @@ EventTargetData* WorkerContext::ensureEventTargetData() } #if ENABLE(BLOB) -String WorkerContext::createObjectURL(Blob* blob) -{ - return scriptExecutionContext()->createPublicBlobURL(blob).string(); -} - -void WorkerContext::revokeObjectURL(const String& blobURLString) +DOMURL* WorkerContext::webkitURL() const { - scriptExecutionContext()->revokePublicBlobURL(KURL(ParsedURLString, blobURLString)); + if (!m_domURL) + m_domURL = DOMURL::create(this->scriptExecutionContext()); + return m_domURL.get(); } #endif |