Changeset 148823 in webkit

Timestamp:

Apr 21, 2013 3:07:28 AM (11 years ago)

Author:

Carlos Garcia Campos

Message:

Widget should not depend on AXObjectCache
​https://bugs.webkit.org/show_bug.cgi?id=114514

Reviewed by Chris Fleizach.

Source/WebCore:

Move AXObjectCache usage from platform files to FrameView.

• WebCore.exp.in: Update symbols.
• page/FrameView.cpp:

(WebCore::FrameView::didAddScrollbar): Handle scrollbar updates in
AXObjectCache.
(WebCore::FrameView::willRemoveScrollbar): Handle scrollbar
updates in AXObjectCache and remove the scrollbar from the cache.

• page/FrameView.h:
• platform/ScrollView.cpp:

(WebCore::ScrollView::setHasHorizontalScrollbar): Use
didAddScrollbar/willRemoveScrollbar
(WebCore::ScrollView::setHasVerticalScrollbar): Ditto.

• platform/ScrollableArea.cpp:

(WebCore::ScrollableArea::didAddScrollbar): This is the old
didAddVerticalScrollbar and didAddHorizontalScrollbar joined in a
single method that receives a ScrollbarOrientation parameter.
(WebCore::ScrollableArea::willRemoveScrollbar): This is the old
willRemoveVerticalScrollbar and
willRemoveHorizontalScrollbarScrollbar joined in a single method
that receives a ScrollbarOrientation parameter.

• platform/ScrollableArea.h:

(ScrollableArea):

• platform/Scrollbar.cpp:

(WebCore::Scrollbar::~Scrollbar): Remove AXObjectCache usage.

• platform/Scrollbar.h:
• platform/Widget.h:

(Widget): Remove axObjectCache() method.

• platform/mac/ScrollAnimatorMac.h:

(ScrollAnimatorMac):

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::createScrollbar): Use didAddScrollbar.
(WebCore::RenderLayer::destroyScrollbar): Use willRemoveScrollbar.

• rendering/RenderListBox.cpp:

(WebCore::RenderListBox::createScrollbar): Use didAddScrollbar.
(WebCore::RenderListBox::destroyScrollbar): Use willRemoveScrollbar.

Source/WebKit2:

Update to API changes.

• WebProcess/Plugins/PDF/PDFPlugin.mm:

(WebKit::PDFPlugin::createScrollbar):

• WebProcess/Plugins/PDF/SimplePDFPlugin.mm:

(WebKit::SimplePDFPlugin::createScrollbar):
(WebKit::SimplePDFPlugin::destroyScrollbar):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (1 diff)
• WebCore/page/FrameView.cpp (modified) (1 diff)
• WebCore/page/FrameView.h (modified) (2 diffs)
• WebCore/platform/ScrollView.cpp (modified) (3 diffs)
• WebCore/platform/ScrollableArea.cpp (modified) (2 diffs)
• WebCore/platform/ScrollableArea.h (modified) (1 diff)
• WebCore/platform/Scrollbar.cpp (modified) (3 diffs)
• WebCore/platform/Scrollbar.h (modified) (1 diff)
• WebCore/platform/Widget.h (modified) (2 diffs)
• WebCore/rendering/RenderLayer.cpp (modified) (2 diffs)
• WebCore/rendering/RenderListBox.cpp (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm (modified) (1 diff)
• WebKit2/WebProcess/Plugins/PDF/SimplePDFPlugin.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-21  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Widget should not depend on AXObjectCache
+        https://bugs.webkit.org/show_bug.cgi?id=114514
+
+        Reviewed by Chris Fleizach.
+
+        Move AXObjectCache usage from platform files to FrameView.
+
+        * WebCore.exp.in: Update symbols.
+        * page/FrameView.cpp:
+        (WebCore::FrameView::didAddScrollbar): Handle scrollbar updates in
+        AXObjectCache.
+        (WebCore::FrameView::willRemoveScrollbar): Handle scrollbar
+        updates in AXObjectCache and remove the scrollbar from the cache.
+        * page/FrameView.h:
+        * platform/ScrollView.cpp:
+        (WebCore::ScrollView::setHasHorizontalScrollbar): Use
+        didAddScrollbar/willRemoveScrollbar
+        (WebCore::ScrollView::setHasVerticalScrollbar): Ditto.
+        * platform/ScrollableArea.cpp:
+        (WebCore::ScrollableArea::didAddScrollbar): This is the old
+        didAddVerticalScrollbar and didAddHorizontalScrollbar joined in a
+        single method that receives a ScrollbarOrientation parameter.
+        (WebCore::ScrollableArea::willRemoveScrollbar): This is the old
+        willRemoveVerticalScrollbar and
+        willRemoveHorizontalScrollbarScrollbar joined in a single method
+        that receives a ScrollbarOrientation parameter.
+        * platform/ScrollableArea.h:
+        (ScrollableArea):
+        * platform/Scrollbar.cpp:
+        (WebCore::Scrollbar::~Scrollbar): Remove AXObjectCache usage.
+        * platform/Scrollbar.h:
+        * platform/Widget.h:
+        (Widget): Remove axObjectCache() method.
+        * platform/mac/ScrollAnimatorMac.h:
+        (ScrollAnimatorMac):
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::createScrollbar): Use didAddScrollbar.
+        (WebCore::RenderLayer::destroyScrollbar): Use willRemoveScrollbar.
+        * rendering/RenderListBox.cpp:
+        (WebCore::RenderListBox::createScrollbar): Use didAddScrollbar.
+        (WebCore::RenderListBox::destroyScrollbar): Use willRemoveScrollbar.
+
 2013-04-20  Dirk Schulze  <krit@webkit.org>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -366 +366 @@
 __ZN7WebCore14SchemeRegistry62registerURLSchemeAsAllowingLocalStorageAccessInPrivateBrowsingERKN3WTF6StringE
 __ZN7WebCore14ScrollableArea15contentsResizedEv
+__ZN7WebCore14ScrollableArea15didAddScrollbarEPNS_9ScrollbarENS_20ScrollbarOrientationE
 __ZN7WebCore14ScrollableArea16handleWheelEventERKNS_18PlatformWheelEventE
 __ZN7WebCore14ScrollableArea17willEndLiveResizeEv
+__ZN7WebCore14ScrollableArea19willRemoveScrollbarEPNS_9ScrollbarENS_20ScrollbarOrientationE
 __ZN7WebCore14ScrollableArea19willStartLiveResizeEv
 __ZN7WebCore14ScrollableArea19invalidateScrollbarEPNS_9ScrollbarERKNS_7IntRectE
 __ZNK7WebCore14ScrollableArea21mouseEnteredScrollbarEPNS_9ScrollbarE
 __ZN7WebCore14ScrollableArea22invalidateScrollCornerERKNS_7IntRectE
-__ZN7WebCore14ScrollableArea23didAddVerticalScrollbarEPNS_9ScrollbarE
 __ZN7WebCore14ScrollableArea24setScrollbarOverlayStyleENS_21ScrollbarOverlayStyleE
-__ZN7WebCore14ScrollableArea25didAddHorizontalScrollbarEPNS_9ScrollbarE
-__ZN7WebCore14ScrollableArea27willRemoveVerticalScrollbarEPNS_9ScrollbarE
 __ZN7WebCore14ScrollableArea27notifyScrollPositionChangedERKNS_8IntPointE
 __ZN7WebCore14ScrollableArea28setScrollOffsetFromInternalsERKNS_8IntPointE
-__ZN7WebCore14ScrollableArea29willRemoveHorizontalScrollbarEPNS_9ScrollbarE
 __ZN7WebCore14ScrollableArea30scrollToOffsetWithoutAnimationERKNS_10FloatPointE
 __ZN7WebCore14ScrollableArea6scrollENS_15ScrollDirectionENS_17ScrollGranularityEf

trunk/Source/WebCore/page/FrameView.cpp

@@ -4130 +4130 @@
 }
 
+void FrameView::didAddScrollbar(Scrollbar* scrollbar, ScrollbarOrientation orientation)
+{
+    ScrollableArea::didAddScrollbar(scrollbar, orientation);
+    if (AXObjectCache* cache = axObjectCache())
+        cache->handleScrollbarUpdate(this);
+}
+
+void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation orientation)
+{
+    ScrollableArea::willRemoveScrollbar(scrollbar, orientation);
+    if (AXObjectCache* cache = axObjectCache()) {
+        cache->remove(scrollbar);
+        cache->handleScrollbarUpdate(this);
+    }
+}
+
 } // namespace WebCore

trunk/Source/WebCore/page/FrameView.h

@@ -39 +39 @@
 namespace WebCore {
 
+class AXObjectCache;
 class Element;
 class Event;
@@ -486 +487 @@
 #endif
 
+    // Override scrollbar notifications to update the AXObject cache.
+    virtual void didAddScrollbar(Scrollbar*, ScrollbarOrientation) OVERRIDE;
+    virtual void willRemoveScrollbar(Scrollbar*, ScrollbarOrientation) OVERRIDE;
+
     void scheduleResizeEvent();
     void sendResizeEvent();

trunk/Source/WebCore/platform/ScrollView.cpp

@@ -27 +27 @@
 #include "ScrollView.h"
 
-#include "AXObjectCache.h"
 #include "GraphicsContext.h"
 #include "GraphicsLayer.h"
@@ -92 +91 @@
         m_horizontalScrollbar = createScrollbar(HorizontalScrollbar);
         addChild(m_horizontalScrollbar.get());
-        didAddHorizontalScrollbar(m_horizontalScrollbar.get());
+        didAddScrollbar(m_horizontalScrollbar.get(), HorizontalScrollbar);
         m_horizontalScrollbar->styleChanged();
     } else if (!hasBar && m_horizontalScrollbar) {
-        willRemoveHorizontalScrollbar(m_horizontalScrollbar.get());
+        willRemoveScrollbar(m_horizontalScrollbar.get(), HorizontalScrollbar);
         removeChild(m_horizontalScrollbar.get());
         m_horizontalScrollbar = 0;
     }
-    
-    if (AXObjectCache* cache = axObjectCache())
-        cache->handleScrollbarUpdate(this);
 }
 
@@ -110 +106 @@
         m_verticalScrollbar = createScrollbar(VerticalScrollbar);
         addChild(m_verticalScrollbar.get());
-        didAddVerticalScrollbar(m_verticalScrollbar.get());
+        didAddScrollbar(m_verticalScrollbar.get(), VerticalScrollbar);
         m_verticalScrollbar->styleChanged();
     } else if (!hasBar && m_verticalScrollbar) {
-        willRemoveVerticalScrollbar(m_verticalScrollbar.get());
+        willRemoveScrollbar(m_verticalScrollbar.get(), VerticalScrollbar);
         removeChild(m_verticalScrollbar.get());
         m_verticalScrollbar = 0;
     }
-    
-    if (AXObjectCache* cache = axObjectCache())
-        cache->handleScrollbarUpdate(this);
 }
 

trunk/Source/WebCore/platform/ScrollableArea.cpp

@@ -262 +262 @@
 }
 
-void ScrollableArea::didAddVerticalScrollbar(Scrollbar* scrollbar)
-{
-    scrollAnimator()->didAddVerticalScrollbar(scrollbar);
+void ScrollableArea::didAddScrollbar(Scrollbar* scrollbar, ScrollbarOrientation orientation)
+{
+    if (orientation == VerticalScrollbar)
+        scrollAnimator()->didAddVerticalScrollbar(scrollbar);
+    else
+        scrollAnimator()->didAddHorizontalScrollbar(scrollbar);
 
     // <rdar://problem/9797253> AppKit resets the scrollbar's style when you attach a scrollbar
@@ -270 +273 @@
 }
 
-void ScrollableArea::willRemoveVerticalScrollbar(Scrollbar* scrollbar)
-{
-    scrollAnimator()->willRemoveVerticalScrollbar(scrollbar);
-}
-
-void ScrollableArea::didAddHorizontalScrollbar(Scrollbar* scrollbar)
-{
-    scrollAnimator()->didAddHorizontalScrollbar(scrollbar);
-
-    // <rdar://problem/9797253> AppKit resets the scrollbar's style when you attach a scrollbar
-    setScrollbarOverlayStyle(scrollbarOverlayStyle());
-}
-
-void ScrollableArea::willRemoveHorizontalScrollbar(Scrollbar* scrollbar)
-{
-    scrollAnimator()->willRemoveHorizontalScrollbar(scrollbar);
+void ScrollableArea::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation orientation)
+{
+    if (orientation == VerticalScrollbar)
+        scrollAnimator()->willRemoveVerticalScrollbar(scrollbar);
+    else
+        scrollAnimator()->willRemoveHorizontalScrollbar(scrollbar);
 }
 

trunk/Source/WebCore/platform/ScrollableArea.h

@@ -84 +84 @@
     void finishCurrentScrollAnimations() const;
 
-    void didAddVerticalScrollbar(Scrollbar*);
-    void willRemoveVerticalScrollbar(Scrollbar*);
-    virtual void didAddHorizontalScrollbar(Scrollbar*);
-    virtual void willRemoveHorizontalScrollbar(Scrollbar*);
+    virtual void didAddScrollbar(Scrollbar*, ScrollbarOrientation);
+    virtual void willRemoveScrollbar(Scrollbar*, ScrollbarOrientation);
 
     virtual void contentsResized();

trunk/Source/WebCore/platform/Scrollbar.cpp

@@ -39 +39 @@
 
 // FIXME: The following #includes are a layering violation and should be removed.
-#include "AXObjectCache.h"
-#include "AccessibilityScrollbar.h"
-#include "Document.h"
 #include "EventHandler.h"
 #include "Frame.h"
@@ -111 +108 @@
 Scrollbar::~Scrollbar()
 {
-    if (AXObjectCache* cache = existingAXObjectCache())
-        cache->remove(this);
-    
     stopTimerIfNeeded();
     
@@ -568 +562 @@
 }
 
-AXObjectCache* Scrollbar::existingAXObjectCache() const
-{
-    if (!parent())
-        return 0;
-    
-    return parent()->axObjectCache();
-}
-
 void Scrollbar::invalidateRect(const IntRect& rect)
 {

trunk/Source/WebCore/platform/Scrollbar.h

@@ -207 +207 @@
 private:
     virtual bool isScrollbar() const { return true; }
-    virtual AXObjectCache* existingAXObjectCache() const;
 };
 

trunk/Source/WebCore/platform/Widget.h

@@ -98 +98 @@
 namespace WebCore {
 
-class AXObjectCache;
 class Cursor;
 class Event;
@@ -232 +231 @@
     virtual IntPoint convertFromContainingView(const IntPoint&) const;
 
-    // A means to access the AX cache when this object can get a pointer to it.
-    virtual AXObjectCache* axObjectCache() const { return 0; }
-    
 private:
     void init(PlatformWidget); // Must be called by all Widget constructors to initialize cross-platform data.

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -2877 +2877 @@
     else {
         widget = Scrollbar::createNativeScrollbar(this, orientation, RegularScrollbar);
-        if (orientation == HorizontalScrollbar)
-            didAddHorizontalScrollbar(widget.get());
-        else 
-            didAddVerticalScrollbar(widget.get());
+        didAddScrollbar(widget.get(), orientation);
     }
     renderer()->document()->view()->addChild(widget.get());        
@@ -2892 +2889 @@
         return;
 
-    if (!scrollbar->isCustomScrollbar()) {
-        if (orientation == HorizontalScrollbar)
-            willRemoveHorizontalScrollbar(scrollbar.get());
-        else
-            willRemoveVerticalScrollbar(scrollbar.get());
-    }
+    if (!scrollbar->isCustomScrollbar())
+        willRemoveScrollbar(scrollbar.get(), orientation);
 
     scrollbar->removeFromParent();

trunk/Source/WebCore/rendering/RenderListBox.cpp

@@ -851 +851 @@
     else {
         widget = Scrollbar::createNativeScrollbar(this, VerticalScrollbar, theme()->scrollbarControlSizeForPart(ListboxPart));
-        didAddVerticalScrollbar(widget.get());
+        didAddScrollbar(widget.get(), VerticalScrollbar);
     }
     document()->view()->addChild(widget.get());        
@@ -863 +863 @@
 
     if (!m_vBar->isCustomScrollbar())
-        ScrollableArea::willRemoveVerticalScrollbar(m_vBar.get());
+        ScrollableArea::willRemoveScrollbar(m_vBar.get(), VerticalScrollbar);
     m_vBar->removeFromParent();
     m_vBar->disconnectFromScrollableArea();

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-04-21  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Widget should not depend on AXObjectCache
+        https://bugs.webkit.org/show_bug.cgi?id=114514
+
+        Reviewed by Chris Fleizach.
+
+        Update to API changes.
+
+        * WebProcess/Plugins/PDF/PDFPlugin.mm:
+        (WebKit::PDFPlugin::createScrollbar):
+        * WebProcess/Plugins/PDF/SimplePDFPlugin.mm:
+        (WebKit::SimplePDFPlugin::createScrollbar):
+        (WebKit::SimplePDFPlugin::destroyScrollbar):
+
 2013-04-20  Manuel Rego Casasnovas  <rego@igalia.com>
 

trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm

@@ -276 +276 @@
         m_horizontalScrollbarLayer.adoptNS([[WKPDFPluginScrollbarLayer alloc] initWithPDFPlugin:this]);
         [m_containerLayer.get() addSublayer:m_horizontalScrollbarLayer.get()];
-        
-        didAddHorizontalScrollbar(widget.get());
     } else {
         m_verticalScrollbarLayer.adoptNS([[WKPDFPluginScrollbarLayer alloc] initWithPDFPlugin:this]);
         [m_containerLayer.get() addSublayer:m_verticalScrollbarLayer.get()];
-        
-        didAddVerticalScrollbar(widget.get());
-    }
+    }
+    didAddScrollbar(widget.get(), orientation);
     pluginView()->frame()->view()->addChild(widget.get());
     return widget.release();

trunk/Source/WebKit2/WebProcess/Plugins/PDF/SimplePDFPlugin.mm

@@ -261 +261 @@
 {
     RefPtr<Scrollbar> widget = Scrollbar::createNativeScrollbar(this, orientation, RegularScrollbar);
-    if (orientation == HorizontalScrollbar)
-        didAddHorizontalScrollbar(widget.get());
-    else 
-        didAddVerticalScrollbar(widget.get());
+    didAddScrollbar(widget.get(), orientation);
     pluginView()->frame()->view()->addChild(widget.get());
     return widget.release();
@@ -275 +272 @@
         return;
 
-    if (orientation == HorizontalScrollbar)
-        willRemoveHorizontalScrollbar(scrollbar.get());
-    else
-        willRemoveVerticalScrollbar(scrollbar.get());
-
+    willRemoveScrollbar(scrollbar.get(), orientation);
     scrollbar->removeFromParent();
     scrollbar->disconnectFromScrollableArea();