Attachment 43725 Details for Bug 25415 – Fix for the issue in comment 59 - with updated unit test and comment

[patch] Fix for the issue in comment 59 - with updated unit test and comment

25415-jd.2.patch (text/plain), 3.75 KB, created by Joanmarie Diggs on 2009-11-23 13:02:26 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Joanmarie Diggs

Created: 2009-11-23 13:02:26 PST

Size: 3.75 KB

patch

obsolete

>From 219bee99fd8290698ae6d07bb5490ed5beffd4c3 Mon Sep 17 00:00:00 2001
>From: Joanmarie Diggs <joanmarie.diggs@gmail.com>
>Date: Mon, 23 Nov 2009 15:50:57 -0500
>Subject: [PATCH] 2009-11-23  Joanmarie Diggs  <joanmarie.diggs@gmail.com>
>
>        Reviewed by NOBODY (OOPS!).
>
>        https://bugs.webkit.org/show_bug.cgi?id=25415
>        [GTK][ATK] Please implement support for get_text_at_offset
>
>        When building up the pango layout from text boxes, only append a
>        newline char after verifying there are no more boxes on this line.
>
>        * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
>        (getPangoLayoutForAtk):
>
>        * ../WebKit/gtk/tests/testatk.c
>---
> WebCore/ChangeLog                                  |   13 +++++++++++++
> .../gtk/AccessibilityObjectWrapperAtk.cpp          |    5 ++++-
> WebKit/gtk/ChangeLog                               |   12 ++++++++++++
> WebKit/gtk/tests/testatk.c                         |    2 +-
> 4 files changed, 30 insertions(+), 2 deletions(-)
>
>diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
>index c7afde2..8851d17 100644
>--- a/WebCore/ChangeLog
>+++ b/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2009-11-23  Joanmarie Diggs  <joanmarie.diggs@gmail.com>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        https://bugs.webkit.org/show_bug.cgi?id=25415
>+        [GTK][ATK] Please implement support for get_text_at_offset
>+
>+        When building up the pango layout from text boxes, only append a
>+        newline char after verifying there are no more boxes on this line.
>+
>+        * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
>+        (getPangoLayoutForAtk):
>+
> 2009-11-23  Dirk Schulze  <krit@webkit.org>
> 
>         Reviewed by Nikolas Zimmermann.
>diff --git a/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp b/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
>index d4f4ba8..308007c 100644
>--- a/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
>+++ b/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
>@@ -890,7 +890,10 @@ static PangoLayout* getPangoLayoutForAtk(AtkText* textObject)
>     while (box) {
>         gchar* text = convertUniCharToUTF8(renderText->characters(), renderText->textLength(), box->start(), box->end());
>         g_string_append(str, text);
>-        g_string_append(str, "\n");
>+        // Newline chars in the source result in separate text boxes, so check
>+        // before adding a newline in the layout. See bug 25415 comment #78.
>+        if (!box->nextOnLineExists())
>+            g_string_append(str, "\n");
>         box = box->nextTextBox();
>     }
> 
>diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
>index fe33df1..b76f50a 100644
>--- a/WebKit/gtk/ChangeLog
>+++ b/WebKit/gtk/ChangeLog
>@@ -1,3 +1,15 @@
>+2009-11-23  Joanmarie Diggs  <joanmarie.diggs@gmail.com>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        https://bugs.webkit.org/show_bug.cgi?id=25415
>+        [GTK][ATK] Please implement support for get_text_at_offset
>+
>+        When building up the pango layout from text boxes, only append a
>+        newline char after verifying there are no more boxes on this line.
>+
>+        * tests/testatk.c
>+
> 2009-11-19  Pavel Feldman  <pfeldman@chromium.org>
> 
>         Reviewed by Gustavo Noronha Silva.
>diff --git a/WebKit/gtk/tests/testatk.c b/WebKit/gtk/tests/testatk.c
>index e47898b..1b1f3f9 100644
>--- a/WebKit/gtk/tests/testatk.c
>+++ b/WebKit/gtk/tests/testatk.c
>@@ -26,7 +26,7 @@
> 
> #if GLIB_CHECK_VERSION(2, 16, 0) && GTK_CHECK_VERSION(2, 14, 0)
> 
>-static const char* contents = "<html><body><p>This is a test. This is the second sentence. And this the third.</p></body></html>";
>+static const char* contents = "<html><body><p>This is a test. \n\nThis\n is the second sentence. And this the third.</p></body></html>";
> 
> static gboolean bail_out(GMainLoop* loop)
> {
>-- 
>1.6.3.3
>

Actions: View | Formatted Diff | Diff

Attachments on bug 25415: 30234 | 30370 | 30408 | 30465 | 30614 | 31049 | 31051 | 31052 | 32451 | 32471 | 33258 | 33259 | 33565 | 42544 | 42712 | 42720 | 42722 | 42855 | 43725 | 43778 | 43935 | 44046