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

Issue 480723002: Revert of Mojo multiple command buffer support and sample (Closed)

Created:
6 years, 4 months ago by tdanderson
Modified:
5 years, 7 months ago
CC:
chromium-reviews, qsr+mojo_chromium.org, viettrungluu+watch_chromium.org, yzshen+watch_chromium.org, abarth-chromium, Aaron Boodman, ben+mojo_chromium.org, Ben Goodger (Google), sky, piman
Project:
chromium
Visibility:
Public.

Description

Revert of Mojo multiple command buffer support and sample (patchset #6 of https://codereview.chromium.org/451753003/) Reason for revert: Reverting because this closed the tree due to a failed compile step on Linux Builder (dbg)(32). See http://build.chromium.org/p/chromium.linux/builders/Linux%20Builder%20%28dbg%29%2832%29/builds/27701 Original issue's description: > Mojo multiple command buffer support and sample > > TBR=danakj@chromium.org for DEPS file shuffle that moves a "+ui/gfx" > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=290157 TBR=darin@chromium.org,piman@chromium.org,jamesr@chromium.org NOTREECHECKS=true NOTRY=true

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+156 lines, -733 lines) Patch
M mojo/examples/compositor_app/compositor_app.cc View 3 chunks +10 lines, -12 lines 0 comments Download
M mojo/examples/pepper_container_app/pepper_container_app.cc View 6 chunks +4 lines, -14 lines 0 comments Download
M mojo/examples/sample_app/sample_app.cc View 4 chunks +10 lines, -15 lines 0 comments Download
M mojo/examples/surfaces_app/DEPS View 1 chunk +1 line, -3 lines 0 comments Download
D mojo/examples/surfaces_app/child_gl_app.cc View 1 chunk +0 lines, -59 lines 0 comments Download
D mojo/examples/surfaces_app/child_gl_impl.h View 1 chunk +0 lines, -71 lines 0 comments Download
D mojo/examples/surfaces_app/child_gl_impl.cc View 1 chunk +0 lines, -182 lines 0 comments Download
M mojo/examples/surfaces_app/embedder.h View 1 chunk +1 line, -1 line 0 comments Download
M mojo/examples/surfaces_app/embedder.cc View 3 chunks +3 lines, -3 lines 0 comments Download
M mojo/examples/surfaces_app/surfaces_app.cc View 8 chunks +24 lines, -49 lines 0 comments Download
M mojo/gles2/command_buffer_client_impl.cc View 1 chunk +4 lines, -4 lines 0 comments Download
M mojo/gles2/gles2_impl.cc View 1 chunk +0 lines, -1 line 0 comments Download
M mojo/mojo.gyp View 1 chunk +0 lines, -1 line 0 comments Download
M mojo/mojo_examples.gypi View 5 chunks +0 lines, -37 lines 0 comments Download
M mojo/mojo_services.gypi View 4 chunks +2 lines, -24 lines 0 comments Download
M mojo/services/gles2/command_buffer_impl.h View 3 chunks +1 line, -13 lines 0 comments Download
M mojo/services/gles2/command_buffer_impl.cc View 4 chunks +12 lines, -35 lines 0 comments Download
M mojo/services/native_viewport/BUILD.gn View 1 chunk +0 lines, -2 lines 0 comments Download
M mojo/services/native_viewport/DEPS View 1 chunk +0 lines, -4 lines 0 comments Download
D mojo/services/native_viewport/gpu_impl.h View 1 chunk +0 lines, -49 lines 0 comments Download
D mojo/services/native_viewport/gpu_impl.cc View 1 chunk +0 lines, -42 lines 0 comments Download
M mojo/services/native_viewport/native_viewport_impl.h View 3 chunks +7 lines, -0 lines 0 comments Download
M mojo/services/native_viewport/native_viewport_impl.cc View 5 chunks +34 lines, -3 lines 0 comments Download
D mojo/services/public/interfaces/gpu/BUILD.gn View 1 chunk +0 lines, -17 lines 0 comments Download
D mojo/services/public/interfaces/gpu/gpu.mojom View 1 chunk +0 lines, -15 lines 0 comments Download
M mojo/services/public/interfaces/native_viewport/BUILD.gn View 1 chunk +0 lines, -1 line 0 comments Download
M mojo/services/public/interfaces/native_viewport/native_viewport.mojom View 1 chunk +3 lines, -2 lines 0 comments Download
M mojo/services/surfaces/surfaces_impl.cc View 2 chunks +2 lines, -6 lines 0 comments Download
M mojo/services/view_manager/DEPS View 1 chunk +0 lines, -1 line 0 comments Download
M mojo/services/view_manager/root_view_manager.cc View 2 chunks +7 lines, -12 lines 0 comments Download
M mojo/services/view_manager/window_tree_host_impl.h View 4 chunks +8 lines, -11 lines 0 comments Download
M mojo/services/view_manager/window_tree_host_impl.cc View 3 chunks +20 lines, -24 lines 0 comments Download
M mojo/shell/DEPS View 1 chunk +0 lines, -1 line 0 comments Download
M mojo/shell/context.cc View 6 chunks +3 lines, -19 lines 0 comments Download

Messages

Total messages: 4 (0 generated)
tdanderson
Created Revert of Mojo multiple command buffer support and sample
6 years, 4 months ago (2014-08-16 22:24:53 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/tdanderson@chromium.org/480723002/1
6 years, 4 months ago (2014-08-16 22:25:48 UTC) #2
commit-bot: I haz the power
The CQ bit was unchecked by commit-bot@chromium.org
6 years, 4 months ago (2014-08-16 22:27:13 UTC) #3
commit-bot: I haz the power
6 years, 4 months ago (2014-08-16 22:27:13 UTC) #4
Failed to apply patch for mojo/examples/compositor_app/compositor_app.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file mojo/examples/compositor_app/compositor_app.cc
  Hunk #1 FAILED at 11.
  Hunk #2 FAILED at 29.
  Hunk #3 FAILED at 54.
  3 out of 3 hunks FAILED -- saving rejects to file
mojo/examples/compositor_app/compositor_app.cc.rej

Patch:       mojo/examples/compositor_app/compositor_app.cc
Index: mojo/examples/compositor_app/compositor_app.cc
diff --git a/mojo/examples/compositor_app/compositor_app.cc
b/mojo/examples/compositor_app/compositor_app.cc
index
c169d14c1258c66549edb2fcf70ca63bef24c2f2..513379e6d0fcaf0e7d03291c9b9b0302f19b29d2
100644
--- a/mojo/examples/compositor_app/compositor_app.cc
+++ b/mojo/examples/compositor_app/compositor_app.cc
@@ -11,7 +11,6 @@
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/system/core.h"
 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h"
-#include "mojo/services/public/interfaces/gpu/gpu.mojom.h"
 #include
"mojo/services/public/interfaces/native_viewport/native_viewport.mojom.h"
 #include "ui/gfx/rect.h"
 
@@ -29,22 +28,22 @@
     viewport_->Create(Rect::From(gfx::Rect(10, 10, 800, 600)));
     viewport_->Show();
 
-    // TODO(jamesr): Should be mojo:mojo_gpu_service
-    app->ConnectToService("mojo:mojo_native_viewport_service", &gpu_service_);
+    MessagePipe pipe;
+    viewport_->CreateGLES2Context(
+        MakeRequest<CommandBuffer>(pipe.handle0.Pass()));
+    host_.reset(new CompositorHost(pipe.handle1.Pass()));
   }
 
-  virtual void OnCreated(uint64_t native_viewport_id) OVERRIDE {
-    CommandBufferPtr cb;
-    gpu_service_->CreateOnscreenGLES2Context(
-        native_viewport_id, Size::From(gfx::Size(800, 600)), Get(&cb));
-    host_.reset(new CompositorHost(cb.PassMessagePipe()));
+  virtual void OnCreated() OVERRIDE {
   }
 
-  virtual void OnDestroyed() OVERRIDE { base::MessageLoop::current()->Quit(); }
+  virtual void OnDestroyed(const mojo::Callback<void()>& callback) OVERRIDE {
+    base::MessageLoop::current()->Quit();
+    callback.Run();
+  }
 
   virtual void OnBoundsChanged(RectPtr bounds) OVERRIDE {
-    if (host_)
-      host_->SetSize(gfx::Size(bounds->width, bounds->height));
+    host_->SetSize(gfx::Size(bounds->width, bounds->height));
   }
 
   virtual void OnEvent(EventPtr event,
@@ -54,7 +53,6 @@
 
  private:
   NativeViewportPtr viewport_;
-  GpuPtr gpu_service_;
   scoped_ptr<CompositorHost> host_;
   DISALLOW_COPY_AND_ASSIGN(SampleApp);
 };

Powered by Google App Engine
This is Rietveld 408576698