diff options
| author | jamesr <jamesr@chromium.org> | 2014-09-15 12:24:16 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-15 19:29:14 +0000 |
| commit | 048f8474044145b282f61d780817002df9137b78 (patch) | |
| tree | 28a8833c299355c894b918099397fe2d36c0f2bc /mojo/examples | |
| parent | 12f0f7db8095f1a5e40fb7227b217ddfc1724116 (diff) | |
| download | chromium_src-048f8474044145b282f61d780817002df9137b78.zip chromium_src-048f8474044145b282f61d780817002df9137b78.tar.gz chromium_src-048f8474044145b282f61d780817002df9137b78.tar.bz2 | |
Fixes for surfaces bindings exposed by wm_flow app
DisplayManager wasn't handling multiply nested things correctly and the
client library wasn't handling uploading to multiple views from the same
application. This fixes those. There's still some z-ordering issues that
show up pretty visibly. This hacks up texture alpha so you can see
partially through views to try to debug.
BUG=
Review URL: https://codereview.chromium.org/555953007
Cr-Commit-Position: refs/heads/master@{#294866}
Diffstat (limited to 'mojo/examples')
| -rw-r--r-- | mojo/examples/window_manager/window_manager.cc | 4 | ||||
| -rw-r--r-- | mojo/examples/wm_flow/embedded/embedded.cc | 10 |
2 files changed, 4 insertions, 10 deletions
diff --git a/mojo/examples/window_manager/window_manager.cc b/mojo/examples/window_manager/window_manager.cc index d0e6d82..627a67a 100644 --- a/mojo/examples/window_manager/window_manager.cc +++ b/mojo/examples/window_manager/window_manager.cc @@ -201,8 +201,6 @@ class RootLayoutManager : public ViewObserver { View* content_view = view_manager_->GetViewById(content_view_id_); content_view->SetBounds(new_bounds); - // Force the view's bitmap to be recreated - content_view->SetColor(SK_ColorBLUE); int delta_width = new_bounds.width() - old_bounds.width(); int delta_height = new_bounds.height() - old_bounds.height(); @@ -375,8 +373,6 @@ class WindowManager view->SetBounds(gfx::Rect(root->bounds().size())); content_view_id_ = view->id(); - root->SetColor(SK_ColorBLUE); - Id launcher_ui_id = CreateLauncherUI(); Id control_panel_id = CreateControlPanel(view); diff --git a/mojo/examples/wm_flow/embedded/embedded.cc b/mojo/examples/wm_flow/embedded/embedded.cc index 0a0d86b..0d332ab 100644 --- a/mojo/examples/wm_flow/embedded/embedded.cc +++ b/mojo/examples/wm_flow/embedded/embedded.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/bind.h" +#include "mojo/application/application_runner_chromium.h" #include "mojo/examples/wm_flow/app/embedder.mojom.h" #include "mojo/examples/wm_flow/embedded/embeddee.mojom.h" #include "mojo/public/cpp/application/application_connection.h" @@ -84,11 +85,8 @@ class WMFlowEmbedded : public mojo::ApplicationDelegate, } // namespace examples -namespace mojo { - -// static -ApplicationDelegate* ApplicationDelegate::Create() { - return new examples::WMFlowEmbedded; +MojoResult MojoMain(MojoHandle shell_handle) { + mojo::ApplicationRunnerChromium runner(new examples::WMFlowEmbedded); + return runner.Run(shell_handle); } -} // namespace |