Changeset 83746 in webkit

Timestamp:

Apr 13, 2011 9:27:23 AM (13 years ago)

Author:

mario@webkit.org

Message:

2011-04-13 Mario Sanchez Prada <​msanchez@igalia.com>

Reviewed by Martin Robinson.

[GTK] Missing nullchecks in GTK's a11y wrapper
​https://bugs.webkit.org/show_bug.cgi?id=58429

Add missing nullchecks for coreObject->document().

• accessibility/gtk/AccessibilityObjectWrapperAtk.cpp: (atkParentOfRootObject): Add missing nullcheck. (getPangoLayoutForAtk): Ditto. (webkit_accessible_text_get_caret_offset): Ditto. (textExtents): Ditto. (webkit_accessible_editable_text_insert_text): Ditto. (webkit_accessible_editable_text_delete_text): Ditto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/gtk/AccessibilityObjectWrapperAtk.cpp (modified) (7 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-13  Mario Sanchez Prada  <msanchez@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Missing nullchecks in GTK's a11y wrapper
+        https://bugs.webkit.org/show_bug.cgi?id=58429
+
+        Add missing nullchecks for coreObject->document().
+
+        * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
+        (atkParentOfRootObject): Add missing nullcheck.
+        (getPangoLayoutForAtk): Ditto.
+        (webkit_accessible_text_get_caret_offset): Ditto.
+        (textExtents): Ditto.
+        (webkit_accessible_editable_text_insert_text): Ditto.
+        (webkit_accessible_editable_text_delete_text): Ditto.
+
 2011-04-13  Thierry Reding  <thierry.reding@avionic-design.de>
 

trunk/Source/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp

@@ -269 +269 @@
     // hierarchy all the way to the application. (Bug 30489)
     if (!coreParent && isRootObject(coreObject)) {
-        HostWindow* hostWindow = coreObject->document()->view()->hostWindow();
+        Document* document = coreObject->document();
+        if (!document)
+            return 0;
+
+        HostWindow* hostWindow = document->view()->hostWindow();
         if (hostWindow) {
             PlatformPageClient scrollView = hostWindow->platformPageClient();
@@ -1177 +1181 @@
     AccessibilityObject* coreObject = core(textObject);
 
-    HostWindow* hostWindow = coreObject->document()->view()->hostWindow();
+    Document* document = coreObject->document();
+    if (!document)
+        return 0;
+
+    HostWindow* hostWindow = document->view()->hostWindow();
     if (!hostWindow)
         return 0;
@@ -1219 +1227 @@
         return 0;
 
+    Document* document = coreObject->document();
+    if (!document)
+        return 0;
+
     Node* focusedNode = coreObject->selection().end().deprecatedNode();
     if (!focusedNode)
@@ -1224 +1236 @@
 
     RenderObject* focusedRenderer = focusedNode->renderer();
-    AccessibilityObject* focusedObject = coreObject->document()->axObjectCache()->getOrCreate(focusedRenderer);
+    AccessibilityObject* focusedObject = document->axObjectCache()->getOrCreate(focusedRenderer);
 
     int offset;
@@ -1542 +1554 @@
     switch(coords) {
     case ATK_XY_SCREEN:
-        extents = coreObject->document()->view()->contentsToScreen(extents);
+        if (Document* document = coreObject->document())
+            extents = document->view()->contentsToScreen(extents);
         break;
     case ATK_XY_WINDOW:
@@ -1814 +1827 @@
     //coreObject->setSelectedText(String::fromUTF8(string));
 
-    if (!coreObject->document() || !coreObject->document()->frame())
+    Document* document = coreObject->document();
+    if (!document || !document->frame())
         return;
+
     coreObject->setSelectedVisiblePositionRange(coreObject->visiblePositionRangeForRange(PlainTextRange(*position, 0)));
     coreObject->setFocused(true);
     // FIXME: We should set position to the actual inserted text length, which may be less than that requested.
-    if (coreObject->document()->frame()->editor()->insertTextWithoutSendingTextEvent(String::fromUTF8(string), false, 0))
+    if (document->frame()->editor()->insertTextWithoutSendingTextEvent(String::fromUTF8(string), false, 0))
         *position += length;
 }
@@ -1840 +1855 @@
     //coreObject->setSelectedText(String());
 
-    if (!coreObject->document() || !coreObject->document()->frame())
+    Document* document = coreObject->document();
+    if (!document || !document->frame())
         return;
+
     coreObject->setSelectedVisiblePositionRange(coreObject->visiblePositionRangeForRange(PlainTextRange(start_pos, end_pos - start_pos)));
     coreObject->setFocused(true);
-    coreObject->document()->frame()->editor()->performDelete();
+    document->frame()->editor()->performDelete();
 }