diff options
Diffstat (limited to 'patches/chromium/third_party')
2 files changed, 91 insertions, 0 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 new file mode 100644 index 000000000..bfd00a573 --- /dev/null +++ b/patches/chromium/third_party/WebKit/0001-Remove-leftovers-from-WebKitSystemInterface.patch @@ -0,0 +1,28 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Zeno Albisser <zeno.albisser@digia.com> +Date: Thu, 27 Jun 2013 19:21:34 +0200 +Subject: Remove leftovers from WebKitSystemInterface + +--- + Source/core/platform/graphics/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 +@@ -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); + +-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 +- ProviderInfo info = { cp, length, stringAttributes.get() }; +- RetainPtr<CTTypesetterRef> typesetter(AdoptCF, WKCreateCTTypesetterWithUniCharProviderAndOptions(&provideStringAndAttributes, 0, &info, m_run.ltr() ? ltrTypesetterOptions : rtlTypesetterOptions)); +-#else + RetainPtr<CFStringRef> string(AdoptCF, CFStringCreateWithCharactersNoCopy(kCFAllocatorDefault, cp, length, kCFAllocatorNull)); + RetainPtr<CFAttributedStringRef> attributedString(AdoptCF, CFAttributedStringCreate(kCFAllocatorDefault, string.get(), stringAttributes.get())); + RetainPtr<CTTypesetterRef> typesetter(AdoptCF, CTTypesetterCreateWithAttributedStringAndOptions(attributedString.get(), m_run.ltr() ? ltrTypesetterOptions : rtlTypesetterOptions)); +-#endif + + line.adoptCF(CTTypesetterCreateLine(typesetter.get(), CFRangeMake(0, 0))); + } else { 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 new file mode 100644 index 000000000..5af44662d --- /dev/null +++ b/patches/chromium/third_party/libjingle/source/talk/0001-Do-not-forward-declare-WebRtcVoiceChannelInfo.patch @@ -0,0 +1,63 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Zeno Albisser <zeno.albisser@digia.com> +Date: Wed, 16 Oct 2013 10:17:11 +0200 +Subject: Do not forward declare WebRtcVoiceChannelInfo. + +Clang / libc++ does not support incomplete types in +templates. See: +http://clang.llvm.org/compatibility.html#undep_incomplete + +This fixes the fixes the "error: field has incomplete type" compiler error. +--- + media/webrtc/webrtcvoiceengine.cc | 13 ------------- + media/webrtc/webrtcvoiceengine.h | 13 ++++++++++++- + 2 files changed, 12 insertions(+), 14 deletions(-) + +diff --git a/media/webrtc/webrtcvoiceengine.cc b/media/webrtc/webrtcvoiceengine.cc +index 2a6ccd7..8686038 100644 +--- a/media/webrtc/webrtcvoiceengine.cc ++++ b/media/webrtc/webrtcvoiceengine.cc +@@ -1475,19 +1475,6 @@ void WebRtcVoiceEngine::StopAecDump() { + } + } + +-// This struct relies on the generated copy constructor and assignment operator +-// since it is used in an stl::map. +-struct WebRtcVoiceMediaChannel::WebRtcVoiceChannelInfo { +- WebRtcVoiceChannelInfo() : channel(-1), renderer(NULL) {} +- WebRtcVoiceChannelInfo(int ch, AudioRenderer* r) +- : channel(ch), +- renderer(r) {} +- ~WebRtcVoiceChannelInfo() {} +- +- int channel; +- AudioRenderer* renderer; +-}; +- + // WebRtcVoiceMediaChannel + WebRtcVoiceMediaChannel::WebRtcVoiceMediaChannel(WebRtcVoiceEngine *engine) + : WebRtcMediaChannel<VoiceMediaChannel, WebRtcVoiceEngine>( +diff --git a/media/webrtc/webrtcvoiceengine.h b/media/webrtc/webrtcvoiceengine.h +index 6cb0b30..62d3bc1 100644 +--- a/media/webrtc/webrtcvoiceengine.h ++++ b/media/webrtc/webrtcvoiceengine.h +@@ -374,7 +374,18 @@ class WebRtcVoiceMediaChannel + static Error WebRtcErrorToChannelError(int err_code); + + private: +- struct WebRtcVoiceChannelInfo; ++ // This struct relies on the generated copy constructor and assignment operator ++ // since it is used in an stl::map. ++ struct WebRtcVoiceChannelInfo { ++ WebRtcVoiceChannelInfo() : channel(-1), renderer(NULL) {} ++ WebRtcVoiceChannelInfo(int ch, AudioRenderer* r) ++ : channel(ch), ++ renderer(r) {} ++ ~WebRtcVoiceChannelInfo() {} ++ ++ int channel; ++ AudioRenderer* renderer; ++ }; + typedef std::map<uint32, WebRtcVoiceChannelInfo> ChannelMap; + + void SetNack(int channel, bool nack_enabled); |