Revert of Second attempt to land change to remove NativeViewportServi…

…ce and (patchset #9 id:160001 of https://codereview.chromium.org/568883003/) Reason for revert: ViewManagerTest failure. http://test-results.appspot.com/dashboards/flakiness_dashboard.html#master=chromium.win&testType=mojo_view_manager_unittests&tests=ViewManagerTest.AddAncestorFails,ViewManagerTest.AddViewWithNoChange,ViewManagerTest.CantAccessChildrenOfEmbeddedView,ViewManagerTest.CantGetViewTreeOfOtherRoots,ViewManagerTest.CantModifyChildrenOfEmbeddedView,ViewManagerTest.CantRemoveViewsInOtherRoots,ViewManagerTest.CreateView,ViewManagerTest.DeleteView,ViewManagerTest.DeleteViewFromAnotherConnectionDisallowed,ViewManagerTest.EmbedWithSameViewId,ViewManagerTest.EmbedWithSameViewId2,ViewManagerTest.MultipleEmbedRootsBeforeWTHReady,ViewManagerTest.OnViewInput,ViewManagerTest.ReorderView,ViewManagerTest.ReuseDeletedViewId,ViewManagerTest.SetViewVisibility,ViewManagerTest.SetViewVisibilityNotifications,ViewManagerTest.ViewHierarchyChangedAddingKnownToUnknown,ViewManagerTest.ViewHierarchyChangedViews,ViewManagerTest.ViewsRemovedWhenEmbedding Original issue's description: > Second attempt to land change to remove NativeViewportService and > ViewManager from mojo_shell. First attempt here: > https://codereview.chromium.org/477923004/ > > Failed the linux gn dbg build after cq landed: > http://build.chromium.org/p/chromium.linux/builders/Linux%20GN%20%28dbg%29/builds/12251 > > BUG= > [email protected] > > Committed: https://crrev.com/d3e622b0bb31f20c274bc9ad634b8ee7bae99ac1 > Cr-Commit-Position: refs/heads/master@{#295230} [email protected],[email protected] NOTREECHECKS=true NOTRY=true BUG= Review URL: https://codereview.chromium.org/578793002 Cr-Commit-Position: refs/heads/master@{#295245}
crosswalk-project · Sep 17, 2014 · db2b728 · db2b728
1 parent 2e4cb78
commit db2b728
Show file tree

Hide file tree

Showing 22 changed files with 169 additions and 260 deletions.
diff --git a/mojo/aura/aura_init.cc b/mojo/aura/aura_init.cc
@@ -11,7 +11,7 @@
 namespace mojo {
 
 AuraInit::AuraInit() {
-  aura::Env::CreateInstance(false);
+  aura::Env::CreateInstance(true);
 
   context_factory_.reset(new ContextFactoryMojo);
   aura::Env::GetInstance()->set_context_factory(context_factory_.get());

diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
@@ -40,7 +40,7 @@
         'mojo_geometry_lib',
         'mojo_html_viewer',
         'mojo_js',
-        'mojo_native_viewport_service',
+        'mojo_native_viewport_service_lib',
         'mojo_network_service',
         'mojo_pepper_container_app',
         'mojo_png_viewer',
@@ -148,13 +148,16 @@
         '../base/base.gyp:base',
         '../base/base.gyp:base_static',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+        '../net/net.gyp:net',
+        '../url/url.gyp:url_lib',
         'mojo_application_manager',
         'mojo_base.gyp:mojo_application_bindings',
         'mojo_base.gyp:mojo_common_lib',
         'mojo_base.gyp:mojo_gles2_impl',
         'mojo_base.gyp:mojo_system_impl',
         'mojo_base.gyp:mojo_application_chromium',
         'mojo_external_service_bindings',
+        'mojo_native_viewport_service_lib',
         'mojo_network_bindings',
         'mojo_spy',
       ],
@@ -192,13 +195,10 @@
         'shell/test_child_process.h',
         'shell/ui_application_loader_android.cc',
         'shell/ui_application_loader_android.h',
+        'shell/view_manager_loader.cc',
+        'shell/view_manager_loader.h',
       ],
       'conditions': [
-        ['component=="shared_library"', {
-          'dependencies': [
-            '../ui/gl/gl.gyp:gl',
-          ],
-        }],
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:dbus',
@@ -208,21 +208,36 @@
         ['OS=="android"', {
           'dependencies': [
             'mojo_network_service_lib',
-            'mojo_native_viewport_service_lib',
           ],
           'sources': [
             'shell/network_application_loader.cc',
             'shell/network_application_loader.h',
           ],
         }],
+        ['use_aura==1', {
+          'dependencies': [
+            # These are only necessary as long as we hard code use of ViewManager.
+            '../skia/skia.gyp:skia',
+            'mojo_view_manager',
+            'mojo_view_manager_bindings',
+          ],
+        }, {  # use_aura==0
+          'sources!': [
+            'shell/view_manager_loader.cc',
+            'shell/view_manager_loader.h',
+          ],
+        }],
       ],
     },
     {
       # GN version: //mojo/shell:test_support
       'target_name': 'mojo_shell_test_support',
       'type': 'static_library',
       'dependencies': [
+        '../base/base.gyp:base',
         '../base/base.gyp:base_static',
+        '../url/url.gyp:url_lib',
+        'mojo_application_manager',
         'mojo_base.gyp:mojo_system_impl',
         'mojo_shell_lib',
       ],
@@ -237,20 +252,24 @@
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
+        '../ui/gl/gl.gyp:gl',
+        '../url/url.gyp:url_lib',
+        'mojo_application_manager',
         'mojo_base.gyp:mojo_common_lib',
         'mojo_base.gyp:mojo_environment_chromium',
+        'mojo_base.gyp:mojo_system_impl',
         'mojo_shell_lib',
       ],
-      'sources': [
-        'shell/desktop/mojo_main.cc',
-      ],
       'conditions': [
-        ['component=="shared_library"', {
+        ['use_ozone==1', {
           'dependencies': [
-            '../ui/gfx/gfx.gyp:gfx',
+            '../ui/ozone/ozone.gyp:ozone',
           ],
         }],
       ],
+      'sources': [
+        'shell/desktop/mojo_main.cc',
+      ],
     },
     {
       # GN version: //mojo/shell:mojo_shell_tests
@@ -262,6 +281,8 @@
         '../base/base.gyp:test_support_base',
         '../testing/gtest.gyp:gtest',
         '../net/net.gyp:net_test_support',
+        # TODO(vtl): We don't currently need this, but I imagine we will soon.
+        # '../ui/gl/gl.gyp:gl',
         '../url/url.gyp:url_lib',
         'mojo_application_manager',
         'mojo_base.gyp:mojo_common_lib',
@@ -299,6 +320,7 @@
       'dependencies': [
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+        '../net/net.gyp:net',
         '../url/url.gyp:url_lib',
         'mojo_content_handler_bindings',
         'mojo_network_bindings',
@@ -460,6 +482,7 @@
             '../ui/compositor/compositor.gyp:compositor',
             '../ui/events/events.gyp:events',
             '../ui/events/events.gyp:events_base',
+            '../ui/gl/gl.gyp:gl',
             '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
             'mojo_cc_support',
             'mojo_native_viewport_bindings',

diff --git a/mojo/mojo_examples.gypi b/mojo/mojo_examples.gypi
@@ -81,7 +81,7 @@
       ],
       'sources': [
         'examples/sample_app/gles2_client_impl.cc',
-        'examples/sample_app/gles2_client_impl.h',
+        'examples/sample_app/gles2_client_impl.cc',
         'examples/sample_app/sample_app.cc',
         'examples/sample_app/spinning_cube.cc',
         'examples/sample_app/spinning_cube.h',
@@ -567,6 +567,7 @@
             '../skia/skia.gyp:skia',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_geometry',
+            '../ui/gl/gl.gyp:gl',
             'mojo_base.gyp:mojo_application_chromium',
             'mojo_base.gyp:mojo_cpp_bindings',
             'mojo_base.gyp:mojo_utility',
@@ -662,6 +663,7 @@
             '../ui/base/ui_base.gyp:ui_base',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_geometry',
+            '../ui/gl/gl.gyp:gl',
             '../ui/resources/ui_resources.gyp:ui_resources',
             '../ui/resources/ui_resources.gyp:ui_test_pak',
             '../ui/views/views.gyp:views',
@@ -696,6 +698,7 @@
           'dependencies': [
             '../base/base.gyp:base',
             '../ui/gfx/gfx.gyp:gfx_geometry',
+            '../ui/gl/gl.gyp:gl',
             '../url/url.gyp:url_lib',
             'mojo_base.gyp:mojo_application_chromium',
             'mojo_base.gyp:mojo_cpp_bindings',
@@ -720,6 +723,7 @@
           'dependencies': [
             '../base/base.gyp:base',
             '../ui/gfx/gfx.gyp:gfx_geometry',
+            '../ui/gl/gl.gyp:gl',
             '../url/url.gyp:url_lib',
             'mojo_base.gyp:mojo_application_chromium',
             'mojo_base.gyp:mojo_cpp_bindings',

diff --git a/mojo/mojo_services.gypi b/mojo/mojo_services.gypi
@@ -328,6 +328,8 @@
     {
       # GN version: //mojo/services/native_viewport
       'target_name': 'mojo_native_viewport_service_lib',
+      # This is linked directly into the embedder, so we make it a static_library.
+      # TODO(davemoore): Make this a true service.
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
@@ -397,21 +399,6 @@
         }],
       ],
     },
-    {
-      'target_name': 'mojo_native_viewport_service',
-      'type': 'loadable_module',
-      'dependencies': [
-        'mojo_native_viewport_bindings',
-        'mojo_native_viewport_service_lib',
-        '<(mojo_system_for_loadable_module)',
-      ],
-      'export_dependent_settings': [
-        'mojo_native_viewport_bindings',
-      ],
-      'sources': [
-        'services/native_viewport/main.cc',
-      ],
-    },
     {
       # GN version: //mojo/services/public/interfaces/navigation
       'target_name': 'mojo_navigation_bindings',
@@ -774,7 +761,7 @@
         {
           # GN version: //mojo/services/view_manager
           'target_name': 'mojo_view_manager',
-          'type': 'loadable_module',
+          'type': '<(component)',
           'dependencies': [
             '../base/base.gyp:base',
             '../cc/cc.gyp:cc_surfaces',
@@ -784,8 +771,6 @@
             '../ui/events/events.gyp:events_base',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_geometry',
-            '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
-            'mojo_base.gyp:mojo_common_lib',
             'mojo_base.gyp:mojo_application_chromium',
             'mojo_base.gyp:mojo_common_lib',
             'mojo_geometry_bindings',
@@ -798,8 +783,7 @@
             'mojo_surfaces_lib',
             'mojo_view_manager_bindings',
             'mojo_view_manager_common',
-            'mojo_gpu_bindings',
-            '<(mojo_system_for_loadable_module)',
+            '<(mojo_system_for_component)',
           ],
           'sources': [
             'services/view_manager/access_policy.h',
@@ -825,9 +809,6 @@
             'services/view_manager/window_manager_access_policy.cc',
             'services/view_manager/window_manager_access_policy.h',
           ],
-          'includes': [
-            'mojo_public_gles2_for_loadable_module.gypi',
-          ],
           'defines': [
             'MOJO_VIEW_MANAGER_IMPLEMENTATION',
           ],
@@ -839,13 +820,20 @@
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:test_support_base',
+            '../ui/gl/gl.gyp:gl',
           ],
           'sources': [
             'services/public/cpp/view_manager/lib/view_manager_test_suite.cc',
             'services/public/cpp/view_manager/lib/view_manager_test_suite.h',
             'services/public/cpp/view_manager/lib/view_manager_unittests.cc',
           ],
           'conditions': [
+            ['OS=="linux" or OS=="win"', {
+              'dependencies': [
+                '../third_party/mesa/mesa.gyp:osmesa',
+                'mojo_native_viewport_service_lib',
+              ],
+            }],
             ['use_x11==1', {
               'dependencies': [
                 '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
@@ -864,6 +852,7 @@
             '../testing/gtest.gyp:gtest',
             '../ui/aura/aura.gyp:aura',
             '../ui/gfx/gfx.gyp:gfx_geometry',
+            '../ui/gl/gl.gyp:gl',
             'mojo_application_manager',
             'mojo_base.gyp:mojo_system_impl',
             'mojo_base.gyp:mojo_application_chromium',
@@ -881,13 +870,6 @@
             'services/view_manager/test_change_tracker.h',
             'services/view_manager/view_manager_unittest.cc',
           ],
-          'conditions': [
-             ['OS=="win"', {
-               'dependencies': [
-                 '../ui/gfx/gfx.gyp:gfx',
-               ],
-             }],
-           ],
         },
         {
           'target_name': 'package_mojo_view_manager',
@@ -939,6 +921,7 @@
           'dependencies': [
             '../base/base.gyp:test_support_base',
             '../testing/gtest.gyp:gtest',
+            '../ui/gl/gl.gyp:gl',
             'mojo_application_manager',
             'mojo_base.gyp:mojo_system_impl',
             'mojo_base.gyp:mojo_environment_chromium',

diff --git a/mojo/services/BUILD.gn b/mojo/services/BUILD.gn
@@ -9,6 +9,7 @@ group("services") {
     "//mojo/services/clipboard",
     "//mojo/services/gles2:bindings",
     "//mojo/services/html_viewer",
+    "//mojo/services/native_viewport",
     "//mojo/services/network",
     "//mojo/services/public/interfaces/clipboard",
     "//mojo/services/public/interfaces/content_handler",
@@ -21,14 +22,10 @@ group("services") {
     "//mojo/services/surfaces",
     "//mojo/services/test_service:bindings",
   ]
-  if (!is_android) {
-    deps += ["//mojo/services/native_viewport"]
-  }
   if (use_aura) {
     deps += [
       "//mojo/services/public/interfaces/view_manager",
       "//mojo/services/public/interfaces/window_manager",
-      "//mojo/services/view_manager",
       "//mojo/services/window_manager",
     ]
   }

diff --git a/mojo/services/html_viewer/DEPS b/mojo/services/html_viewer/DEPS
@@ -8,7 +8,5 @@ include_rules = [
   "+skia",
   "+third_party/WebKit/public",
   "+third_party/skia/include",
-  "+ui/base",
-  "+ui/events",
   "+ui/native_theme",
 ]
diff --git a/mojo/services/html_viewer/html_viewer.cc b/mojo/services/html_viewer/html_viewer.cc
@@ -16,13 +16,6 @@
 #include "mojo/services/public/interfaces/content_handler/content_handler.mojom.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 
-#if !defined(COMPONENT_BUILD)
-#include "base/i18n/icu_util.h"
-#include "base/path_service.h"
-#include "ui/base/resource/resource_bundle.h"
-#include "ui/base/ui_base_paths.h"
-#endif
-
 namespace mojo {
 
 class HTMLViewer;
@@ -70,16 +63,6 @@ class HTMLViewer : public ApplicationDelegate,
     shell_ = app->shell();
     blink_platform_impl_.reset(new BlinkPlatformImpl(app));
     blink::initialize(blink_platform_impl_.get());
-#if !defined(COMPONENT_BUILD)
-  base::i18n::InitializeICU();
-
-  ui::RegisterPathProvider();
-
-  base::FilePath ui_test_pak_path;
-  CHECK(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
-  ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
-#endif
-
     compositor_thread_.Start();
     web_media_player_factory_.reset(new WebMediaPlayerFactory(
         compositor_thread_.message_loop_proxy()));