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

Unified Diff: cc/layers/texture_layer.cc

Issue 12670009: cc: Chromify TextureLayerClient (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 9 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 | « no previous file | cc/layers/texture_layer_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/texture_layer.cc
diff --git a/cc/layers/texture_layer.cc b/cc/layers/texture_layer.cc
index 2590470e90bbab152eaeb7cf975c3e7bf5edf0fd..acabc87f91410a0ca0537760df60e88908d6679d 100644
--- a/cc/layers/texture_layer.cc
+++ b/cc/layers/texture_layer.cc
@@ -58,7 +58,7 @@ TextureLayer::~TextureLayer() {
if (texture_id_)
layer_tree_host()->AcquireLayerTextures();
if (rate_limit_context_ && client_)
- layer_tree_host()->StopRateLimiter(client_->context());
+ layer_tree_host()->StopRateLimiter(client_->Context3d());
}
if (own_mailbox_)
texture_mailbox_.RunReleaseCallback(texture_mailbox_.sync_point());
@@ -102,7 +102,7 @@ void TextureLayer::SetPremultipliedAlpha(bool premultiplied_alpha) {
void TextureLayer::SetRateLimitContext(bool rate_limit) {
if (!rate_limit && rate_limit_context_ && client_ && layer_tree_host())
- layer_tree_host()->StopRateLimiter(client_->context());
+ layer_tree_host()->StopRateLimiter(client_->Context3d());
rate_limit_context_ = rate_limit;
}
@@ -140,7 +140,7 @@ void TextureLayer::SetNeedsDisplayRect(const gfx::RectF& dirty_rect) {
Layer::SetNeedsDisplayRect(dirty_rect);
if (rate_limit_context_ && client_ && layer_tree_host() && DrawsContent())
- layer_tree_host()->StartRateLimiter(client_->context());
+ layer_tree_host()->StartRateLimiter(client_->Context3d());
}
void TextureLayer::SetLayerTreeHost(LayerTreeHost* host) {
@@ -158,9 +158,9 @@ void TextureLayer::Update(ResourceUpdateQueue* queue,
const OcclusionTracker* occlusion,
RenderingStats* stats) {
if (client_) {
- texture_id_ = client_->prepareTexture(*queue);
+ texture_id_ = client_->PrepareTexture(queue);
context_lost_ =
- client_->context()->getGraphicsResetStatusARB() != GL_NO_ERROR;
+ client_->Context3d()->getGraphicsResetStatusARB() != GL_NO_ERROR;
}
needs_display_ = false;
« no previous file with comments | « no previous file | cc/layers/texture_layer_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698