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

rjw rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:35:22 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit b37c6443554666d8cc32b577fcc60d48af468777
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 29 00:05:39 2002 +0000

            Tell CG to not use time expiration of glyph cache and increase it's
            size.
    
            THIS CHANGE REQUIRES THAT YOU INSTALL THE CG ROOT.
    
            * WebCoreSupport.subproj/WebTextRendererFactory.m:
    
            Fixed outline of for active link style.
    
            * khtml/css/html4.css:
            * kwq/KWQPainter.mm:
            (QPainter::drawLine):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1932 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index f5bfc72..a3674aa 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-08-28  Richard Williamson (Local)  <rjw at apple.com>
+
+        Fixed outline of for active link style.
+        
+        * khtml/css/html4.css:
+        * kwq/KWQPainter.mm:
+        (QPainter::drawLine):
+
 2002-08-28  David Hyatt  <hyatt at apple.com>
 
 	Adding knowledge to the style system of auto z-indices.  The old
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index f5bfc72..a3674aa 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,11 @@
+2002-08-28  Richard Williamson (Local)  <rjw at apple.com>
+
+        Fixed outline of for active link style.
+        
+        * khtml/css/html4.css:
+        * kwq/KWQPainter.mm:
+        (QPainter::drawLine):
+
 2002-08-28  David Hyatt  <hyatt at apple.com>
 
 	Adding knowledge to the style system of auto z-indices.  The old
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index f5bfc72..a3674aa 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2002-08-28  Richard Williamson (Local)  <rjw at apple.com>
+
+        Fixed outline of for active link style.
+        
+        * khtml/css/html4.css:
+        * kwq/KWQPainter.mm:
+        (QPainter::drawLine):
+
 2002-08-28  David Hyatt  <hyatt at apple.com>
 
 	Adding knowledge to the style system of auto z-indices.  The old
diff --git a/WebCore/khtml/css/html4.css b/WebCore/khtml/css/html4.css
index f596803..7976728 100644
--- a/WebCore/khtml/css/html4.css
+++ b/WebCore/khtml/css/html4.css
@@ -488,8 +488,8 @@ acronym {
 
 :focus          { outline: 1px dotted invert }
 a:link          { color: blue; text-decoration: underline; }
-a:link:active          { color: red; outline: 1px dotted invert; }
-a:visited:active          { color: red; outline: 1px dotted invert; }
+a:link:active          { color: red; outline: red 1px dotted; }
+a:visited:active          { color: red; outline: red 1px dotted; }
 
 /* ### :before is not supported at the moment
       BR:before       { content: "\n" }
diff --git a/WebCore/kwq/KWQPainter.mm b/WebCore/kwq/KWQPainter.mm
index ba95bd2..2f296e0 100644
--- a/WebCore/kwq/KWQPainter.mm
+++ b/WebCore/kwq/KWQPainter.mm
@@ -184,28 +184,27 @@ void QPainter::drawLine(int x1, int y1, int x2, int y2)
     
     NSBezierPath *path = [NSBezierPath bezierPath];
     [path setLineWidth:width];
-#if 0
+
     switch (penStyle) {
     case NoPen:
     case SolidLine:
         break;
     case DotLine:
         {
-            const float dottedLine[2] = { 1, 1 };
+            const float dottedLine[2] = { 3, 3 };
             [path setLineDash:dottedLine count:2 phase:0];
         }
         break;
     case DashLine:
         {
-            const float dashedLine[2] = { 3, 2 };
+            const float dashedLine[2] = { 4, 2 };
             [path setLineDash:dashedLine count:2 phase:0];
         }
         break;
     }
-#endif
+
     [path moveToPoint:p1];
     [path lineToPoint:p2];
-    [path closePath];
 
     _setColorFromPen();
     [path stroke];
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 9a2b5e2..8b75599 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2002-08-28  Richard Williamson (Local)  <rjw at apple.com>
+
+        Tell CG to not use time expiration of glyph cache and increase it's
+        size.
+        
+        THIS CHANGE REQUIRES THAT YOU INSTALL THE CG ROOT.
+        
+        * WebCoreSupport.subproj/WebTextRendererFactory.m:
+
 2002-08-28  Richard Williamson (Home)  <rjw at apple.com>
 
         Fixed selection horkage I introduced with drag
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 9a2b5e2..8b75599 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-08-28  Richard Williamson (Local)  <rjw at apple.com>
+
+        Tell CG to not use time expiration of glyph cache and increase it's
+        size.
+        
+        THIS CHANGE REQUIRES THAT YOU INSTALL THE CG ROOT.
+        
+        * WebCoreSupport.subproj/WebTextRendererFactory.m:
+
 2002-08-28  Richard Williamson (Home)  <rjw at apple.com>
 
         Fixed selection horkage I introduced with drag
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
index 01bc234..2994476 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
@@ -6,6 +6,8 @@
 #import <WebKit/WebTextRenderer.h>
 #import <WebKit/WebKitDebug.h>
 
+#import <CoreGraphics/CoreGraphicsPrivate.h>
+
 @interface WebFontCacheKey : NSObject
 {
     NSString *family;
@@ -121,19 +123,20 @@
 {
     if (![self sharedFactory]) {
         [[[self alloc] init] release];
+
+        // Turn off auto expiration of glyphs in CG's cache
+        // and increase the cache size.
+        CGFontCache *fontCache;
+        fontCache = CGFontCacheCreate();
+        CGFontCacheSetMaxSize (fontCache, 1024*1024);
+        CGFontCacheSetShouldAutoExpire (fontCache, false);
+        CGFontCacheRelease(fontCache);
     }
     WEBKIT_ASSERT([[self sharedFactory] isMemberOfClass:self]);
 }
 
 + (WebTextRendererFactory *)sharedFactory;
 {
-#if 0        
-        CGFontCache *fontCache;
-        fontCache = CGFontCacheCreate();
-        CGFontCacheSetMaxSize (fontCache, 1024*1024);
-        CGFontCacheSetLifetime (fontCache, 1024*1024*1024);
-        CGFontCacheRelease(fontCache);
-#endif
     return (WebTextRendererFactory *)[super sharedFactory];
 }
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list