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

Unified Diff: ppapi/cpp/instance.h

Issue 7038044: First step to remove scripting from PPP_Instance and PPB_Instance. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 9 years, 7 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 | « ppapi/c/ppp_instance.h ('k') | ppapi/cpp/instance.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/cpp/instance.h
diff --git a/ppapi/cpp/instance.h b/ppapi/cpp/instance.h
index 81d4176ef8d9f9927d99ef997044b78d8c35589d..5d0844dbd7cc10bebbf3e7a3bd9726ab5edcb04b 100644
--- a/ppapi/cpp/instance.h
+++ b/ppapi/cpp/instance.h
@@ -69,9 +69,6 @@ class Instance {
/** See PPP_Instance.HandleDocumentLoad. */
virtual bool HandleDocumentLoad(const URLLoader& url_loader);
- /** See PPP_Instance.GetInstanceObject. */
- virtual Var GetInstanceObject();
-
/** See PPP_Instance.GetSelectedText. */
virtual Var GetSelectedText(bool html);
// @}
@@ -79,12 +76,20 @@ class Instance {
// @{
/** @name PPB_Instance methods for querying the browser: */
+#ifndef PPAPI_INSTANCE_REMOVE_SCRIPTING
+ /** See PPP_Instance.GetInstanceObject. */
+ virtual Var GetInstanceObject();
+
/** See PPB_Instance.GetWindowObject. */
Var GetWindowObject();
/** See PPB_Instance.GetOwnerElementObject. */
Var GetOwnerElementObject();
+ /** See PPB_Instance.ExecuteScript. */
+ Var ExecuteScript(const Var& script, Var* exception = NULL);
+#endif
+
/** See PPB_Instance.BindGraphics. */
bool BindGraphics(const Graphics2D& graphics);
@@ -94,9 +99,6 @@ class Instance {
/** See PPB_Instance.IsFullFrame. */
bool IsFullFrame();
- /** See PPB_Instance.ExecuteScript. */
- Var ExecuteScript(const Var& script, Var* exception = NULL);
-
// These functions use the PPP_Messaging and PPB_Messaging interfaces, so that
// messaging can be done conveniently for a pp::Instance without using a
// separate C++ class.
« no previous file with comments | « ppapi/c/ppp_instance.h ('k') | ppapi/cpp/instance.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698