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

Unified Diff: tests/fake_browser_ppapi/fake_instance.h

Issue 6218004: Resource64->32, NaCl side. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: First Created 9 years, 11 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
Index: tests/fake_browser_ppapi/fake_instance.h
diff --git a/tests/fake_browser_ppapi/fake_instance.h b/tests/fake_browser_ppapi/fake_instance.h
index efa376a301d3bf9a6a6211485bdb094d6afbfbbd..55d50cf5bc917cab9519fdfa58efbb061fa81055 100644
--- a/tests/fake_browser_ppapi/fake_instance.h
+++ b/tests/fake_browser_ppapi/fake_instance.h
@@ -8,22 +8,26 @@
#define NATIVE_CLIENT_TESTS_FAKE_BROWSER_PPAPI_FAKE_INSTANCE_H_
#include "native_client/src/include/nacl_macros.h"
-#include "native_client/tests/fake_browser_ppapi/fake_window.h"
+#include "ppapi/c/pp_module.h"
#include "ppapi/c/ppb_instance.h"
namespace fake_browser_ppapi {
+class FakeWindow;
class Host;
// Implements the PPB_Instance interface.
class Instance {
public:
// You must call set_window to complete initialization.
- explicit Instance() : window_(NULL) {}
+ Instance() : instance_id_(0), window_(NULL) {}
virtual ~Instance() {}
void set_window(FakeWindow* window) { window_ = window; }
+ void set_instance_id(PP_Instance instance_id) { instance_id_ = instance_id; }
+ PP_Instance instance_id() const { return instance_id_; }
+
// The bindings for the methods invoked by the PPAPI interface.
virtual PP_Var GetWindowObject();
virtual PP_Var GetOwnerElementObject();
@@ -32,12 +36,20 @@ class Instance {
virtual PP_Var ExecuteScript(PP_Var script,
PP_Var* exception);
static const PPB_Instance* GetInterface();
-
+ static Instance* Invalid() { return &kInvalidInstance; }
private:
+ static Instance kInvalidInstance;
+ PP_Instance instance_id_;
FakeWindow* window_;
NACL_DISALLOW_COPY_AND_ASSIGN(Instance);
};
+// These are made global so that C API functions can access them from any file.
+// To be implemented by main.cc.
+PP_Instance TrackInstance(Instance* instance);
+// Returns Instance::Invalid() on error.
+Instance* GetInstance(PP_Instance instance_id);
+
} // namespace fake_browser_ppapi
#endif // NATIVE_CLIENT_TESTS_FAKE_BROWSER_PPAPI_FAKE_INSTANCE_H_

Powered by Google App Engine
This is Rietveld 408576698