Merge pull request #61 from ojab/master
Fix harfbuzz's assertion failures in chromium
This commit is contained in:
commit
defb5ce65b
|
@ -0,0 +1,15 @@
|
||||||
|
Subversion Revision: 143170
|
||||||
|
diff --git Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp
|
||||||
|
index 1cf3979a560292679e0bb706ec3a63ae4bcf2b51..69ba6ff231e069cdd59bf0e411c8731fe23c229c 100644
|
||||||
|
--- third_party/WebKit/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp
|
||||||
|
+++ third_party/WebKit/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp
|
||||||
|
@@ -329,6 +329,9 @@ bool HarfBuzzShaper::shapeHarfBuzzRuns(bool shouldSetDirection)
|
||||||
|
hb_buffer_set_script(harfBuzzBuffer.get(), currentRun->script());
|
||||||
|
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
|
||||||
|
// for combining marks at the beginning of runs.
|
|
@ -2,7 +2,7 @@
|
||||||
pkgname=chromium
|
pkgname=chromium
|
||||||
#See http://www.chromium.org/developers/calendar for the latest version
|
#See http://www.chromium.org/developers/calendar for the latest version
|
||||||
version=26.0.1410.63
|
version=26.0.1410.63
|
||||||
revision=2
|
revision=3
|
||||||
short_desc="Google's attempt at creating a safer, faster, and more stable browser"
|
short_desc="Google's attempt at creating a safer, faster, and more stable browser"
|
||||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||||
homepage="http://www.chromium.org/"
|
homepage="http://www.chromium.org/"
|
||||||
|
|
Loading…
Reference in New Issue