Changeset 155520 in webkit

Timestamp:

Sep 11, 2013 5:05:10 AM (11 years ago)

Author:

mario@webkit.org

Message:

[GTK] Get rid of Pango/Gail dependencies in accessibility for ATK
​https://bugs.webkit.org/show_bug.cgi?id=114867

Reviewed by Martin Robinson.

Removed all trace of Gail and Pango specific code from the AtkText
implementation, now everything has been reimplemented.

• accessibility/atk/WebKitAccessibleInterfaceText.cpp:

(webkitAccessibleTextGetTextForOffset): Removed fallback code
relying in Gail/Pango, now all the related code has been
removed. Also, replaced the collection of if statements with a
switch, for better readability of the code.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/atk/WebKitAccessibleInterfaceText.cpp (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-11  Mario Sanchez Prada  <mario.prada@samsung.com>
+
+        [GTK] Get rid of Pango/Gail dependencies in accessibility for ATK
+        https://bugs.webkit.org/show_bug.cgi?id=114867
+
+        Reviewed by Martin Robinson.
+
+        Removed all trace of Gail and Pango specific code from the AtkText
+        implementation, now everything has been reimplemented.
+
+        * accessibility/atk/WebKitAccessibleInterfaceText.cpp:
+        (webkitAccessibleTextGetTextForOffset): Removed fallback code
+        relying in Gail/Pango, now all the related code has been
+        removed. Also, replaced the collection of if statements with a
+        switch, for better readability of the code.
+
 2013-09-11  Allan Sandfeld Jensen  <allan.jensen@digia.com>
 

trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp

@@ -55 +55 @@
 #include <wtf/text/CString.h>
 
-#if PLATFORM(GTK)
-#include <libgail-util/gail-util.h>
-#include <pango/pango.h>
-#endif
-
 using namespace WebCore;
 
@@ -165 +160 @@
 }
 
-static gchar* webkitAccessibleTextGetText(AtkText*, gint startOffset, gint endOffset);
-
-#if PLATFORM(GTK)
-static GailTextUtil* getGailTextUtilForAtk(AtkText* textObject)
-{
-    GailTextUtil* gailTextUtil = gail_text_util_new();
-    GOwnPtr<char> text(webkitAccessibleTextGetText(textObject, 0, -1));
-    gail_text_util_text_setup(gailTextUtil, text.get());
-    return gailTextUtil;
-}
-
-static PangoLayout* getPangoLayoutForAtk(AtkText* textObject)
-{
-    AccessibilityObject* coreObject = core(textObject);
-
-    Document* document = coreObject->document();
-    if (!document)
-        return 0;
-
-    HostWindow* hostWindow = document->view()->hostWindow();
-    if (!hostWindow)
-        return 0;
-    PlatformPageClient webView = hostWindow->platformPageClient();
-    if (!webView)
-        return 0;
-
-    // Create a string with the layout as it appears on the screen
-    GOwnPtr<char> objectText(textForObject(coreObject));
-    PangoLayout* layout = gtk_widget_create_pango_layout(static_cast<GtkWidget*>(webView), objectText.get());
-    return layout;
-}
-#endif
-
 static int baselinePositionForRenderObject(RenderObject* renderObject)
 {
@@ -368 +330 @@
     return attributeSet1;
 }
+
+static gchar* webkitAccessibleTextGetText(AtkText*, gint startOffset, gint endOffset);
 
 static guint accessibilityObjectLength(const AccessibilityObject* object)
@@ -1087 +1051 @@
         return emptyTextSelectionAtOffset(0, startOffset, endOffset);
 
-    if (boundaryType == ATK_TEXT_BOUNDARY_CHAR)
+    switch (boundaryType) {
+    case ATK_TEXT_BOUNDARY_CHAR:
         return webkitAccessibleTextGetChar(text, offset, textPosition, startOffset, endOffset);
 
-    if (boundaryType == ATK_TEXT_BOUNDARY_WORD_START || boundaryType == ATK_TEXT_BOUNDARY_WORD_END)
+    case ATK_TEXT_BOUNDARY_WORD_START:
+    case ATK_TEXT_BOUNDARY_WORD_END:
         return webkitAccessibleTextWordForBoundary(text, offset, boundaryType, textPosition, startOffset, endOffset);
 
-    if (boundaryType == ATK_TEXT_BOUNDARY_SENTENCE_START || boundaryType == ATK_TEXT_BOUNDARY_SENTENCE_END)
+    case ATK_TEXT_BOUNDARY_LINE_START:
+    case ATK_TEXT_BOUNDARY_LINE_END:
+        return webkitAccessibleTextLineForBoundary(text, offset, boundaryType, textPosition, startOffset, endOffset);
+
+    case ATK_TEXT_BOUNDARY_SENTENCE_START:
+    case ATK_TEXT_BOUNDARY_SENTENCE_END:
         return webkitAccessibleTextSentenceForBoundary(text, offset, boundaryType, textPosition, startOffset, endOffset);
-
-    if (boundaryType == ATK_TEXT_BOUNDARY_LINE_START || boundaryType == ATK_TEXT_BOUNDARY_LINE_END)
-        return webkitAccessibleTextLineForBoundary(text, offset, boundaryType, textPosition, startOffset, endOffset);
-
-#if PLATFORM(GTK)
-    // FIXME: Get rid of the code below once every single part above
-    // has been properly implemented without using Pango/Cairo.
-    GailOffsetType offsetType = GAIL_AT_OFFSET;
-    switch (textPosition) {
-    case GetTextPositionBefore:
-        offsetType = GAIL_BEFORE_OFFSET;
-        break;
-
-    case GetTextPositionAt:
-        break;
-
-    case GetTextPositionAfter:
-        offsetType = GAIL_AFTER_OFFSET;
-        break;
 
     default:
@@ -1119 +1071 @@
     }
 
-    // Make sure we always return valid valid values for offsets.
-    *startOffset = 0;
-    *endOffset = 0;
-
-    return gail_text_util_get_text(getGailTextUtilForAtk(text), getPangoLayoutForAtk(text), offsetType, boundaryType, offset, startOffset, endOffset);
-#endif
-
-    notImplemented();
+    // This should never be reached.
     return 0;
 }