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

Unified Diff: ppapi/proxy/compositor_resource.h

Issue 324983005: [PPAPI] Add browser tests for compositor API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@compositor_api_impl_new
Patch Set: Disable the test on MACOSX Created 6 years, 6 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/proxy/compositor_layer_resource.cc ('k') | ppapi/proxy/compositor_resource.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/proxy/compositor_resource.h
diff --git a/ppapi/proxy/compositor_resource.h b/ppapi/proxy/compositor_resource.h
index f3d13d4ffc71ab522051f80a97538c4599738011..8bdeb3f650eff83ba04b310735c85d38b906585d 100644
--- a/ppapi/proxy/compositor_resource.h
+++ b/ppapi/proxy/compositor_resource.h
@@ -10,6 +10,7 @@
#include "ppapi/proxy/compositor_layer_resource.h"
#include "ppapi/proxy/plugin_resource.h"
#include "ppapi/proxy/ppapi_proxy_export.h"
+#include "ppapi/shared_impl/proxy_lock.h"
#include "ppapi/thunk/ppb_compositor_api.h"
namespace ppapi {
@@ -22,13 +23,9 @@ class PPAPI_PROXY_EXPORT CompositorResource
CompositorResource(Connection connection,
PP_Instance instance);
- bool IsInProgress() const {
- return TrackedCallback::IsPending(commit_callback_);
- }
+ bool IsInProgress() const;
- int32_t GenerateResourceId() const {
- return ++last_resource_id_;
- }
+ int32_t GenerateResourceId() const;
private:
virtual ~CompositorResource();
@@ -54,7 +51,7 @@ class PPAPI_PROXY_EXPORT CompositorResource
uint32_t sync_point,
bool is_lost);
- void ResetLayersInternal();
+ void ResetLayersInternal(bool is_aborted);
// Callback for CommitLayers().
scoped_refptr<TrackedCallback> commit_callback_;
« no previous file with comments | « ppapi/proxy/compositor_layer_resource.cc ('k') | ppapi/proxy/compositor_resource.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698