[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

darin darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:22:33 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit d866d51bb2c9c1405cc4be02f69fa6d7005a2dee
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 29 18:01:59 2003 +0000

            * khtml/rendering/break_lines.cpp: (isBreakable): Fix error that prevented this
            from compiling. I had failed to build, and then tested the version without my change!
            I retested with the change.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3489 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 5921fa4..c5bdd1b 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,11 @@
 2003-01-29  Darin Adler  <darin at apple.com>
 
+        * khtml/rendering/break_lines.cpp: (isBreakable): Fix error that prevented this
+        from compiling. I had failed to build, and then tested the version without my change!
+        I retested with the change.
+
+2003-01-29  Darin Adler  <darin at apple.com>
+
         Reviewed by Ken.
 
 	- 3158477 -- text break locator leak leads to giant (2.04 GB) VSIZE idling at livepage
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 5921fa4..c5bdd1b 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,11 @@
 2003-01-29  Darin Adler  <darin at apple.com>
 
+        * khtml/rendering/break_lines.cpp: (isBreakable): Fix error that prevented this
+        from compiling. I had failed to build, and then tested the version without my change!
+        I retested with the change.
+
+2003-01-29  Darin Adler  <darin at apple.com>
+
         Reviewed by Ken.
 
 	- 3158477 -- text break locator leak leads to giant (2.04 GB) VSIZE idling at livepage
diff --git a/WebCore/khtml/rendering/break_lines.cpp b/WebCore/khtml/rendering/break_lines.cpp
index 7910f32..d5c11db 100644
--- a/WebCore/khtml/rendering/break_lines.cpp
+++ b/WebCore/khtml/rendering/break_lines.cpp
@@ -96,7 +96,7 @@ bool isBreakable( const QChar *s, int pos, int len)
         status = UCCreateTextBreakLocator (NULL, 0, kUCTextBreakLineMask, &breakLocator);
         if (status == 0){
             findStatus = UCFindTextBreak (breakLocator, kUCTextBreakLineMask, NULL, (const UniChar *)s, len, pos, &end);
-            UCDisposeTextBreakLocator(breakLocator);
+            UCDisposeTextBreakLocator(&breakLocator);
         }
         // If carbon fails, fail back on simple white space detection.
         if (findStatus == 0){

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list