[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf
treat at webkit.org
treat at webkit.org
Tue Jan 5 23:42:29 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit c7973433239f5fedbc63c3c7423be3e1fa9796e5
Author: treat at webkit.org <treat at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Dec 4 17:14:22 2009 +0000
Fix wrong assert that was only working through sheer luck.
https://bugs.webkit.org/show_bug.cgi?id=32162
Patch by Adam Treat <atreat at rim.com> on 2009-12-04
Reviewed by Dan Bernstein.
* platform/text/BidiContext.cpp:
(WebCore::BidiContext::create):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51697 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7fb77d3..7ab53de 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2009-12-04 Adam Treat <atreat at rim.com>
+
+ Reviewed by Dan Bernstein.
+
+ Fix wrong assert that was only working through sheer luck.
+ https://bugs.webkit.org/show_bug.cgi?id=32162
+
+ * platform/text/BidiContext.cpp:
+ (WebCore::BidiContext::create):
+
2009-12-04 Tor Arne Vestbø <tor.arne.vestbo at nokia.com>
Reviewed by Simon Hausmann.
diff --git a/WebCore/platform/text/BidiContext.cpp b/WebCore/platform/text/BidiContext.cpp
index 546571e..59db7bd 100644
--- a/WebCore/platform/text/BidiContext.cpp
+++ b/WebCore/platform/text/BidiContext.cpp
@@ -30,7 +30,7 @@ using namespace WTF::Unicode;
PassRefPtr<BidiContext> BidiContext::create(unsigned char level, Direction direction, bool override, BidiContext* parent)
{
- ASSERT(direction == level % 2 ? RightToLeft : LeftToRight);
+ ASSERT(direction == (level % 2 ? RightToLeft : LeftToRight));
if (parent)
return adoptRef(new BidiContext(level, direction, override, parent));
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list