Changeset 245660 in webkit

Timestamp:

May 22, 2019, 5:07:22 PM (7 years ago)

Author:

timothy_horton@apple.com

Message:

REGRESSION (r240552): PDF contents are not exposed to Accessibility (VO, etc.)
​https://bugs.webkit.org/show_bug.cgi?id=198146
<rdar://problem/50698533>

Reviewed by Simon Fraser.

• WebProcess/WebPage/Cocoa/WebPageCocoa.mm:

(WebKit::WebPage::updateMockAccessibilityElementAfterCommittingLoad):

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::didCommitLoad):
(WebKit::WebPage::updateMockAccessibilityElementAfterCommittingLoad):

• WebProcess/WebPage/WebPage.h:
• WebProcess/WebPage/mac/WKAccessibilityWebPageObjectBase.h:
• WebProcess/WebPage/mac/WKAccessibilityWebPageObjectBase.mm:

(-[WKAccessibilityWebPageObjectBase accessibilityRootObjectWrapper]):
(-[WKAccessibilityWebPageObjectBase setWebPage:]):
(-[WKAccessibilityWebPageObjectBase setHasMainFramePlugin:]):
In r240552, we changed to only defer to the main frame PluginView's
accessibility tree if the cached "has a plugin" bit is true. That bit
was only updated in WebPage::platformInitialize, which is long before
we've actually loaded anything or have any clue if we're going to have
a plugin.

Instead, push updates every time we commit a load, which coincides
with when we make other decisions based on having a plugin or not.
Also, just use the existence of a PluginDocument to make the decision,
instead of actually digging in to see if there's a PluginView, since
PluginView comes in asynchronously.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/Cocoa/WebPageCocoa.mm (modified) (2 diffs)
• WebProcess/WebPage/WebPage.cpp (modified) (2 diffs)
• WebProcess/WebPage/WebPage.h (modified) (1 diff)
• WebProcess/WebPage/mac/WKAccessibilityWebPageObjectBase.h (modified) (1 diff)
• WebProcess/WebPage/mac/WKAccessibilityWebPageObjectBase.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-05-22  Tim Horton  <timothy_horton@apple.com>
+
+        REGRESSION (r240552): PDF contents are not exposed to Accessibility (VO, etc.)
+        https://bugs.webkit.org/show_bug.cgi?id=198146
+        <rdar://problem/50698533>
+
+        Reviewed by Simon Fraser.
+
+        * WebProcess/WebPage/Cocoa/WebPageCocoa.mm:
+        (WebKit::WebPage::updateMockAccessibilityElementAfterCommittingLoad):
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::didCommitLoad):
+        (WebKit::WebPage::updateMockAccessibilityElementAfterCommittingLoad):
+        * WebProcess/WebPage/WebPage.h:
+        * WebProcess/WebPage/mac/WKAccessibilityWebPageObjectBase.h:
+        * WebProcess/WebPage/mac/WKAccessibilityWebPageObjectBase.mm:
+        (-[WKAccessibilityWebPageObjectBase accessibilityRootObjectWrapper]):
+        (-[WKAccessibilityWebPageObjectBase setWebPage:]):
+        (-[WKAccessibilityWebPageObjectBase setHasMainFramePlugin:]):
+        In r240552, we changed to only defer to the main frame PluginView's
+        accessibility tree if the cached "has a plugin" bit is true. That bit
+        was only updated in WebPage::platformInitialize, which is long before
+        we've actually loaded anything or have any clue if we're going to have
+        a plugin.
+
+        Instead, push updates every time we commit a load, which coincides
+        with when we make other decisions based on having a plugin or not.
+        Also, just use the existence of a PluginDocument to make the decision,
+        instead of actually digging in to see if there's a PluginView, since
+        PluginView comes in asynchronously.
+
 2019-05-22  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm

@@ -31 +31 @@
 #import "PluginView.h"
 #import "RemoteObjectRegistry.h"
+#import "WKAccessibilityWebPageObjectBase.h"
 #import "WebPageProxyMessages.h"
 #import "WebPaymentCoordinator.h"
@@ -225 +226 @@
     m_remoteObjectRegistry = makeWeakPtr(registry);
 }
+
+void WebPage::updateMockAccessibilityElementAfterCommittingLoad()
+{
+    auto* document = mainFrame()->document();
+    [m_mockAccessibilityElement setHasMainFramePlugin:document ? document->isPluginDocument() : false];
+}
     
 } // namespace WebKit

trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp

@@ -5764 +5764 @@
 
     updateMainFrameScrollOffsetPinning();
+
+    updateMockAccessibilityElementAfterCommittingLoad();
 }
 
@@ -6728 +6730 @@
 }
 
+#if !PLATFORM(COCOA)
+void WebPage::updateMockAccessibilityElementAfterCommittingLoad()
+{
+}
+#endif
+
 } // namespace WebKit
 

trunk/Source/WebKit/WebProcess/WebPage/WebPage.h

@@ -1587 +1587 @@
     bool shouldDispatchUpdateAfterFocusingElement(const WebCore::Element&) const;
 
+    void updateMockAccessibilityElementAfterCommittingLoad();
+
     uint64_t m_pageID;
 

trunk/Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectBase.h

@@ -35 +35 @@
     uint64_t m_pageID;
     id m_parent;
-    bool m_hasPlugin;
+    bool m_hasMainFramePlugin;
 }
 
 - (void)setWebPage:(WebKit::WebPage*)page;
 - (void)setRemoteParent:(id)parent;
+- (void)setHasMainFramePlugin:(bool)hasPlugin;
 
 - (id)accessibilityRootObjectWrapper;

trunk/Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectBase.mm

@@ -121 +121 @@
         WebCore::AXObjectCache::enableAccessibility();
 
-    if (m_hasPlugin)
+    if (m_hasMainFramePlugin)
         return self.accessibilityPluginObject;
 
@@ -142 +142 @@
 {
     m_page = page;
-    
+
     if (page) {
         m_pageID = page->pageID();
-        m_hasPlugin = page->accessibilityObjectForMainFramePlugin();
+
+        auto* frame = page->mainFrame();
+        m_hasMainFramePlugin = frame && frame->document() ? frame->document()->isPluginDocument() : false;
     } else {
         m_pageID = 0;
-        m_hasPlugin = false;
+        m_hasMainFramePlugin = false;
     }
+}
+
+- (void)setHasMainFramePlugin:(bool)hasPlugin
+{
+    m_hasMainFramePlugin = hasPlugin;
 }