diff options
| author | Zeno Albisser <zeno.albisser@digia.com> | 2013-08-15 15:50:32 +0200 |
|---|---|---|
| committer | Zeno Albisser <zeno.albisser@digia.com> | 2013-08-17 18:45:07 +0200 |
| commit | 5ef63aaeab687b5aa63810b1225bfbc52f7461da (patch) | |
| tree | d7283270d0028a86d21b64018bfcd73b1f943a3e /patches | |
| parent | 6af569360b798dfc6af31dc504b79d74aa58c77e (diff) | |
Add patch for WebKit after updating Chromium.
Including Assertions.h leads to __darwin_ssize_t being
defined inside namespace WebKit but not outside that namespace.
This is because certain headers will not be pulled in again
later on in the same compilation unit.
This patch has already been upstreamed,
and can be removed with the next Chromium update.
Change-Id: I302bbf779fcabb909a9ffda53d8b9fdccc87e248
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/0001-Do-not-include-Assertions.h-within-namespace-WebKit.patch | 68 | ||||
| -rwxr-xr-x | patches/patch-chromium.sh | 1 |
2 files changed, 69 insertions, 0 deletions
diff --git a/patches/0001-Do-not-include-Assertions.h-within-namespace-WebKit.patch b/patches/0001-Do-not-include-Assertions.h-within-namespace-WebKit.patch new file mode 100644 index 000000000..72af661f7 --- /dev/null +++ b/patches/0001-Do-not-include-Assertions.h-within-namespace-WebKit.patch @@ -0,0 +1,68 @@ +From 98fb04e24e92a17a2e8bd8c1d5449392896004d1 Mon Sep 17 00:00:00 2001 +From: Zeno Albisser <zeno.albisser@digia.com> +Date: Thu, 15 Aug 2013 15:40:24 +0200 +Subject: [PATCH] Do not include Assertions.h within namespace WebKit. + +Including Assertions.h leads to __darwin_ssize_t being +defined inside namespace WebKit but not outside that namespace. +This is because certain headers will not be pulled in again +later on in the same compilation unit. + +This bug is caused by: r155495 +This patch will be upstreamed right away. +--- + public/platform/WebDeviceMotionData.h | 6 ++++-- + public/platform/WebDeviceOrientationData.h | 6 ++++-- + 2 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/public/platform/WebDeviceMotionData.h b/public/platform/WebDeviceMotionData.h +index e7b165f..3284d3a 100644 +--- a/public/platform/WebDeviceMotionData.h ++++ b/public/platform/WebDeviceMotionData.h +@@ -33,6 +33,10 @@ + + #include "WebCommon.h" + ++#if WEBKIT_IMPLEMENTATION ++#include "wtf/Assertions.h" ++#endif ++ + namespace WebKit { + + #pragma pack(push, 1) +@@ -72,8 +76,6 @@ public: + }; + + #if WEBKIT_IMPLEMENTATION +-#include "wtf/Assertions.h" +- + COMPILE_ASSERT(sizeof(WebDeviceMotionData) == (10 * sizeof(double) + 2 * sizeof(char)), WebDeviceMotionData_has_wrong_size); + #endif + +diff --git a/public/platform/WebDeviceOrientationData.h b/public/platform/WebDeviceOrientationData.h +index 4aa950e..072dd09 100644 +--- a/public/platform/WebDeviceOrientationData.h ++++ b/public/platform/WebDeviceOrientationData.h +@@ -33,6 +33,10 @@ + + #include "WebCommon.h" + ++#if WEBKIT_IMPLEMENTATION ++#include "wtf/Assertions.h" ++#endif ++ + namespace WebKit { + + #pragma pack(push, 1) +@@ -57,8 +61,6 @@ public: + }; + + #if WEBKIT_IMPLEMENTATION +-#include "wtf/Assertions.h" +- + COMPILE_ASSERT(sizeof(WebDeviceOrientationData) == (3 * sizeof(double) + 1 * sizeof(char)), WebDeviceOrientationData_has_wrong_size); + #endif + +-- +1.7.12.4 (Apple Git-37) + diff --git a/patches/patch-chromium.sh b/patches/patch-chromium.sh index 09748f032..a1fa4261b 100755 --- a/patches/patch-chromium.sh +++ b/patches/patch-chromium.sh @@ -70,6 +70,7 @@ cd $CHROMIUM_SRC_DIR/third_party/WebKit echo "Entering $PWD" git am $PATCH_DIR/0001-Remove-leftovers-from-WebKitSystemInterface.patch +git am $PATCH_DIR/0001-Do-not-include-Assertions.h-within-namespace-WebKit.patch cd $CHROMIUM_SRC_DIR/tools/gyp echo "Entering $PWD" |