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

Unified Diff: cc/resources/video_resource_updater.h

Issue 485043003: cc: Use correct message loop proxy in BlockingTaskRunner (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Help gn deal with it. Created 6 years, 4 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: cc/resources/video_resource_updater.h
diff --git a/cc/resources/video_resource_updater.h b/cc/resources/video_resource_updater.h
index b09a19bbc6e37306fa473172f569eb0b754bd656..2f1f4bfeccdc593c20edd1da13e748848f167d1d 100644
--- a/cc/resources/video_resource_updater.h
+++ b/cc/resources/video_resource_updater.h
@@ -12,7 +12,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "cc/base/cc_export.h"
-#include "cc/resources/release_callback.h"
+#include "cc/resources/release_callback_impl.h"
#include "cc/resources/resource_format.h"
#include "cc/resources/texture_mailbox.h"
#include "ui/gfx/size.h"
@@ -50,11 +50,11 @@ class CC_EXPORT VideoFrameExternalResources {
ResourceType type;
std::vector<TextureMailbox> mailboxes;
- std::vector<ReleaseCallback> release_callbacks;
+ std::vector<ReleaseCallbackImpl> release_callbacks;
// TODO(danakj): Remove these too.
std::vector<unsigned> software_resources;
- ReleaseCallback software_release_callback;
+ ReleaseCallbackImpl software_release_callback;
VideoFrameExternalResources();
~VideoFrameExternalResources();
@@ -102,14 +102,18 @@ class CC_EXPORT VideoResourceUpdater
ResourceFormat resource_format;
gpu::Mailbox mailbox;
};
- static void RecycleResource(base::WeakPtr<VideoResourceUpdater> updater,
- RecycleResourceData data,
- uint32 sync_point,
- bool lost_resource);
- static void ReturnTexture(base::WeakPtr<VideoResourceUpdater> updater,
- const scoped_refptr<media::VideoFrame>& video_frame,
- uint32 sync_point,
- bool lost_resource);
+ static void RecycleResource(
+ base::WeakPtr<VideoResourceUpdater> updater,
+ RecycleResourceData data,
+ uint32 sync_point,
+ bool lost_resource,
+ scoped_refptr<BlockingTaskRunner> main_thread_task_runner);
+ static void ReturnTexture(
+ base::WeakPtr<VideoResourceUpdater> updater,
+ const scoped_refptr<media::VideoFrame>& video_frame,
+ uint32 sync_point,
+ bool lost_resource,
+ scoped_refptr<BlockingTaskRunner> main_thread_task_runner);
ContextProvider* context_provider_;
ResourceProvider* resource_provider_;

Powered by Google App Engine
This is Rietveld 408576698