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

Unified Diff: ppapi/native_client/src/shared/ppapi_proxy/ppp_instance_combined.cc

Issue 8951014: Change the DidChangeView update to take a new ViewChanged resource. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: New patch Created 9 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
Index: ppapi/native_client/src/shared/ppapi_proxy/ppp_instance_combined.cc
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/ppp_instance_combined.cc b/ppapi/native_client/src/shared/ppapi_proxy/ppp_instance_combined.cc
new file mode 100644
index 0000000000000000000000000000000000000000..767455b135f41178347cd7ae19171619bdeaeb45
--- /dev/null
+++ b/ppapi/native_client/src/shared/ppapi_proxy/ppp_instance_combined.cc
@@ -0,0 +1,61 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ppapi/native_client/src/shared/ppapi_proxy/ppp_instance_combined.h"
+
+#include <stdlib.h>
+
+namespace ppapi_proxy {
+
+PPP_Instance_Combined::PPP_Instance_Combined()
+ : initialized_(false),
+ did_change_view_1_0_(NULL) {
+}
+
+void PPP_Instance_Combined::Init1_0(const PPP_Instance_1_0* instance_if) {
+ did_change_view_1_0_ = instance_if->DidChangeView;
+ instance_1_1_.DidCreate = instance_if->DidCreate;
+ instance_1_1_.DidDestroy = instance_if->DidDestroy;
+ instance_1_1_.DidChangeView = NULL;
+ instance_1_1_.DidChangeFocus = instance_if->DidChangeFocus;
+ instance_1_1_.HandleDocumentLoad = instance_if->HandleDocumentLoad;
dmichael (off chromium) 2011/12/20 19:01:34 initialized_ = true; ?
+}
+
+void PPP_Instance_Combined::Init1_1(const PPP_Instance_1_1* instance_if) {
+ instance_1_1_ = *instance_if;
dmichael (off chromium) 2011/12/20 19:01:34 initialized_ = true; ?
+}
+
+PP_Bool PPP_Instance_Combined::DidCreate(PP_Instance instance,
+ uint32_t argc,
+ const char* argn[],
+ const char* argv[]) {
+ return instance_1_1_.DidCreate(instance, argc, argn, argv);
+}
+
+void PPP_Instance_Combined::DidDestroy(PP_Instance instance) {
+ return instance_1_1_.DidDestroy(instance);
+}
+
+void PPP_Instance_Combined::DidChangeView(PP_Instance instance,
+ PP_Resource view_resource,
+ const struct PP_Rect* position,
+ const struct PP_Rect* clip) {
+ if (instance_1_1_.DidChangeView)
+ instance_1_1_.DidChangeView(instance, view_resource);
+ else
+ did_change_view_1_0_(instance, position, clip);
+}
+
+void PPP_Instance_Combined::DidChangeFocus(PP_Instance instance,
+ PP_Bool has_focus) {
+ instance_1_1_.DidChangeFocus(instance, has_focus);
+}
+
+PP_Bool PPP_Instance_Combined::HandleDocumentLoad(PP_Instance instance,
+ PP_Resource url_loader) {
+ return instance_1_1_.HandleDocumentLoad(instance, url_loader);
+}
+
+} // namespace ppapi_proxy
+

Powered by Google App Engine
This is Rietveld 408576698