Merge pull request #425 from joone/2015.10.gardening

Gardening Request

.DEPS.git

@@ -1,6 +1,6 @@
 vars = {
   'chromium_url': 'https://chromium.googlesource.com/chromium/src.git',
-  'chromium_rev': 'efd0d76685a89f3a5e988a37d9199eb91b0d6d3a',
+  'chromium_rev': '319329de7edb672d11217094c5f9b77bc7af1f26',
 }
 
 deps = {

patches/0001-Browser-Support-Desktop-Aura-creation-on-Ozone.patch

@@ -1,7 +1,7 @@
-From fd183966fb3efc988f24f88c1edc2693a3d32ce6 Mon Sep 17 00:00:00 2001
+From 3a44c0c84ea628797ff80a2e39ed30f1d17008a4 Mon Sep 17 00:00:00 2001
 From: Kalyan Kondapally <kalyan.kondapally@intel.com>
 Date: Tue, 3 Mar 2015 14:29:53 -0800
-Subject: [PATCH 01/15] Browser: Support Desktop Aura creation on Ozone
+Subject: [PATCH 01/13] Browser: Support Desktop Aura creation on Ozone
 
 This CL creates BrowserDesktopRootWindowHostOzone and gives support
 for Aura Ozone implementations
@@ -200,10 +200,10 @@ index 0000000..4096680
 +
 +#endif  // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_ROOT_WINDOW_HOST_OZONE_H_
 diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
-index 5d2e71a..9a482ed 100644
+index 57c4a82..2405f7a 100644
 --- a/chrome/chrome_browser_ui.gypi
 +++ b/chrome/chrome_browser_ui.gypi
-@@ -1349,6 +1349,8 @@
+@@ -1308,6 +1308,8 @@
        'browser/ui/views/frame/browser_desktop_window_tree_host_x11.h',
        'browser/ui/views/frame/desktop_browser_frame_auralinux.cc',
        'browser/ui/views/frame/desktop_browser_frame_auralinux.h',

patches/0002-Remove-usage-of-DesktopFactory.patch

@@ -1,7 +1,7 @@
-From dd2d10fd0d86dd811c2f4f52b1e91bc3663d70cd Mon Sep 17 00:00:00 2001
+From 69a933f8d3e37177abfd831d0a67e3755abd05f0 Mon Sep 17 00:00:00 2001
 From: Kalyan Kondapally <kalyan.kondapally@intel.com>
 Date: Wed, 16 Sep 2015 18:54:04 -0700
-Subject: [PATCH] Remove usage of DesktopFactory.
+Subject: [PATCH 02/13] Remove usage of DesktopFactory.
 
 This is highly experimental. Eventually, the goal is to only have
 platform specific parts in Wayland and core implementation as part
@@ -20,10 +20,10 @@ discussion upstream.
  delete mode 100644 ui/views/widget/desktop_aura/desktop_window_tree_host_ozone.cc
 
 diff --git a/ui/views/views.gyp b/ui/views/views.gyp
-index 81f653e..e1ce764 100644
+index f1d71a7..6fcfa93 100644
 --- a/ui/views/views.gyp
 +++ b/ui/views/views.gyp
-@@ -465,12 +465,6 @@
+@@ -463,12 +463,6 @@
        'widget/desktop_aura/desktop_window_tree_host_win.cc',
        'widget/desktop_aura/desktop_window_tree_host_win.h',
      ],

patches/0003-Add-support-to-provide-external-ozone-files-in-views.patch

@@ -1,7 +1,7 @@
-From 57c55a8b8edd6572c9538e3a943214a99f52a0af Mon Sep 17 00:00:00 2001
+From cbb41e03ef2f4ddcd3636ca3ff26e3a73fe0cdf5 Mon Sep 17 00:00:00 2001
 From: Kalyan Kondapally <kalyan.kondapally@intel.com>
 Date: Tue, 19 Aug 2014 21:08:47 -0700
-Subject: [PATCH 03/15] Add support to provide external ozone files in views.
+Subject: [PATCH 03/13] Add support to provide external ozone files in views.
 
 We have un-necessary dependency on views. This is a temporary patch
 to include desktop_aura/ as part of view target.
@@ -10,7 +10,7 @@ to include desktop_aura/ as part of view target.
  1 file changed, 2 insertions(+)
 
 diff --git a/ui/views/views.gyp b/ui/views/views.gyp
-index dcdaff2..d80b20c 100644
+index 6fcfa93..bfbc3f1 100644
 --- a/ui/views/views.gyp
 +++ b/ui/views/views.gyp
 @@ -4,6 +4,7 @@
@@ -21,7 +21,7 @@ index dcdaff2..d80b20c 100644
      # Sources lists shared with GN build.
      'views_sources': [
        'accessibility/native_view_accessibility.cc',
-@@ -696,6 +697,7 @@
+@@ -718,6 +719,7 @@
          }],
          ['use_aura==1', {
            'sources': [

patches/0004-Add-support-for-checking-DesktopWindow-with-Ozone-an.patch

@@ -1,7 +1,7 @@
-From 85ec25d48080fc9e2361cc78c56ac835c2b08682 Mon Sep 17 00:00:00 2001
+From 7d10293f881876c468999fa712120a10b763c613 Mon Sep 17 00:00:00 2001
 From: Kondapally Kalyan <kalyan.kondapally@intel.com>
 Date: Tue, 17 Jun 2014 20:24:19 +0300
-Subject: [PATCH 04/15] Add support for checking DesktopWindow with Ozone and
+Subject: [PATCH 04/13] Add support for checking DesktopWindow with Ozone and
  Ash.
 
 Only windows hosted by a DesktopWindowTreeHost implementation can be mapped

patches/0005-Media-Build-VaapiPictureWayland-as-part-of-Media.patch

@@ -1,7 +1,7 @@
-From 34d32bb57bd2d57dc92a95c67322e9158b4cbd85 Mon Sep 17 00:00:00 2001
+From c2c95e206877fa607028156b1854157b516ec423 Mon Sep 17 00:00:00 2001
 From: Kalyan Kondapally <kalyan.kondapally@intel.com>
 Date: Thu, 9 Jul 2015 00:53:02 -0700
-Subject: [PATCH 05/15] Media: Build VaapiPictureWayland as part of Media.
+Subject: [PATCH 05/13] Media: Build VaapiPictureWayland as part of Media.
 
 This is temporary, so we can avoid gl circular dependency. Eventually,
 we want to be as aligned as possible with upstream Media solution and need
@@ -11,10 +11,10 @@ to figure out how we could use upstream VaapiWrapper.
  1 file changed, 32 insertions(+), 19 deletions(-)
 
 diff --git a/content/content_common.gypi b/content/content_common.gypi
-index fbf356a6..04ee91e 100644
+index feea62c..5c58210 100644
 --- a/content/content_common.gypi
 +++ b/content/content_common.gypi
-@@ -841,7 +841,7 @@
+@@ -860,7 +860,7 @@
          },
        ],
      }],
@@ -23,7 +23,7 @@ index fbf356a6..04ee91e 100644
        'sources': [
          'common/gpu/media/accelerated_video_decoder.h',
          'common/gpu/media/h264_decoder.cc',
-@@ -892,7 +892,7 @@
+@@ -916,7 +916,7 @@
          'common/gpu/media/tegra_v4l2_device.h',
        ],
      }],
@@ -32,7 +32,7 @@ index fbf356a6..04ee91e 100644
        'dependencies': [
          '../media/media.gyp:media',
          '../third_party/libyuv/libyuv.gyp:libyuv',
-@@ -903,18 +903,19 @@
+@@ -927,18 +927,19 @@
          'common/gpu/media/vaapi_jpeg_decode_accelerator.h',
          'common/gpu/media/vaapi_jpeg_decoder.cc',
          'common/gpu/media/vaapi_jpeg_decoder.h',
@@ -58,7 +58,7 @@ index fbf356a6..04ee91e 100644
              'sig_files': [
                'common/gpu/media/va.sigs',
                'common/gpu/media/va_x11.sigs',
-@@ -925,21 +926,33 @@
+@@ -949,21 +950,33 @@
              'common/gpu/media/vaapi_tfp_picture.h',
            ],
          }, {

patches/0007-Fix-crash-when-switching-to-console-VT-mode.patch → patches/0006-Fix-crash-when-switching-to-console-VT-mode.patch

@@ -1,7 +1,7 @@
-From 5f48e541786fbbde4f4fcee9f37309a8558a53c4 Mon Sep 17 00:00:00 2001
+From 4a0ddbba228c61cff2ed03fae86c48e8f5550ea8 Mon Sep 17 00:00:00 2001
 From: Joone Hur <joone.hur@intel.com>
 Date: Mon, 27 Oct 2014 15:22:48 -0700
-Subject: [PATCH 07/15] Fix crash when switching to console(VT) mode
+Subject: [PATCH 06/13] Fix crash when switching to console(VT) mode
 
 Buffer swapping should not be synchronized so that the GPU process
 is not blocked by waiting for a frame update from Weston.

patches/0008-PlatformWindow-Add-needed-support-in-PlatformWindow.patch → patches/0007-Add-needed-support-in-PlatformWindow.patch

@@ -1,7 +1,7 @@
-From b307e455675cbff6f6f3c3061b4cb722fd9ecf8c Mon Sep 17 00:00:00 2001
+From 27fae9e25bc0bf4df58b56eaf89a0c27028d4ae6 Mon Sep 17 00:00:00 2001
 From: Kalyan Kondapally <kalyan.kondapally@intel.com>
 Date: Fri, 11 Sep 2015 22:31:20 -0700
-Subject: [PATCH 1/8] Add needed support in PlatformWindow.
+Subject: [PATCH 07/13] Add needed support in PlatformWindow.
 
 This patch adds necessary API support in PlatformWindow. The changes
 need to be evaluated further before trying to upstream them.
@@ -70,5 +70,5 @@ index a8fd6ee..93dae5b 100644
    virtual void Hide() = 0;
    virtual void Close() = 0;
 -- 
-2.4.3
+1.9.1
 

patches/0011-Add-file-picker-support-using-WebUI.patch → patches/0008-Add-file-picker-support-using-WebUI.patch

@@ -1,7 +1,7 @@
-From 3211d59adb8ec9c2b65ff5bd52ee4bf54fe20e54 Mon Sep 17 00:00:00 2001
+From 58baa59f89b8cbbfa93ec8c2aa2b9d62849b0683 Mon Sep 17 00:00:00 2001
 From: Joone Hur <joone.hur@intel.com>
 Date: Fri, 11 Sep 2015 18:45:01 -0700
-Subject: [PATCH] Add file picker support using WebUI
+Subject: [PATCH 08/13] Add file picker support using WebUI
 
 File-picker has not been supported in oz-wl because Gtk+2 does not work under
 Wayland, but Chromium Linux version still uses Gtk+2 for file-picker.
@@ -33,10 +33,10 @@ File browsing UI will be added later.
  create mode 100644 chrome/browser/ui/webui/file_picker/file_picker_web_dialog.cc
 
 diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
-index bc22588..c045ab3 100644
+index 631128e..5a68ffc 100644
 --- a/chrome/app/generated_resources.grd
 +++ b/chrome/app/generated_resources.grd
-@@ -15339,6 +15339,14 @@ After you create a new supervised user, you can manage their settings at any tim
+@@ -15164,6 +15164,14 @@ After you create a new supervised user, you can manage their settings at any tim
          Allows users to opt in to the collection of invalid TLS/SSL certificate chains.
        </message>
 
@@ -52,10 +52,10 @@ index bc22588..c045ab3 100644
          <ph name="URL">
            $1<ex>www.google.com</ex>
 diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
-index 0e17d0e..eee0a21 100644
+index 5ab7e27..7336559 100644
 --- a/chrome/browser/browser_resources.grd
 +++ b/chrome/browser/browser_resources.grd
-@@ -450,6 +450,9 @@
+@@ -464,6 +464,9 @@
        <if expr="enable_media_router">
          <part file="media_router_resources.grdp" />
        </if>
@@ -279,18 +279,18 @@ index 9e9476b..e257134 100644
      views::LinuxUI::instance()->Initialize();
  #endif
 diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-index 5fe11af..bf8c6d1 100644
+index c7a3e9e..15cd3aa 100644
 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
 +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -72,6 +72,7 @@
+@@ -75,6 +75,7 @@
  #include "ui/gfx/favicon_size.h"
  #include "ui/web_dialogs/web_dialog_ui.h"
  #include "url/gurl.h"
 +#include "chrome/browser/ui/webui/file_picker/file_picker_ui.h"
 
  #if !defined(DISABLE_NACL)
  #include "chrome/browser/ui/webui/nacl_ui.h"
-@@ -326,6 +327,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
+@@ -333,6 +334,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
      return &NewWebUI<DomainReliabilityInternalsUI>;
    if (url.host() == chrome::kChromeUIFlagsHost)
      return &NewWebUI<FlagsUI>;
@@ -552,10 +552,10 @@ index 0000000..3f10e85
 +
 +}  // namespace ui
 diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
-index 423e7a9..f93303d 100644
+index 2405f7a..b2b6124 100644
 --- a/chrome/chrome_browser_ui.gypi
 +++ b/chrome/chrome_browser_ui.gypi
-@@ -427,6 +427,9 @@
+@@ -403,6 +403,9 @@
        'browser/ui/webui/favicon_source.h',
        'browser/ui/webui/fileicon_source.cc',
        'browser/ui/webui/fileicon_source.h',
@@ -565,15 +565,15 @@ index 423e7a9..f93303d 100644
        'browser/ui/webui/flags_ui.cc',
        'browser/ui/webui/flags_ui.h',
        'browser/ui/webui/gcm_internals_ui.cc',
-@@ -2741,6 +2744,7 @@
+@@ -2781,6 +2784,7 @@
          '../content/content.gyp:content_browser',
          '../content/content.gyp:content_common',
          '../crypto/crypto.gyp:crypto',
 +        '../ozone/ui/webui/webui.gypi:webui',
          '../skia/skia.gyp:skia',
          '../sync/sync.gyp:sync',
          '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
-@@ -3103,6 +3107,7 @@
+@@ -3146,6 +3150,7 @@
                'dependencies': [
                  '../build/linux/system.gyp:dbus',
                  '../build/linux/system.gyp:fontconfig',
@@ -582,7 +582,7 @@ index 423e7a9..f93303d 100644
                ],
              }],
 diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
-index ce82af2..43afe66 100644
+index 8f0185c..85e50b3 100644
 --- a/chrome/common/url_constants.cc
 +++ b/chrome/common/url_constants.cc
 @@ -43,6 +43,7 @@ const char kChromeUIExtensionsFrameURL[] = "chrome://extensions-frame/";
@@ -593,15 +593,15 @@ index ce82af2..43afe66 100644
  const char kChromeUIFlagsURL[] = "chrome://flags/";
  const char kChromeUIFlashURL[] = "chrome://flash/";
  const char kChromeUIGCMInternalsURL[] = "chrome://gcm-internals/";
-@@ -185,6 +186,7 @@ const char kChromeUIExtensionsFrameHost[] = "extensions-frame";
+@@ -186,6 +187,7 @@ const char kChromeUIExtensionsFrameHost[] = "extensions-frame";
  const char kChromeUIExtensionsHost[] = "extensions";
  const char kChromeUIFallbackIconHost[] = "fallback-icon";
  const char kChromeUIFaviconHost[] = "favicon";
 +const char kChromeUIFilePickerHost[] = "file-picker";
  const char kChromeUIFlagsHost[] = "flags";
  const char kChromeUIFlashHost[] = "flash";
  const char kChromeUIGCMInternalsHost[] = "gcm-internals";
-@@ -595,6 +597,7 @@ const char* const kChromeHostURLs[] = {
+@@ -599,6 +601,7 @@ const char* const kChromeHostURLs[] = {
    kChromeUICreditsHost,
    kChromeUIDeviceLogHost,
    kChromeUIDNSHost,
@@ -610,7 +610,7 @@ index ce82af2..43afe66 100644
    kChromeUIHistoryHost,
    kChromeUIInvalidationsHost,
 diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
-index 90f2534..74b3fcd 100644
+index 6dc3784..ac7e7ff 100644
 --- a/chrome/common/url_constants.h
 +++ b/chrome/common/url_constants.h
 @@ -39,6 +39,7 @@ extern const char kChromeUIExtensionsFrameURL[];
@@ -621,7 +621,7 @@ index 90f2534..74b3fcd 100644
  extern const char kChromeUIFlagsURL[];
  extern const char kChromeUIFlashURL[];
  extern const char kChromeUIGCMInternalsURL[];
-@@ -175,6 +176,7 @@ extern const char kChromeUIExtensionsFrameHost[];
+@@ -177,6 +178,7 @@ extern const char kChromeUIExtensionsFrameHost[];
  extern const char kChromeUIExtensionsHost[];
  extern const char kChromeUIFallbackIconHost[];
  extern const char kChromeUIFaviconHost[];
@@ -630,7 +630,7 @@ index 90f2534..74b3fcd 100644
  extern const char kChromeUIFlashHost[];
  extern const char kChromeUIGCMInternalsHost[];
 diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids
-index 1b5dc41..720354c 100644
+index a5bcffe..8607674 100644
 --- a/tools/gritsettings/resource_ids
 +++ b/tools/gritsettings/resource_ids
 @@ -16,7 +16,7 @@

patches/0013-Media-Use-upstream-Video-Accelerator.patch → patches/0009-Media-Use-upstream-Video-Accelerator.patch

@@ -1,7 +1,7 @@
-From 71d233f372d83785b7c22c5f1faef80a1b2a1419 Mon Sep 17 00:00:00 2001
+From 7fa5ffb9399f710b389974aa3a931703f8c7fbb8 Mon Sep 17 00:00:00 2001
 From: Kalyan Kondapally <kalyan.kondapally@intel.com>
 Date: Tue, 15 Sep 2015 01:34:13 -0700
-Subject: [PATCH] Media: Use upstream Video Accelerator.
+Subject: [PATCH 09/13] Media: Use upstream Video Accelerator.
 
 ---
  chrome/browser/password_manager/password_store_factory.cc |  2 +-
@@ -10,7 +10,7 @@ Subject: [PATCH] Media: Use upstream Video Accelerator.
  3 files changed, 5 insertions(+), 9 deletions(-)
 
 diff --git a/chrome/browser/password_manager/password_store_factory.cc b/chrome/browser/password_manager/password_store_factory.cc
-index 1879e41..fcf59a5 100644
+index a35215c7..18a2e1a 100644
 --- a/chrome/browser/password_manager/password_store_factory.cc
 +++ b/chrome/browser/password_manager/password_store_factory.cc
 @@ -62,7 +62,7 @@ const LocalProfileId kInvalidLocalProfileId =
@@ -58,11 +58,11 @@ index 5205404..87b8a94 100644
  }
 
 diff --git a/content/common/sandbox_linux/bpf_gpu_policy_linux.cc b/content/common/sandbox_linux/bpf_gpu_policy_linux.cc
-index c244d6c..2a29d6c 100644
+index 8f7fd64d..9873886 100644
 --- a/content/common/sandbox_linux/bpf_gpu_policy_linux.cc
 +++ b/content/common/sandbox_linux/bpf_gpu_policy_linux.cc
-@@ -316,7 +316,7 @@ bool GpuProcessPolicy::PreSandboxHook() {
-       dlopen(I965DrvVideoPath, RTLD_NOW|RTLD_GLOBAL|RTLD_NODELETE);
+@@ -314,7 +314,7 @@ bool GpuProcessPolicy::PreSandboxHook() {
+         dlopen(I965HybridDrvVideoPath, RTLD_NOW|RTLD_GLOBAL|RTLD_NODELETE);
        dlopen("libva.so.1", RTLD_NOW|RTLD_GLOBAL|RTLD_NODELETE);
  #if defined(USE_OZONE)
 -      dlopen("libva-drm.so.1", RTLD_NOW|RTLD_GLOBAL|RTLD_NODELETE);

patches/0014-Remove-ATK-dependency.patch → patches/0010-Remove-ATK-dependency.patch

@@ -1,15 +1,15 @@
-From 7e8c022c7ffcf2b2f08f7e3be810a77e488247a5 Mon Sep 17 00:00:00 2001
+From f1f59e906197bca058153991b31c1dc0534bd66d Mon Sep 17 00:00:00 2001
 From: Joone Hur <joone.hur@intel.com>
 Date: Wed, 8 Jul 2015 16:56:56 -0700
-Subject: [PATCH 14/15] Remove ATK dependency
+Subject: [PATCH 10/13] Remove ATK dependency
 
 ---
  ui/views/accessibility/native_view_accessibility.cc | 2 ++
  ui/views/view.cc                                    | 4 ++++
  2 files changed, 6 insertions(+)
 
 diff --git a/ui/views/accessibility/native_view_accessibility.cc b/ui/views/accessibility/native_view_accessibility.cc
-index a11f773..f88a7e2 100644
+index db8367f..11f5acc 100644
 --- a/ui/views/accessibility/native_view_accessibility.cc
 +++ b/ui/views/accessibility/native_view_accessibility.cc
 @@ -24,7 +24,9 @@ NativeViewAccessibility::NativeViewAccessibility(View* view)
@@ -23,10 +23,10 @@ index a11f773..f88a7e2 100644
 
  NativeViewAccessibility::~NativeViewAccessibility() {
 diff --git a/ui/views/view.cc b/ui/views/view.cc
-index 3c2aed7..24dc267 100644
+index f5905e3..0d9b0d4 100644
 --- a/ui/views/view.cc
 +++ b/ui/views/view.cc
-@@ -1260,8 +1260,10 @@ bool View::ExceededDragThreshold(const gfx::Vector2d& delta) {
+@@ -1259,8 +1259,10 @@ bool View::ExceededDragThreshold(const gfx::Vector2d& delta) {
  // Accessibility----------------------------------------------------------------
 
  gfx::NativeViewAccessible View::GetNativeViewAccessible() {
@@ -37,7 +37,7 @@ index 3c2aed7..24dc267 100644
    if (native_view_accessibility_)
      return native_view_accessibility_->GetNativeObject();
    return NULL;
-@@ -1274,8 +1276,10 @@ void View::NotifyAccessibilityEvent(
+@@ -1273,8 +1275,10 @@ void View::NotifyAccessibilityEvent(
      ViewsDelegate::GetInstance()->NotifyAccessibilityEvent(this, event_type);
 
    if (send_native_event && GetWidget()) {

patches/0016-Gardening-Adopt-to-https-codereview.chromium.org-129.patch → patches/0011-Gardening-Adopt-to-https-codereview.chromium.org-129.patch

@@ -1,7 +1,7 @@
-From f3799ea81398c1ecb3ff6004390d75e2159fd317 Mon Sep 17 00:00:00 2001
+From 406806c444e7b4c1d3c6f3adf96e11b6a10cec93 Mon Sep 17 00:00:00 2001
 From: Kalyan Kondapally <kalyan.kondapally@intel.com>
 Date: Tue, 25 Aug 2015 00:12:01 -0700
-Subject: [PATCH] Gardening: Adopt to
+Subject: [PATCH 11/13] Gardening: Adopt to
  https://codereview.chromium.org/1299713003
 
 Need to fix this upstream.