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

Unified Diff: sky/engine/web/WebLocalFrameImpl.cpp

Issue 776143003: Remove Isolated Worlds from Sky (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/web/WebLocalFrameImpl.h ('k') | sky/viewer/document_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/web/WebLocalFrameImpl.cpp
diff --git a/sky/engine/web/WebLocalFrameImpl.cpp b/sky/engine/web/WebLocalFrameImpl.cpp
index 566cfcd038d91c55522c3028c30248eb09e69b22..4ec21cdeb4104b000f28d9b4f13c314e47f53b34 100644
--- a/sky/engine/web/WebLocalFrameImpl.cpp
+++ b/sky/engine/web/WebLocalFrameImpl.cpp
@@ -266,28 +266,6 @@ void WebLocalFrameImpl::executeScript(const WebScriptSource& source)
frame()->script().executeScriptInMainWorld(ScriptSourceCode(source.code, source.url, position));
}
-void WebLocalFrameImpl::executeScriptInIsolatedWorld(int worldID, const WebScriptSource* sourcesIn, unsigned numSources, int extensionGroup)
-{
- ASSERT(frame());
- RELEASE_ASSERT(worldID > 0);
- RELEASE_ASSERT(worldID < EmbedderWorldIdLimit);
-
- Vector<ScriptSourceCode> sources;
- for (unsigned i = 0; i < numSources; ++i) {
- TextPosition position(OrdinalNumber::fromOneBasedInt(sourcesIn[i].startLine), OrdinalNumber::first());
- sources.append(ScriptSourceCode(sourcesIn[i].code, sourcesIn[i].url, position));
- }
-
- v8::HandleScope handleScope(toIsolate(frame()));
- frame()->script().executeScriptInIsolatedWorld(worldID, sources, extensionGroup, 0);
-}
-
-void WebLocalFrameImpl::setIsolatedWorldHumanReadableName(int worldID, const WebString& humanReadableName)
-{
- ASSERT(frame());
- DOMWrapperWorld::setIsolatedWorldHumanReadableName(worldID, humanReadableName);
-}
-
void WebLocalFrameImpl::addMessageToConsole(const WebConsoleMessage& message)
{
ASSERT(frame());
@@ -332,32 +310,6 @@ v8::Handle<v8::Value> WebLocalFrameImpl::executeScriptAndReturnValue(const WebSc
return frame()->script().executeScriptInMainWorldAndReturnValue(ScriptSourceCode(source.code, source.url, position));
}
-void WebLocalFrameImpl::executeScriptInIsolatedWorld(int worldID, const WebScriptSource* sourcesIn, unsigned numSources, int extensionGroup, WebVector<v8::Local<v8::Value> >* results)
-{
- ASSERT(frame());
- RELEASE_ASSERT(worldID > 0);
- RELEASE_ASSERT(worldID < EmbedderWorldIdLimit);
-
- Vector<ScriptSourceCode> sources;
-
- for (unsigned i = 0; i < numSources; ++i) {
- TextPosition position(OrdinalNumber::fromOneBasedInt(sourcesIn[i].startLine), OrdinalNumber::first());
- sources.append(ScriptSourceCode(sourcesIn[i].code, sourcesIn[i].url, position));
- }
-
- if (results) {
- Vector<v8::Local<v8::Value> > scriptResults;
- frame()->script().executeScriptInIsolatedWorld(worldID, sources, extensionGroup, &scriptResults);
- WebVector<v8::Local<v8::Value> > v8Results(scriptResults.size());
- for (unsigned i = 0; i < scriptResults.size(); i++)
- v8Results[i] = v8::Local<v8::Value>::New(toIsolate(frame()), scriptResults[i]);
- results->swap(v8Results);
- } else {
- v8::HandleScope handleScope(toIsolate(frame()));
- frame()->script().executeScriptInIsolatedWorld(worldID, sources, extensionGroup, 0);
- }
-}
-
v8::Handle<v8::Value> WebLocalFrameImpl::callFunctionEvenIfScriptDisabled(v8::Handle<v8::Function> function, v8::Handle<v8::Value> receiver, int argc, v8::Handle<v8::Value> argv[])
{
ASSERT(frame());
« no previous file with comments | « sky/engine/web/WebLocalFrameImpl.h ('k') | sky/viewer/document_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698