Issue 12670009: cc: Chromify TextureLayerClient

Issue 12670009: cc: Chromify TextureLayerClient (Closed)

Created:
7 years, 9 months ago by enne (OOO)

Modified:
7 years, 9 months ago

Reviewers:
danakj, piman

CC:
chromium-reviews, Ian Vollick, piman+watch_chromium.org, cc-bugs_chromium.org, darin-cc_chromium.org, jonathan.backer, jamesr_chomium.org

Base URL:
svn://svn.chromium.org/chrome/trunk/src

Visibility:
Public.

More Reviews

Description

cc: Chromify TextureLayerClient R=danakj@chromium.org BUG=none Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=189050

Patch Set 2 : context3d, parameters #

Patch Set 4 : Rebase #

Created: 7 years, 9 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+33 lines, -34 lines)			Patch
M	cc/layers/texture_layer.cc	View	1 2	4 chunks	+5 lines, -5 lines	0 comments	Download
M	cc/layers/texture_layer_client.h	View	1 2	1 chunk	+14 lines, -15 lines	0 comments	Download
M	ui/compositor/layer.h	View	1 2	1 chunk	+2 lines, -2 lines	0 comments	Download
M	ui/compositor/layer.cc	View	1 2	1 chunk	+2 lines, -2 lines	0 comments	Download
M	webkit/compositor_bindings/web_external_texture_layer_impl.h	View	1 2	1 chunk	+2 lines, -2 lines	0 comments	Download
M	webkit/compositor_bindings/web_external_texture_layer_impl.cc	View	1 2	1 chunk	+4 lines, -4 lines	0 comments	Download
M	webkit/plugins/ppapi/ppapi_plugin_instance.h	View	1 2	1 chunk	+2 lines, -2 lines	0 comments	Download
M	webkit/plugins/ppapi/ppapi_plugin_instance.cc	View	1 2	1 chunk	+2 lines, -2 lines	0 comments	Download

Messages

Total messages: 21 (0 generated)

Expand Messages | Collapse Messages

danakj

LGTM https://codereview.chromium.org/12670009/diff/1/cc/texture_layer_client.h File cc/texture_layer_client.h (right): https://codereview.chromium.org/12670009/diff/1/cc/texture_layer_client.h#newcode22 cc/texture_layer_client.h:22: virtual WebKit::WebGraphicsContext3D* Context() = 0; I've been naming ...

7 years, 9 months ago (2013-03-17 16:15:10 UTC) #2

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/enne@chromium.org/12670009/6001

7 years, 9 months ago (2013-03-17 19:06:21 UTC) #3

commit-bot: I haz the power

Presubmit check for 12670009-6001 failed and returned exit status 1. INFO:root:Found 8 file(s). Running presubmit ...

7 years, 9 months ago (2013-03-17 19:06:24 UTC) #4

enne (OOO)

I think we have still some 3d vs 3D differences in Chromium, but I think ...

7 years, 9 months ago (2013-03-17 19:06:41 UTC) #5

enne (OOO)

+piman for ui/compositer and webkit/plugins/ppapi OWNERS

7 years, 9 months ago (2013-03-17 19:07:58 UTC) #6

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/enne@chromium.org/12670009/6001

7 years, 9 months ago (2013-03-19 01:53:33 UTC) #8

commit-bot: I haz the power

Failed to apply patch for cc/texture_layer.cc: While running patch -p1 --forward --force --no-backup-if-mismatch; patching file ...

7 years, 9 months ago (2013-03-19 01:53:35 UTC) #9

Failed to apply patch for cc/texture_layer.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file cc/texture_layer.cc
  Hunk #1 FAILED at 58.
  Hunk #2 FAILED at 102.
  Hunk #3 FAILED at 140.
  Hunk #4 FAILED at 158.
  4 out of 4 hunks FAILED -- saving rejects to file cc/texture_layer.cc.rej

Patch:       cc/texture_layer.cc
Index: cc/texture_layer.cc
diff --git a/cc/texture_layer.cc b/cc/texture_layer.cc
index
ffb22ac0ed9dee71993e9b3afe0befd5a93650e5..ae1d727ffe47be9526f0634d0beb74754626c414
100644
--- a/cc/texture_layer.cc
+++ b/cc/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;

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/enne@chromium.org/12670009/14001

7 years, 9 months ago (2013-03-19 02:12:49 UTC) #10

commit-bot: I haz the power

Step "update" is always a major failure. Look at the try server FAQ for more ...

7 years, 9 months ago (2013-03-19 04:06:12 UTC) #11

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/enne@chromium.org/12670009/14001

7 years, 9 months ago (2013-03-19 04:17:17 UTC) #12

commit-bot: I haz the power

Step "update" is always a major failure. Look at the try server FAQ for more ...

7 years, 9 months ago (2013-03-19 04:24:47 UTC) #13

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/enne@chromium.org/12670009/32001

7 years, 9 months ago (2013-03-19 05:01:32 UTC) #14

commit-bot: I haz the power

Step "update" is always a major failure. Look at the try server FAQ for more ...

7 years, 9 months ago (2013-03-19 05:08:55 UTC) #15

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/enne@chromium.org/12670009/32001

7 years, 9 months ago (2013-03-19 05:22:48 UTC) #16

commit-bot: I haz the power

Step "update" is always a major failure. Look at the try server FAQ for more ...

7 years, 9 months ago (2013-03-19 05:38:02 UTC) #17

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/enne@chromium.org/12670009/32001

7 years, 9 months ago (2013-03-19 07:16:56 UTC) #18

commit-bot: I haz the power

Retried try job too often on mac_rel for step(s) unit_tests http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_rel&number=110329

7 years, 9 months ago (2013-03-19 08:43:50 UTC) #19

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/enne@chromium.org/12670009/32001

7 years, 9 months ago (2013-03-19 16:42:40 UTC) #20

Message was sent while issue was closed.

Change committed as 189050

Expand Messages | Collapse Messages