summaryrefslogtreecommitdiffstats
path: root/ppapi/shared_impl/ppp_instance_combined.cc
diff options
context:
space:
mode:
authordmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-20 16:36:02 +0000
committerdmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-20 16:36:02 +0000
commitd153c80959407a591a08a9deb1878295176fcb04 (patch)
treeb1ff32af2d2b7e4cc46e84d69bd39f6d65705807 /ppapi/shared_impl/ppp_instance_combined.cc
parent88a14fa437caa6df64fece3df39c8ec8bde31f84 (diff)
downloadchromium_src-d153c80959407a591a08a9deb1878295176fcb04.zip
chromium_src-d153c80959407a591a08a9deb1878295176fcb04.tar.gz
chromium_src-d153c80959407a591a08a9deb1878295176fcb04.tar.bz2
Revert 93202 - Remove HandleInputEvent from PPP_Instance and freeze to 1.0.
Note I'm leaving in temporary backwards-compatibility. BUG= http://code.google.com/p/nativeclient/issues/detail?id=2035 TEST=ppapi tests Review URL: http://codereview.chromium.org/7452002 TBR=dmichael@chromium.org Review URL: http://codereview.chromium.org/7467002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93208 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/shared_impl/ppp_instance_combined.cc')
-rw-r--r--ppapi/shared_impl/ppp_instance_combined.cc14
1 files changed, 1 insertions, 13 deletions
diff --git a/ppapi/shared_impl/ppp_instance_combined.cc b/ppapi/shared_impl/ppp_instance_combined.cc
index ffb96a4..ce3d2c4 100644
--- a/ppapi/shared_impl/ppp_instance_combined.cc
+++ b/ppapi/shared_impl/ppp_instance_combined.cc
@@ -7,20 +7,8 @@
namespace ppapi {
PPP_Instance_Combined::PPP_Instance_Combined(
- const PPP_Instance_1_0& instance_if)
- : PPP_Instance_1_0(instance_if),
- HandleInputEvent_0_5(NULL) {
-}
-
-PPP_Instance_Combined::PPP_Instance_Combined(
const PPP_Instance_0_5& instance_if)
- : PPP_Instance_1_0(),
- HandleInputEvent_0_5(instance_if.HandleInputEvent) {
- DidCreate = instance_if.DidCreate;
- DidDestroy = instance_if.DidDestroy;
- DidChangeView = instance_if.DidChangeView;
- DidChangeFocus = instance_if.DidChangeFocus;
- HandleDocumentLoad = instance_if.HandleDocumentLoad;
+ : PPP_Instance_0_5(instance_if) {
}
} // namespace ppapi