chromium patches

gistfile1.diff

diff --git a/patches/chromium/0003-Clang-libc-does-not-support-incomplete-types-in-temp.patch b/patches/chromium/0003-Clang-libc-does-not-support-incomplete-types-in-temp.patch
index ce3d9bb..048e30d 100644
--- a/patches/chromium/0003-Clang-libc-does-not-support-incomplete-types-in-temp.patch
+++ b/patches/chromium/0003-Clang-libc-does-not-support-incomplete-types-in-temp.patch
@@ -434,21 +434,25 @@ diff --git a/gpu/config/dx_diag_node.cc b/gpu/config/dx_diag_node.cc
 index e0902ca..c1e84ae 100644
 --- a/gpu/config/dx_diag_node.cc
 +++ b/gpu/config/dx_diag_node.cc
-@@ -4,6 +4,8 @@
- 
+@@ -2,8 +2,11 @@
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+
++#include "build/build_config.h"
  #include "gpu/config/dx_diag_node.h"
- 
+
 +#if defined(OS_WIN)
 +
  namespace gpu {
- 
+
  DxDiagNode::DxDiagNode() {}
-@@ -11,3 +13,5 @@ DxDiagNode::DxDiagNode() {}
+@@ -11,3 +14,5 @@ DxDiagNode::DxDiagNode() {}
  DxDiagNode::~DxDiagNode() {}
- 
+
  }  // namespace gpu
 +
 +#endif // defined(OS_WIN)
+
 diff --git a/gpu/config/dx_diag_node.h b/gpu/config/dx_diag_node.h
 index 33d29b3..45ffa65 100644
 --- a/gpu/config/dx_diag_node.h
diff --git a/patches/chromium/third_party/libvpx/0001-LIBVPX-Add-path-for-QtWebEngine-build-in-Windows-specific-actions.patch b/patches/chromium/third_party/libvpx/0001-LIBVPX-Add-path-for-QtWebEngine-build-in-Windows-specific-actions.patch
new file mode 100644
index 0000000..e41ac7a
--- /dev/null
+++ b/patches/chromium/third_party/libvpx/0001-LIBVPX-Add-path-for-QtWebEngine-build-in-Windows-specific-actions.patch
@@ -0,0 +1,33 @@
+From 8f880cd80b88b0660aa1975ab765183e47dbcef2 Mon Sep 17 00:00:00 2001
+From: Zoltan Arvai <zarvai@inf.u-szeged.hu>
+Date: Mon, 20 Jan 2014 01:53:32 -0800
+Subject: [PATCH] LIBVPX: Add path for QtWebEngine build in Windows specific
+ actions
+
+---
+ libvpx.gyp |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/libvpx.gyp b/libvpx.gyp
+index 392ccde..0621663 100644
+--- a/libvpx.gyp
++++ b/libvpx.gyp
+@@ -402,6 +402,7 @@
+                 '-s', '<(PRODUCT_DIR)/obj/libvpx_asm_offsets_vp8/vp8_asm_enc_offsets.obj',
+                 '-s', '<(ninja_obj_dir)/encoder/libvpx_asm_offsets_vp8.vp8_asm_enc_offsets.obj',
+                 '-s', '<(PRODUCT_DIR)/obj/Source/WebKit/chromium/third_party/libvpx/<(libvpx_source)/vp8/encoder/libvpx_asm_offsets_vp8.vp8_asm_enc_offsets.obj',
++                '-s', '<(PRODUCT_DIR)/obj/src/3rdparty_upstream/chromium/third_party/libvpx/<(libvpx_source)/vp8/encoder/libvpx_asm_offsets_vp8.vp8_asm_enc_offsets.obj',
+               ],
+               'process_output_as_sources': 1,
+               'msvs_cygwin_shell': 1,
+@@ -500,6 +501,7 @@
+                 '-s', '<(PRODUCT_DIR)/obj/libvpx_asm_offsets_vpx_scale/vpx_scale_asm_offsets.obj',
+                 '-s', '<(ninja_obj_dir)/encoder/libvpx_asm_offsets_vpx_scale.vpx_scale_asm_offsets.obj',
+                 '-s', '<(PRODUCT_DIR)/obj/Source/WebKit/chromium/third_party/libvpx/<(libvpx_source)/vpx_scale/libvpx_asm_offsets_vpx_scale.vpx_scale_asm_offsets.obj',
++                '-s', '<(PRODUCT_DIR)/obj/src/3rdparty_upstream/chromium/third_party/libvpx/<(libvpx_source)/vpx_scale/encoder/libvpx_asm_offsets_vpx_scale.vpx_scale_asm_offsets.obj',
+               ],
+               'process_output_as_sources': 1,
+               'msvs_cygwin_shell': 1,
+-- 
+1.7.9
+
diff --git a/patches/chromium/tools/grit/0001-GRIT-Allow-grd-files-outside-of-chromium-source-dir.patch b/patches/chromium/tools/grit/0001-GRIT-Allow-grd-files-outside-of-chromium-source-dir.patch
index 9da214c..3a703b8 100644
--- a/patches/chromium/tools/grit/0001-GRIT-Allow-grd-files-outside-of-chromium-source-dir.patch
+++ b/patches/chromium/tools/grit/0001-GRIT-Allow-grd-files-outside-of-chromium-source-dir.patch
@@ -30,7 +30,7 @@ index 734c57a..33848b2 100755
          return value
      return ''
  
-@@ -427,6 +427,10 @@ class GritNode(base.Node):
+@@ -427,6 +427,11 @@ class GritNode(base.Node):
          abs_filename = os.path.abspath(filename_or_stream)
          if abs_filename[:len(src_root_dir)] != src_root_dir:
            filename = os.path.basename(filename_or_stream)
@@ -38,6 +38,7 @@ index 734c57a..33848b2 100755
 +          # found as a key, fall back to using the absolute file name.
 +          if not filename in first_ids:
 +            filename = abs_filename
++            filename = filename.replace('\\', '/')
          else:
            filename = abs_filename[len(src_root_dir) + 1:]
            filename = filename.replace('\\', '/')
diff --git a/patches/patch-chromium.sh b/patches/patch-chromium.sh
index c3a33aa..0f204fe 100755
--- a/patches/patch-chromium.sh
+++ b/patches/patch-chromium.sh
@@ -55,6 +55,7 @@ for MODULE in \
     / \
     /third_party/WebKit \
     /third_party/libjingle/source/talk \
+    /third_party/libvpx \
     /tools/gyp \
     /tools/grit
 do