[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
cblu
cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:22:00 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 30b40a1e6db3b2471737c3b3dac4d7b6a2af136f
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jan 27 07:41:38 2003 +0000
WebCore:
Fixed: 3156725 - Partially selected links show extra underlining when dragged
Fixed: 3156962 - Text drag image sometimes doesn't include last selected text node
Reviewed by darin.
* khtml/rendering/render_root.cpp:
(RenderRoot::selectionRect): include all nodes that are selected
* khtml/rendering/render_text.cpp:
(TextSlave::paintDecoration): removed stray ";"
(RenderText::paintObject): call paintDecoration with default parameters for "from" and "to" when not painting the selection only
* khtml/rendering/render_text.h:
WebKit:
Fixed: 3156725 - Partially selected links show extra underlining when dragged
Reviewed by darin.
* WebCoreSupport.subproj/WebTextRenderer.m:
(drawLineForCharacters...): don't ignore "from" "to" parameters
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3460 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 1507c7c..893cae2 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,17 @@
+2003-01-26 Chris Blumenberg <cblu at apple.com>
+
+ Fixed: 3156725 - Partially selected links show extra underlining when dragged
+ Fixed: 3156962 - Text drag image sometimes doesn't include last selected text node
+
+ Reviewed by darin.
+
+ * khtml/rendering/render_root.cpp:
+ (RenderRoot::selectionRect): include all nodes that are selected
+ * khtml/rendering/render_text.cpp:
+ (TextSlave::paintDecoration): removed stray ";"
+ (RenderText::paintObject): call paintDecoration with default parameters for "from" and "to" when not painting the selection only
+ * khtml/rendering/render_text.h:
+
2003-01-26 Darin Adler <darin at apple.com>
Reviewed by Maciej.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 1507c7c..893cae2 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2003-01-26 Chris Blumenberg <cblu at apple.com>
+
+ Fixed: 3156725 - Partially selected links show extra underlining when dragged
+ Fixed: 3156962 - Text drag image sometimes doesn't include last selected text node
+
+ Reviewed by darin.
+
+ * khtml/rendering/render_root.cpp:
+ (RenderRoot::selectionRect): include all nodes that are selected
+ * khtml/rendering/render_text.cpp:
+ (TextSlave::paintDecoration): removed stray ";"
+ (RenderText::paintObject): call paintDecoration with default parameters for "from" and "to" when not painting the selection only
+ * khtml/rendering/render_text.h:
+
2003-01-26 Darin Adler <darin at apple.com>
Reviewed by Maciej.
diff --git a/WebCore/khtml/rendering/render_root.cpp b/WebCore/khtml/rendering/render_root.cpp
index 1467d26..095f9b8 100644
--- a/WebCore/khtml/rendering/render_root.cpp
+++ b/WebCore/khtml/rendering/render_root.cpp
@@ -303,10 +303,6 @@ QRect RenderRoot::selectionRect() const
while (r && r != m_selectionEnd)
{
- if (r->selectionState() == SelectionInside && r != m_selectionStart) {
- selectionRect = selectionRect.unite(enclosingPositionedRect(r));
- }
-
RenderObject* n;
if ( !(n = r->firstChild()) ){
if ( !(n = r->nextSibling()) )
@@ -319,6 +315,9 @@ QRect RenderRoot::selectionRect() const
}
}
r = n;
+ if (r) {
+ selectionRect = selectionRect.unite(enclosingPositionedRect(r));
+ }
}
return selectionRect;
diff --git a/WebCore/khtml/rendering/render_text.cpp b/WebCore/khtml/rendering/render_text.cpp
index 6b2bc49..918b1ff 100644
--- a/WebCore/khtml/rendering/render_text.cpp
+++ b/WebCore/khtml/rendering/render_text.cpp
@@ -119,7 +119,7 @@ void TextSlave::paintDecoration( QPainter *pt, const Font *f, RenderText* p,
}
}
#else
-void TextSlave::paintDecoration( QPainter *pt, RenderText* p, int _tx, int _ty, int decoration, bool begin, bool end);
+void TextSlave::paintDecoration( QPainter *pt, RenderText* p, int _tx, int _ty, int decoration, bool begin, bool end)
{
_tx += m_x;
_ty += m_y;
@@ -750,8 +750,7 @@ void RenderText::paintObject(QPainter *p, int /*x*/, int y, int /*w*/, int h,
s->paintDecoration(p, font, this, tx, ty, d, si == 0, si == ( int ) m_lines.count()-1, sPos, ePos);
}
} else {
- s->paintDecoration(p, font, this, tx, ty, d,si == 0, si == ( int ) m_lines.count()-1,
- s->m_start, s->m_start+s->m_len);
+ s->paintDecoration(p, font, this, tx, ty, d,si == 0, si == ( int ) m_lines.count()-1);
}
}
diff --git a/WebCore/khtml/rendering/render_text.h b/WebCore/khtml/rendering/render_text.h
index eb2753e..5c197fb 100644
--- a/WebCore/khtml/rendering/render_text.h
+++ b/WebCore/khtml/rendering/render_text.h
@@ -75,7 +75,7 @@ public:
#ifdef APPLE_CHANGES
void paintDecoration( QPainter *pt, const Font *, RenderText* p,
- int _tx, int _ty, int decoration, bool begin, bool end, int from, int to);
+ int _tx, int _ty, int decoration, bool begin, bool end, int from=-1, int to=-1);
#else
void paintDecoration( QPainter *pt, RenderText* p, int _tx, int _ty, int decoration, bool begin, bool end);
#endif
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 17032ce..9a2da2c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2003-01-26 Chris Blumenberg <cblu at apple.com>
+
+ Fixed: 3156725 - Partially selected links show extra underlining when dragged
+
+ Reviewed by darin.
+
+ * WebCoreSupport.subproj/WebTextRenderer.m:
+ (drawLineForCharacters...): don't ignore "from" "to" parameters
+
2003-01-25 Darin Adler <darin at apple.com>
Reviewed by Maciej.
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
index b357738..abc9c53 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
@@ -757,12 +757,33 @@ static void _drawGlyphs(NSFont *font, NSColor *color, CGGlyph *glyphs, CGSize *a
int width;
CGContextRef cgContext;
float lineWidth;
-
+ if (from > 0) {
+ point.x += [self _floatWidthForCharacters:characters
+ stringLength:length
+ fromCharacterPosition: 0
+ numberOfCharacters: from
+ withPadding: padding
+ applyRounding: YES
+ attemptFontSubstitution: YES
+ widths: 0
+ fonts: 0
+ glyphs: 0
+ numGlyphs: 0
+ letterSpacing: letterSpacing
+ wordSpacing: wordSpacing
+ fontFamilies: families];
+ } else if (from == -1) {
+ from = 0;
+ }
+ if (to == -1) {
+ to = length;
+ }
+
width = ROUND_TO_INT([self _floatWidthForCharacters:characters
stringLength:length
- fromCharacterPosition: 0
- numberOfCharacters: length
+ fromCharacterPosition: from
+ numberOfCharacters: to-from
withPadding: padding
applyRounding: YES
attemptFontSubstitution: YES
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list