[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
mitz at apple.com
mitz at apple.com
Wed Dec 22 11:43:06 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 36c89d4969e6384c2843e475767e638a98f2fa4e
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Aug 4 21:38:30 2010 +0000
Build fix.
* platform/text/mac/HyphenationMac.mm:
(WebCore::lastHyphenLocation):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64683 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ea045d4..36cff8c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,12 @@
2010-08-04 Dan Bernstein <mitz at apple.com>
+ Build fix.
+
+ * platform/text/mac/HyphenationMac.mm:
+ (WebCore::lastHyphenLocation):
+
+2010-08-04 Dan Bernstein <mitz at apple.com>
+
Release build fix.
* platform/text/mac/HyphenationMac.mm:
diff --git a/WebCore/platform/text/mac/HyphenationMac.mm b/WebCore/platform/text/mac/HyphenationMac.mm
index d14c0ab..56122df 100644
--- a/WebCore/platform/text/mac/HyphenationMac.mm
+++ b/WebCore/platform/text/mac/HyphenationMac.mm
@@ -60,7 +60,7 @@ bool canHyphenate(const AtomicString& localeIdentifier)
size_t lastHyphenLocation(const UChar* characters, size_t length, size_t beforeIndex, const AtomicString& localeIdentifier)
{
- ASSERT_UNUSED(canHyphenate(localeIdentifier));
+ ASSERT_UNUSED(localeIdentifier, canHyphenate(localeIdentifier));
RetainPtr<CFStringRef> string(AdoptCF, CFStringCreateWithCharactersNoCopy(kCFAllocatorDefault, characters, length, kCFAllocatorNull));
return wkGetHyphenationLocationBeforeIndex(string.get(), beforeIndex);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list