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

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

Issue 922893002: Merge the Sky Engine changes from the SkyDart branch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 months 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/WebLeakDetector.cpp ('k') | sky/engine/web/WebLocalFrameImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/web/WebLocalFrameImpl.h
diff --git a/sky/engine/web/WebLocalFrameImpl.h b/sky/engine/web/WebLocalFrameImpl.h
index 2af11ebb4f2171f32806b2aeeecbd7370543bf0b..6081fc07adbadeba19a5a090532a2cdbcfd9566f 100644
--- a/sky/engine/web/WebLocalFrameImpl.h
+++ b/sky/engine/web/WebLocalFrameImpl.h
@@ -70,14 +70,6 @@ public:
virtual void executeScript(const WebScriptSource&) override;
virtual void addMessageToConsole(const WebConsoleMessage&) override;
virtual void collectGarbage() override;
- virtual v8::Handle<v8::Value> executeScriptAndReturnValue(
- const WebScriptSource&) override;
- virtual v8::Handle<v8::Value> callFunctionEvenIfScriptDisabled(
- v8::Handle<v8::Function>,
- v8::Handle<v8::Value>,
- int argc,
- v8::Handle<v8::Value> argv[]) override;
- virtual v8::Local<v8::Context> mainWorldScriptContext() const override;
virtual void load(const WebURL&, mojo::ScopedDataPipeConsumerHandle);
virtual void replaceSelection(const WebString&) override;
virtual void insertText(const WebString&) override;
« no previous file with comments | « sky/engine/web/WebLeakDetector.cpp ('k') | sky/engine/web/WebLocalFrameImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698