[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:21:49 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 66e14aa65d404339bd8c4cfdde6156d0c225193a
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jun 27 16:29:13 2002 +0000
Removed old methods and references.
* WebCoreSupport.subproj/IFTextRenderer.m:
(-[IFTextRenderer drawString:atPoint:withColor:]):
(-[IFTextRenderer slowDrawCharacters:length:fromCharacterPosition:toCharacterPosition:atPoint:withTextColor:backgroundColor:attemptFontSubstitution:]):
(-[IFTextRenderer _drawCharacters:length:fromCharacterPosition:toCharacterPosition:atPoint:withTextColor:backgroundColor:]):
Fixed final fragment rendering glitch.
Removed calls to old method.
* kwq/KWQPainter.mm:
(QPainter::drawText):
* kwq/WebCoreTextRenderer.h:
Removed old methods.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1455 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index bd3072a..dac67eb 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-06-27 Richard Williamson <rjw at apple.com>
+
+ Removed calls to old method.
+
+ * kwq/KWQPainter.mm:
+ (QPainter::drawText):
+ * kwq/WebCoreTextRenderer.h:
+ Removed old methods.
+
2002-06-27 Darin Adler <darin at apple.com>
* khtml/rendering/render_applet.cpp: Remove include of <iostream.h> to avoid bloat.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index bd3072a..dac67eb 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2002-06-27 Richard Williamson <rjw at apple.com>
+
+ Removed calls to old method.
+
+ * kwq/KWQPainter.mm:
+ (QPainter::drawText):
+ * kwq/WebCoreTextRenderer.h:
+ Removed old methods.
+
2002-06-27 Darin Adler <darin at apple.com>
* khtml/rendering/render_applet.cpp: Remove include of <iostream.h> to avoid bloat.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index bd3072a..dac67eb 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2002-06-27 Richard Williamson <rjw at apple.com>
+
+ Removed calls to old method.
+
+ * kwq/KWQPainter.mm:
+ (QPainter::drawText):
+ * kwq/WebCoreTextRenderer.h:
+ Removed old methods.
+
2002-06-27 Darin Adler <darin at apple.com>
* khtml/rendering/render_applet.cpp: Remove include of <iostream.h> to avoid bloat.
diff --git a/WebCore/kwq/KWQPainter.mm b/WebCore/kwq/KWQPainter.mm
index 3681fbb..e76f398 100644
--- a/WebCore/kwq/KWQPainter.mm
+++ b/WebCore/kwq/KWQPainter.mm
@@ -435,9 +435,7 @@ void QPainter::drawText(int x, int y, const QString &qstring, int len)
if (len == -1)
len = qstring.length();
- [[[WebCoreTextRendererFactory sharedFactory]
- rendererWithFamily:data->qfont.getNSFamily() traits:data->qfont.getNSTraits() size:data->qfont.getNSSize()]
- drawCharacters:(const UniChar *)qstring.unicode() length: len atPoint:NSMakePoint(x,y) withTextColor:data->qpen.color().getNSColor()];
+ drawText(x, y, qstring, 0, len, LTR);
_unlockFocus();
}
@@ -445,8 +443,7 @@ void QPainter::drawText(int x, int y, const QString &qstring, int len)
void QPainter::drawText (int x, int y, const QString &qstring, int len, TextDirection dir)
{
- //drawText(x, y, qstring, 0, len, dir);
- drawText(x, y, qstring, len);
+ drawText(x, y, qstring, 0, len, dir);
}
void QPainter::drawText (int x, int y, const QString &qstring, int from, int to, QColor backgroundColor)
@@ -468,18 +465,10 @@ void QPainter::drawText (int x, int y, const QString &qstring, int pos, int len,
_logPartiallyImplemented();
}
-#if 1
if (pos != 0)
drawText(x, y, qstring.mid(pos, len), len, dir);
else
drawText(x, y, qstring, len, dir);
-#else
-
- id <WebCoreTextRenderer>renderer = [[WebCoreTextRendererFactory sharedFactory]
- rendererWithFamily:data->qfont.getNSFamily() traits:data->qfont.getNSTraits() size:data->qfont.getNSSize()];
-
- [renderer drawCharacters:(const UniChar *)qstring.unicode() stringLength: qstring.length() fromCharacterPosition: pos numberOfCharacters: len atPoint:NSMakePoint(x,y) withTextColor:data->qpen.color().getNSColor()];
-#endif
}
diff --git a/WebCore/kwq/WebCoreTextRenderer.h b/WebCore/kwq/WebCoreTextRenderer.h
index 64d2ce3..a94ce5e 100644
--- a/WebCore/kwq/WebCoreTextRenderer.h
+++ b/WebCore/kwq/WebCoreTextRenderer.h
@@ -32,10 +32,11 @@
- (int)descent;
- (int)lineSpacing;
+- (void)drawCharacters:(const UniChar *)characters stringLength: (unsigned int)length fromCharacterPosition: (int)from toCharacterPosition: (int)to atPoint:(NSPoint)point withTextColor:(NSColor *)textColor backgroundColor: (NSColor *)backgroundColor;
+
- (void)drawString:(NSString *)string atPoint:(NSPoint)point withColor:(NSColor *)color;
-- (void)drawCharacters:(const UniChar *)characters length: (unsigned)length atPoint:(NSPoint)point withTextColor:(NSColor *)color;
+
- (void)drawUnderlineForString:(NSString *)string atPoint:(NSPoint)point withColor:(NSColor *)color;
-- (void)drawCharacters:(const UniChar *)characters stringLength: (unsigned int)length fromCharacterPosition: (int)from toCharacterPosition: (int)to atPoint:(NSPoint)point withTextColor:(NSColor *)textColor backgroundColor: (NSColor *)backgroundColor;
- (void)drawString:(NSString *)string inRect:(NSRect)rect withColor:(NSColor *)color paragraphStyle:(NSParagraphStyle *)style;
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 302e6ff..b513570 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2002-06-27 Richard Williamson <rjw at apple.com>
+
+ Removed old methods and references.
+
+ * WebCoreSupport.subproj/IFTextRenderer.m:
+ (-[IFTextRenderer drawString:atPoint:withColor:]):
+ (-[IFTextRenderer slowDrawCharacters:length:fromCharacterPosition:toCharacterPosition:atPoint:withTextColor:backgroundColor:attemptFontSubstitution:]):
+ (-[IFTextRenderer _drawCharacters:length:fromCharacterPosition:toCharacterPosition:atPoint:withTextColor:backgroundColor:]):
+ Fixed final fragment rendering glitch.
+
2002-06-27 Darin Adler <darin at apple.com>
* WebCoreSupport.subproj/IFWebCoreViewFactory.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 302e6ff..b513570 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-06-27 Richard Williamson <rjw at apple.com>
+
+ Removed old methods and references.
+
+ * WebCoreSupport.subproj/IFTextRenderer.m:
+ (-[IFTextRenderer drawString:atPoint:withColor:]):
+ (-[IFTextRenderer slowDrawCharacters:length:fromCharacterPosition:toCharacterPosition:atPoint:withTextColor:backgroundColor:attemptFontSubstitution:]):
+ (-[IFTextRenderer _drawCharacters:length:fromCharacterPosition:toCharacterPosition:atPoint:withTextColor:backgroundColor:]):
+ Fixed final fragment rendering glitch.
+
2002-06-27 Darin Adler <darin at apple.com>
* WebCoreSupport.subproj/IFWebCoreViewFactory.m:
diff --git a/WebKit/WebCoreSupport.subproj/IFTextRenderer.m b/WebKit/WebCoreSupport.subproj/IFTextRenderer.m
index 34e2f7b..81d1e84 100644
--- a/WebKit/WebCoreSupport.subproj/IFTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/IFTextRenderer.m
@@ -415,7 +415,7 @@ static unsigned int findLengthOfCharacterCluster(const UniChar *characters, unsi
usedCharacterBuffer = characterBuffer;
}
- [self drawCharacters: usedCharacterBuffer length: length atPoint: point withTextColor: color];
+ [self drawCharacters: usedCharacterBuffer stringLength: length fromCharacterPosition: 0 toCharacterPosition: length atPoint: point withTextColor: color backgroundColor: nil];
if (characterBuffer != localCharacterBuffer)
free(characterBuffer);
@@ -542,9 +542,13 @@ static unsigned int findLengthOfCharacterCluster(const UniChar *characters, unsi
}
fragmentLength = numGlyphs - lastDrawnGlyph;
- if (fragmentLength > 0)
- point = [self drawGlyphs: &glyphs[lastDrawnGlyph] numGlyphs: fragmentLength fromGlyphPosition: fromGlyph-lastDrawnGlyph toGlyphPosition:MIN(toGlyph-lastDrawnGlyph,fragmentLength) atPoint: point withTextColor: textColor backgroundColor: backgroundColor];
+ if (fragmentLength > 0){
+ int _fromGlyph = fromGlyph-lastDrawnGlyph;
+ if (_fromGlyph < 0)
+ _fromGlyph = 0;
+ point = [self drawGlyphs: &glyphs[lastDrawnGlyph] numGlyphs: fragmentLength fromGlyphPosition: _fromGlyph toGlyphPosition:MIN(toGlyph-lastDrawnGlyph,fragmentLength) atPoint: point withTextColor: textColor backgroundColor: backgroundColor];
+ }
if (glyphs)
free(glyphs);
@@ -621,16 +625,6 @@ cleanup:
return result;
}
-- (void)drawCharacters:(const UniChar *)characters length: (unsigned int)length atPoint:(NSPoint)point withTextColor:(NSColor *)textColor backgroundColor: backgroundColor
-{
- [self drawCharacters: characters stringLength: length fromCharacterPosition: 0 toCharacterPosition: length atPoint: point withTextColor: textColor backgroundColor: backgroundColor];
-}
-
-- (void)drawCharacters:(const UniChar *)characters length: (unsigned int)length atPoint:(NSPoint)point withTextColor:(NSColor *)textColor
-{
- [self drawCharacters: characters length: length atPoint: point withTextColor: textColor backgroundColor: nil];
-}
-
- (void)drawCharacters:(const UniChar *)characters stringLength: (unsigned int)length fromCharacterPosition: (int)from toCharacterPosition: (int)to atPoint:(NSPoint)point withTextColor:(NSColor *)textColor backgroundColor: (NSColor *)backgroundColor
{
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
index 34e2f7b..81d1e84 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
@@ -415,7 +415,7 @@ static unsigned int findLengthOfCharacterCluster(const UniChar *characters, unsi
usedCharacterBuffer = characterBuffer;
}
- [self drawCharacters: usedCharacterBuffer length: length atPoint: point withTextColor: color];
+ [self drawCharacters: usedCharacterBuffer stringLength: length fromCharacterPosition: 0 toCharacterPosition: length atPoint: point withTextColor: color backgroundColor: nil];
if (characterBuffer != localCharacterBuffer)
free(characterBuffer);
@@ -542,9 +542,13 @@ static unsigned int findLengthOfCharacterCluster(const UniChar *characters, unsi
}
fragmentLength = numGlyphs - lastDrawnGlyph;
- if (fragmentLength > 0)
- point = [self drawGlyphs: &glyphs[lastDrawnGlyph] numGlyphs: fragmentLength fromGlyphPosition: fromGlyph-lastDrawnGlyph toGlyphPosition:MIN(toGlyph-lastDrawnGlyph,fragmentLength) atPoint: point withTextColor: textColor backgroundColor: backgroundColor];
+ if (fragmentLength > 0){
+ int _fromGlyph = fromGlyph-lastDrawnGlyph;
+ if (_fromGlyph < 0)
+ _fromGlyph = 0;
+ point = [self drawGlyphs: &glyphs[lastDrawnGlyph] numGlyphs: fragmentLength fromGlyphPosition: _fromGlyph toGlyphPosition:MIN(toGlyph-lastDrawnGlyph,fragmentLength) atPoint: point withTextColor: textColor backgroundColor: backgroundColor];
+ }
if (glyphs)
free(glyphs);
@@ -621,16 +625,6 @@ cleanup:
return result;
}
-- (void)drawCharacters:(const UniChar *)characters length: (unsigned int)length atPoint:(NSPoint)point withTextColor:(NSColor *)textColor backgroundColor: backgroundColor
-{
- [self drawCharacters: characters stringLength: length fromCharacterPosition: 0 toCharacterPosition: length atPoint: point withTextColor: textColor backgroundColor: backgroundColor];
-}
-
-- (void)drawCharacters:(const UniChar *)characters length: (unsigned int)length atPoint:(NSPoint)point withTextColor:(NSColor *)textColor
-{
- [self drawCharacters: characters length: length atPoint: point withTextColor: textColor backgroundColor: nil];
-}
-
- (void)drawCharacters:(const UniChar *)characters stringLength: (unsigned int)length fromCharacterPosition: (int)from toCharacterPosition: (int)to atPoint:(NSPoint)point withTextColor:(NSColor *)textColor backgroundColor: (NSColor *)backgroundColor
{
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list