diff options
Diffstat (limited to 'patches/chromium/third_party')
| -rw-r--r-- | patches/chromium/third_party/WebKit/0001-Remove-leftovers-from-WebKitSystemInterface.patch | 10 | ||||
| -rw-r--r-- | patches/chromium/third_party/WebKit/0002-Overrideable-path-for-perl-gperf-and-bison.patch | 14 | ||||
| -rw-r--r-- | patches/chromium/third_party/WebKit/0003-Add-missing-dependency-to-khronos_headers.patch | 32 | ||||
| -rw-r--r-- | patches/chromium/third_party/WebKit/0004-Disable-rubber-banding-on-Mac.patch | 24 | ||||
| -rw-r--r-- | patches/chromium/third_party/libjingle/source/talk/0001-Do-not-forward-declare-WebRtcVoiceChannelInfo.patch | 10 | ||||
| -rw-r--r-- | patches/chromium/third_party/libvpx/0001-LIBVPX-Add-path-for-QtWebEngine-build-in-Windows-spe.patch (renamed from patches/chromium/third_party/libvpx/0001-LIBVPX-Add-path-for-QtWebEngine-build-in-Windows-specific-actions.patch) | 10 |
6 files changed, 78 insertions, 22 deletions
diff --git a/patches/chromium/third_party/WebKit/0001-Remove-leftovers-from-WebKitSystemInterface.patch b/patches/chromium/third_party/WebKit/0001-Remove-leftovers-from-WebKitSystemInterface.patch index bfd00a573..43eb24883 100644 --- a/patches/chromium/third_party/WebKit/0001-Remove-leftovers-from-WebKitSystemInterface.patch +++ b/patches/chromium/third_party/WebKit/0001-Remove-leftovers-from-WebKitSystemInterface.patch @@ -4,13 +4,13 @@ Date: Thu, 27 Jun 2013 19:21:34 +0200 Subject: Remove leftovers from WebKitSystemInterface --- - Source/core/platform/graphics/mac/ComplexTextControllerCoreText.mm | 5 ----- + Source/platform/fonts/mac/ComplexTextControllerCoreText.mm | 5 ----- 1 file changed, 5 deletions(-) -diff --git a/Source/core/platform/graphics/mac/ComplexTextControllerCoreText.mm b/Source/core/platform/graphics/mac/ComplexTextControllerCoreText.mm -index c5be0bb..5882bcd 100644 ---- a/Source/core/platform/graphics/mac/ComplexTextControllerCoreText.mm -+++ b/Source/core/platform/graphics/mac/ComplexTextControllerCoreText.mm +diff --git a/Source/platform/fonts/mac/ComplexTextControllerCoreText.mm b/Source/platform/fonts/mac/ComplexTextControllerCoreText.mm +index 822aa8c..42cdbed 100644 +--- a/Source/platform/fonts/mac/ComplexTextControllerCoreText.mm ++++ b/Source/platform/fonts/mac/ComplexTextControllerCoreText.mm @@ -223,14 +223,9 @@ void ComplexTextController::collectComplexTextRunsForCharacters(const UChar* cp, static CFDictionaryRef ltrTypesetterOptions = CFDictionaryCreate(kCFAllocatorDefault, optionKeys, ltrOptionValues, WTF_ARRAY_LENGTH(optionKeys), &kCFCopyStringDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); static CFDictionaryRef rtlTypesetterOptions = CFDictionaryCreate(kCFAllocatorDefault, optionKeys, rtlOptionValues, WTF_ARRAY_LENGTH(optionKeys), &kCFCopyStringDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); diff --git a/patches/chromium/third_party/WebKit/0002-Overrideable-path-for-perl-gperf-and-bison.patch b/patches/chromium/third_party/WebKit/0002-Overrideable-path-for-perl-gperf-and-bison.patch index f636afc4c..af3f6b494 100644 --- a/patches/chromium/third_party/WebKit/0002-Overrideable-path-for-perl-gperf-and-bison.patch +++ b/patches/chromium/third_party/WebKit/0002-Overrideable-path-for-perl-gperf-and-bison.patch @@ -1,17 +1,17 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zoltan Arvai <zarvai@inf.u-szeged.hu> Date: Mon, 3 Mar 2014 14:18:12 +0100 -Subject: [PATCH] Overrideable path for perl, gperf and bison. +Subject: Overrideable path for perl, gperf and bison. --- - Source/core/core.gypi | 6 +++--- + Source/build/scripts/scripts.gypi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/Source/core/core.gypi b/Source/core/core.gypi -index 3cd07aa..77879bb 100644 ---- a/Source/core/core.gypi -+++ b/Source/core/core.gypi -@@ -3879,9 +3879,9 @@ +diff --git a/Source/build/scripts/scripts.gypi b/Source/build/scripts/scripts.gypi +index 2cf0a34..c7bdc4f 100644 +--- a/Source/build/scripts/scripts.gypi ++++ b/Source/build/scripts/scripts.gypi +@@ -43,9 +43,9 @@ ['OS=="win"', { # Using native perl rather than cygwin perl cuts execution time # of idl preprocessing rules by a bit more than 50%. diff --git a/patches/chromium/third_party/WebKit/0003-Add-missing-dependency-to-khronos_headers.patch b/patches/chromium/third_party/WebKit/0003-Add-missing-dependency-to-khronos_headers.patch new file mode 100644 index 000000000..e2796a22f --- /dev/null +++ b/patches/chromium/third_party/WebKit/0003-Add-missing-dependency-to-khronos_headers.patch @@ -0,0 +1,32 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Andras Becsi <andras.becsi@digia.com> +Date: Thu, 13 Mar 2014 16:11:59 +0100 +Subject: Add missing dependency to khronos_headers + +This is needed since https://codereview.chromium.org/106503003 +and because of our chromium patch that fixes the build with a +GL ES2 configured Qt. +--- + Source/core/core.gyp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Source/core/core.gyp b/Source/core/core.gyp +index 882565d..8b8a8b5 100644 +--- a/Source/core/core.gyp ++++ b/Source/core/core.gyp +@@ -821,6 +821,7 @@ + 'webcore_derived', + '../wtf/wtf.gyp:wtf', + '<(DEPTH)/skia/skia.gyp:skia', ++ '<(DEPTH)/third_party/khronos/khronos.gyp:khronos_headers', + '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', + '<(DEPTH)/third_party/qcms/qcms.gyp:qcms', + '<(DEPTH)/url/url.gyp:url_lib', +@@ -830,6 +831,7 @@ + '../wtf/wtf.gyp:wtf', + 'webcore_derived', + '<(DEPTH)/skia/skia.gyp:skia', ++ '<(DEPTH)/third_party/khronos/khronos.gyp:khronos_headers', + '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', + '<(DEPTH)/third_party/qcms/qcms.gyp:qcms', + '<(DEPTH)/url/url.gyp:url_lib', diff --git a/patches/chromium/third_party/WebKit/0004-Disable-rubber-banding-on-Mac.patch b/patches/chromium/third_party/WebKit/0004-Disable-rubber-banding-on-Mac.patch new file mode 100644 index 000000000..ffcaad441 --- /dev/null +++ b/patches/chromium/third_party/WebKit/0004-Disable-rubber-banding-on-Mac.patch @@ -0,0 +1,24 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Andras Becsi <andras.becsi@digia.com> +Date: Thu, 20 Mar 2014 11:27:56 +0100 +Subject: Disable "rubber-banding" on Mac + +Rubber-banding is the scrolling effect on Mac when overscrolling +which does not work with Qt and also causes a crash with branch 1750. +Disable the feature for now. +--- + Source/config.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Source/config.h b/Source/config.h +index e556d5b..d7501db 100644 +--- a/Source/config.h ++++ b/Source/config.h +@@ -97,7 +97,6 @@ + + #if OS(MACOSX) + #define WTF_USE_CF 1 +-#define WTF_USE_RUBBER_BANDING 1 + + /* We can't override the global operator new and delete on OS(MACOSX) because + * some object are allocated by WebKit and deallocated by the embedder. */ diff --git a/patches/chromium/third_party/libjingle/source/talk/0001-Do-not-forward-declare-WebRtcVoiceChannelInfo.patch b/patches/chromium/third_party/libjingle/source/talk/0001-Do-not-forward-declare-WebRtcVoiceChannelInfo.patch index 5af44662d..ee78844fb 100644 --- a/patches/chromium/third_party/libjingle/source/talk/0001-Do-not-forward-declare-WebRtcVoiceChannelInfo.patch +++ b/patches/chromium/third_party/libjingle/source/talk/0001-Do-not-forward-declare-WebRtcVoiceChannelInfo.patch @@ -14,11 +14,11 @@ This fixes the fixes the "error: field has incomplete type" compiler error. 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/media/webrtc/webrtcvoiceengine.cc b/media/webrtc/webrtcvoiceengine.cc -index 2a6ccd7..8686038 100644 +index 51da9ac..3bdc403 100644 --- a/media/webrtc/webrtcvoiceengine.cc +++ b/media/webrtc/webrtcvoiceengine.cc -@@ -1475,19 +1475,6 @@ void WebRtcVoiceEngine::StopAecDump() { - } +@@ -1620,19 +1620,6 @@ int WebRtcVoiceEngine::CreateSoundclipVoiceChannel() { + return CreateVoiceChannel(voe_wrapper_sc_.get()); } -// This struct relies on the generated copy constructor and assignment operator @@ -38,10 +38,10 @@ index 2a6ccd7..8686038 100644 WebRtcVoiceMediaChannel::WebRtcVoiceMediaChannel(WebRtcVoiceEngine *engine) : WebRtcMediaChannel<VoiceMediaChannel, WebRtcVoiceEngine>( diff --git a/media/webrtc/webrtcvoiceengine.h b/media/webrtc/webrtcvoiceengine.h -index 6cb0b30..62d3bc1 100644 +index 23d97f5..6a2c6d8 100644 --- a/media/webrtc/webrtcvoiceengine.h +++ b/media/webrtc/webrtcvoiceengine.h -@@ -374,7 +374,18 @@ class WebRtcVoiceMediaChannel +@@ -388,7 +388,18 @@ class WebRtcVoiceMediaChannel static Error WebRtcErrorToChannelError(int err_code); private: 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-spe.patch index 8d659eb34..425e94c45 100644 --- 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-spe.patch @@ -4,14 +4,14 @@ Date: Mon, 24 Feb 2014 07:29:32 -0800 Subject: LIBVPX: Add path for QtWebEngine build in Windows specific actions --- - libvpx.gyp | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + libvpx.gyp | 2 ++ + 1 file changed, 2 insertions(+) diff --git a/libvpx.gyp b/libvpx.gyp -index 392ccde..7f1a18d 100644 +index 3f668df..32a4bb1 100644 --- a/libvpx.gyp +++ b/libvpx.gyp -@@ -402,6 +402,7 @@ +@@ -404,6 +404,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', @@ -19,7 +19,7 @@ index 392ccde..7f1a18d 100644 ], 'process_output_as_sources': 1, 'msvs_cygwin_shell': 1, -@@ -500,6 +501,7 @@ +@@ -502,6 +503,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', |