Changeset 78715 in webkit

Timestamp:

Feb 16, 2011 9:12:38 AM (13 years ago)

Author:

mario@webkit.org

Message:

2011-02-16 Mario Sanchez Prada <​msanchez@igalia.com>

Reviewed by Martin Robinson.

[GTK] events missing when a document is (re)loaded
​https://bugs.webkit.org/show_bug.cgi?id=25831

Added new layout test to check the right signals are emitted.

• platform/gtk/accessibility/document-reload-events-expected.txt: Added.
• platform/gtk/accessibility/document-reload-events.html: Added.

2011-02-16 Mario Sanchez Prada <​msanchez@igalia.com>

Reviewed by Martin Robinson.

[GTK] events missing when a document is (re)loaded
​https://bugs.webkit.org/show_bug.cgi?id=25831

Make sure webArea returns a proper name and that a signal
'state-change::defunct' is emitted when detaching the wrapper.

Test: platform/gtk/accessibility/document-reload-events.html

• accessibility/gtk/AccessibilityObjectWrapperAtk.cpp: (webkit_accessible_get_name): Returns the current document's title as fallback mechanism for webArea objects. (webkit_accessible_detach): Emit 'state-change::defunct' function as soon as the wrapper is detached from the related core object.

2011-02-16 Mario Sanchez Prada <​msanchez@igalia.com>

Reviewed by Martin Robinson.

[GTK] events missing when a document is (re)loaded
​https://bugs.webkit.org/show_bug.cgi?id=25831

Emit the right signals when reloading a document.

• WebCoreSupport/FrameLoaderClientGtk.cpp: (WebKit::notifyAccessibilityStatus): New function, to make sure the signals involved in reloading a document are properly emitted. (WebKit::notifyStatus): Also notify accessibility if enabled.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/accessibility/document-reload-events-expected.txt (added)
• LayoutTests/platform/gtk/accessibility/document-reload-events.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp (modified) (3 diffs)
• Source/WebKit/gtk/ChangeLog (modified) (1 diff)
• Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-02-16  Mario Sanchez Prada  <msanchez@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] events missing when a document is (re)loaded
+        https://bugs.webkit.org/show_bug.cgi?id=25831
+
+        Added new layout test to check the right signals are emitted.
+
+        * platform/gtk/accessibility/document-reload-events-expected.txt: Added.
+        * platform/gtk/accessibility/document-reload-events.html: Added.
+
 2011-02-16  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-16  Mario Sanchez Prada  <msanchez@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] events missing when a document is (re)loaded
+        https://bugs.webkit.org/show_bug.cgi?id=25831
+
+        Make sure webArea returns a proper name and that a signal
+        'state-change::defunct' is emitted when detaching the wrapper.
+
+        Test: platform/gtk/accessibility/document-reload-events.html
+
+        * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
+        (webkit_accessible_get_name): Returns the current document's title
+        as fallback mechanism for webArea objects.
+        (webkit_accessible_detach): Emit 'state-change::defunct' function
+        as soon as the wrapper is detached from the related core object.
+
 2011-02-15  Nikolas Zimmermann  <nzimmermann@rim.com>
 

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

@@ -176 +176 @@
         }
 
-        // Try text under the node
+        // Try text under the node.
         String textUnder = renderObject->textUnderElement();
         if (textUnder.length())
@@ -190 +190 @@
                 return returnString(alt);
         }
+    }
+
+    // Fallback for the webArea object: just return the document's title.
+    if (renderObject->isWebArea()) {
+        Document* document = coreObject->document();
+        if (document)
+            return returnString(document->title());
     }
 
@@ -2465 +2472 @@
     ASSERT(accessible->m_object);
 
+    if (core(accessible)->roleValue() == WebAreaRole)
+        g_signal_emit_by_name(accessible, "state-change", "defunct", true);
+
     // We replace the WebCore AccessibilityObject with a fallback object that
     // provides default implementations to avoid repetitive null-checking after

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2011-02-16  Mario Sanchez Prada  <msanchez@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] events missing when a document is (re)loaded
+        https://bugs.webkit.org/show_bug.cgi?id=25831
+
+        Emit the right signals when reloading a document.
+
+        * WebCoreSupport/FrameLoaderClientGtk.cpp:
+        (WebKit::notifyAccessibilityStatus): New function, to make sure
+        the signals involved in reloading a document are properly emitted.
+        (WebKit::notifyStatus): Also notify accessibility if enabled.
+
 2011-02-15  Kenneth Russell  <kbr@google.com>
 

trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp

@@ -26 +26 @@
 #include "FrameLoaderClientGtk.h"
 
+#include "AXObjectCache.h"
+#include "AccessibilityObject.h"
 #include "ArchiveResource.h"
 #include "CachedFrame.h"
@@ -56 +58 @@
 #include "ProgressTracker.h"
 #include "RenderPart.h"
+#include "RenderView.h"
 #include "ResourceHandle.h"
 #include "ResourceRequest.h"
@@ -223 +226 @@
 }
 
+static void notifyAccessibilityStatus(WebKitWebFrame* frame, WebKitLoadStatus loadStatus)
+{
+    if (loadStatus != WEBKIT_LOAD_PROVISIONAL
+        && loadStatus != WEBKIT_LOAD_FAILED
+        && loadStatus != WEBKIT_LOAD_FINISHED)
+        return;
+
+    WebKitWebFramePrivate* priv = frame->priv;
+    if (!priv->coreFrame || !priv->coreFrame->document())
+        return;
+
+    RenderView* contentRenderer = priv->coreFrame->contentRenderer();
+    if (!contentRenderer)
+        return;
+
+    AXObjectCache* axObjectCache = priv->coreFrame->document()->axObjectCache();
+    if (!axObjectCache)
+        return;
+
+    AccessibilityObject* coreAxObject = axObjectCache->getOrCreate(contentRenderer);
+    if (!coreAxObject)
+        return;
+
+    AtkObject* axObject = coreAxObject->wrapper();
+    if (!axObject || !ATK_IS_DOCUMENT(axObject))
+        return;
+
+    switch (loadStatus) {
+    case WEBKIT_LOAD_PROVISIONAL:
+        g_signal_emit_by_name(axObject, "state-change", "busy", true);
+        if (core(frame)->loader()->loadType() == FrameLoadTypeReload)
+            g_signal_emit_by_name(axObject, "reload");
+        break;
+    case WEBKIT_LOAD_FAILED:
+        g_signal_emit_by_name(axObject, "load-stopped");
+        g_signal_emit_by_name(axObject, "state-change", "busy", false);
+        break;
+    case WEBKIT_LOAD_FINISHED:
+        g_signal_emit_by_name(axObject, "load-complete");
+        g_signal_emit_by_name(axObject, "state-change", "busy", false);
+    default:
+        break;
+    }
+}
+
 static void notifyStatus(WebKitWebFrame* frame, WebKitLoadStatus loadStatus)
 {
@@ -232 +280 @@
         webView->priv->loadStatus = loadStatus;
         g_object_notify(G_OBJECT(webView), "load-status");
+
+        if (AXObjectCache::accessibilityEnabled())
+            notifyAccessibilityStatus(frame, loadStatus);
     }
 }