harfbuzz 0.13 fix from WebKit for Oops pages

diff --git a/chromium-browser.spec b/chromium-browser.spec
index afd8dccdd032f5e2ba7e465647f4cabf46c24c99..5922c10624a7159590c49b3a45a98ddabee18de3 100644 (file)
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -114,6 +114,7 @@ Patch26:    master-prefs-path.patch
 Patch27:       tcmalloc-glibc2.16.patch
 Patch28:       system-mesa.patch
 Patch29:       speechd-0.8.patch
+Patch30:       harfbuzz-0.13.patch
 URL:           http://www.chromium.org/Home
 %{?with_gconf:BuildRequires:   GConf2-devel}
 %{?with_system_mesa:BuildRequires:     Mesa-libGL-devel >= 9.1}
@@ -210,7 +211,6 @@ Requires:   xorg-lib-libX11 >= 1.4.99.1
 Provides:      wwwbrowser
 Obsoletes:     chromium-browser-bookmark_manager < 5.0.388.0
 Obsoletes:     chromium-browser-inspector < 15.0.863.0
-%{?with_system_harfbuzz:Conflicts:     harfbuzz >= 0.9.13}
 ExclusiveArch: %{ix86} %{x8664} arm
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -299,6 +299,9 @@ ln -s %{SOURCE7} .
 %patch24 -p2
 %patch26 -p2
 %patch29 -p2
+cd third_party/WebKit
+%patch30 -p1
+cd -
 
 sh -x clean-source.sh \
        %{!?with_nacl:nacl=0} \

diff --git a/harfbuzz-0.13.patch b/harfbuzz-0.13.patch
new file mode 100644 (file)
index 0000000..d540bcf
--- /dev/null
+++ b/harfbuzz-0.13.patch
@@ -0,0 +1,15 @@
+http://crbug.com/223500
+http://trac.webkit.org/changeset/143337/trunk/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp
+
+Index: trunk/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp
+===================================================================
+--- trunk/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp (revision 142928)
++++ trunk/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp (revision 143337)
+@@ -330,4 +330,7 @@
+         if (shouldSetDirection)
+             hb_buffer_set_direction(harfBuzzBuffer.get(), currentRun->rtl() ? HB_DIRECTION_RTL : HB_DIRECTION_LTR);
++        else
++            // Leaving direction to HarfBuzz to guess is *really* bad, but will do for now.
++            hb_buffer_guess_segment_properties(harfBuzzBuffer.get());
+ 
+         // Add a space as pre-context to the buffer. This prevents showing dotted-circle