diff options
author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-13 01:58:52 +0000 |
---|---|---|
committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-13 01:58:52 +0000 |
commit | c637ba992deae66085bdb2ae021a38e7fc30c0ef (patch) | |
tree | 863339a72a01137a7327f47077b97f5809dcc00f /ppapi | |
parent | 75086963696a4bda5dac105815e872db3f9b20d6 (diff) | |
download | chromium_src-c637ba992deae66085bdb2ae021a38e7fc30c0ef.zip chromium_src-c637ba992deae66085bdb2ae021a38e7fc30c0ef.tar.gz chromium_src-c637ba992deae66085bdb2ae021a38e7fc30c0ef.tar.bz2 |
Turn off scripting by default. If this sticks, a later CL will delete all the dead code.
BUG=82606
TEST=trybots
Review URL: http://codereview.chromium.org/7345014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92294 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
-rw-r--r-- | ppapi/example/example.cc | 4 | ||||
-rw-r--r-- | ppapi/examples/2d/graphics_2d_example.c | 7 | ||||
-rw-r--r-- | ppapi/examples/file_chooser/file_chooser.cc | 16 |
3 files changed, 11 insertions, 16 deletions
diff --git a/ppapi/example/example.cc b/ppapi/example/example.cc index 6ef0640..3eaafcd 100644 --- a/ppapi/example/example.cc +++ b/ppapi/example/example.cc @@ -407,8 +407,8 @@ int gettimeofday(struct timeval *tv, struct timezone*) { for (size_t i = 0; i < props.size(); ++i) Log(PP_LOGLEVEL_LOG, props[i]); - pp::Var location = window.GetProperty("location"); - pp::Var href = location.GetProperty("href"); + pp::VarPrivate location = window.GetProperty("location"); + pp::VarPrivate href = location.GetProperty("href"); if (!fetcher_) { fetcher_ = new MyFetcher(); diff --git a/ppapi/examples/2d/graphics_2d_example.c b/ppapi/examples/2d/graphics_2d_example.c index aac4225..ccec9a1 100644 --- a/ppapi/examples/2d/graphics_2d_example.c +++ b/ppapi/examples/2d/graphics_2d_example.c @@ -168,18 +168,13 @@ PP_Bool Instance_HandleDocumentLoad(PP_Instance pp_instance, return PP_FALSE; } -struct PP_Var Instance_GetInstanceObject(PP_Instance pp_instance) { - return PP_MakeNull(); -} - static struct PPP_Instance instance_interface = { &Instance_DidCreate, &Instance_DidDestroy, &Instance_DidChangeView, &Instance_DidChangeFocus, &Instance_HandleInputEvent, - &Instance_HandleDocumentLoad, - &Instance_GetInstanceObject, + &Instance_HandleDocumentLoad }; diff --git a/ppapi/examples/file_chooser/file_chooser.cc b/ppapi/examples/file_chooser/file_chooser.cc index fd8261d..32a10c5 100644 --- a/ppapi/examples/file_chooser/file_chooser.cc +++ b/ppapi/examples/file_chooser/file_chooser.cc @@ -7,14 +7,14 @@ #include "ppapi/cpp/completion_callback.h" #include "ppapi/cpp/dev/file_chooser_dev.h" #include "ppapi/cpp/dev/file_ref_dev.h" -#include "ppapi/cpp/instance.h" #include "ppapi/cpp/module.h" -#include "ppapi/cpp/var.h" +#include "ppapi/cpp/private/instance_private.h" +#include "ppapi/cpp/private/var_private.h" -class MyInstance : public pp::Instance { +class MyInstance : public pp::InstancePrivate { public: MyInstance(PP_Instance instance) - : pp::Instance(instance) { + : pp::InstancePrivate(instance) { callback_factory_.Initialize(this); } @@ -66,8 +66,8 @@ class MyInstance : public pp::Instance { } void RecreateConsole() { - pp::Var doc = GetWindowObject().GetProperty("document"); - pp::Var body = doc.GetProperty("body"); + pp::VarPrivate doc = GetWindowObject().GetProperty("document"); + pp::VarPrivate body = doc.GetProperty("body"); if (!console_.is_undefined()) body.Call("removeChild", console_); @@ -78,13 +78,13 @@ class MyInstance : public pp::Instance { } void Log(const pp::Var& var) { - pp::Var doc = GetWindowObject().GetProperty("document"); + pp::VarPrivate doc = GetWindowObject().GetProperty("document"); console_.Call("appendChild", doc.Call("createTextNode", var)); console_.Call("appendChild", doc.Call("createTextNode", "\n")); } pp::CompletionCallbackFactory<MyInstance> callback_factory_; - pp::Var console_; + pp::VarPrivate console_; }; class MyModule : public pp::Module { |