Bug 22137 – PLATFORM(MAC) build broken with HAVE(ACCESSIBILITY) disabled

• Component: Accessibility
• Status: RESOLVED FIXED

[David Kilzer (:ddkilzer)]

If HAVE(ACCESSIBILITY) is set to zero in JavaScriptCore/wtf/Platform.h, the PLATFORM(MAC) build will fail.  I have a patch to fix this.

[David Kilzer (:ddkilzer)]

Created attachment 24985 [details]
Patch v1

Proposed fix.

[Darin Adler]

Comment on attachment 24985 [details]
Patch v1

> +#if HAVE(ACCESSIBILITY)
>      bool accessibilityIgnoreAttachment() const;
> +#else
> +    bool accessibilityIgnoreAttachment() const { return true; }
> +#endif

In cases like this I prefer to leave the class definition cleaner by putting the inline function definition after it. Like this:

    #if !HAVE(ACCESSIBILITY)
    inline bool AccessibilityObject::accessibilityIgnoreAttachment() const
    {
        return true;
    }
    #endif

This patch seems fine as-is.

r=me

[David Kilzer (:ddkilzer)]

(In reply to comment #2)
> (From update of attachment 24985 [details] [edit])
> > +#if HAVE(ACCESSIBILITY)
> >      bool accessibilityIgnoreAttachment() const;
> > +#else
> > +    bool accessibilityIgnoreAttachment() const { return true; }
> > +#endif
> 
> In cases like this I prefer to leave the class definition cleaner by putting
> the inline function definition after it. Like this:
> 
>     #if !HAVE(ACCESSIBILITY)
>     inline bool AccessibilityObject::accessibilityIgnoreAttachment() const
>     {
>         return true;
>     }
>     #endif

That doesn't work:

/Volumes/Data/WebKit.git/WebCore/page/AccessibilityObject.h:398: error: ‘bool WebCore::AccessibilityObject::accessibilityIgnoreAttachment() const’ and ‘bool WebCore::AccessibilityObject::accessibilityIgnoreAttachment() const’ cannot be overloaded

[David Kilzer (:ddkilzer)]

$ git svn dcommit
Committing to http://svn.webkit.org/repository/webkit/trunk ...
	M	WebCore/ChangeLog
	M	WebCore/page/AccessibilityObject.h
	M	WebCore/page/mac/AXObjectCacheMac.mm
	M	WebCore/page/mac/AccessibilityObjectMac.mm
	M	WebCore/page/mac/AccessibilityObjectWrapper.mm
	M	WebKit/mac/ChangeLog
	M	WebKit/mac/WebView/WebFrame.mm
Committed r38235

[Darin Adler]

(In reply to comment #3)
> > In cases like this I prefer to leave the class definition cleaner by putting
> > the inline function definition after it. Like this:
> > 
> >     #if !HAVE(ACCESSIBILITY)
> >     inline bool AccessibilityObject::accessibilityIgnoreAttachment() const
> >     {
> >         return true;
> >     }
> >     #endif
> 
> That doesn't work:
> 
> /Volumes/Data/WebKit.git/WebCore/page/AccessibilityObject.h:398: error: ‘bool
> WebCore::AccessibilityObject::accessibilityIgnoreAttachment() const’ and ‘bool
> WebCore::AccessibilityObject::accessibilityIgnoreAttachment() const’ cannot be
> overloaded

I've done it before, so I know it works. I think there was some other small mistake that caused this. I'll try it myself later.

[David Kilzer (:ddkilzer)]

(In reply to comment #5)
> > That doesn't work:
> > 
> > /Volumes/Data/WebKit.git/WebCore/page/AccessibilityObject.h:398: error: ‘bool
> > WebCore::AccessibilityObject::accessibilityIgnoreAttachment() const’ and ‘bool
> > WebCore::AccessibilityObject::accessibilityIgnoreAttachment() const’ cannot be
> > overloaded
> 
> I've done it before, so I know it works. I think there was some other small
> mistake that caused this. I'll try it myself later.

I think it would work to add the function definition to WebCore/page/AccessibilityObject.cpp instead.  Was that what you meant?

[Darin Adler]

(In reply to comment #6)
> I think it would work to add the function definition to
> WebCore/page/AccessibilityObject.cpp instead.  Was that what you meant?

I agree that would also work, but the function wouldn't be inline in that case.

No, it was not what I meant.

[David Kilzer (:ddkilzer)]

Follow-up fix for Qt build failure:

$ git svn dcommit
Committing to http://svn.webkit.org/repository/webkit/trunk ...
	M	WebCore/ChangeLog
	M	WebCore/page/gtk/AccessibilityObjectAtk.cpp
	M	WebCore/page/gtk/AccessibilityObjectWrapperAtk.cpp
	M	WebCore/page/qt/AccessibilityObjectQt.cpp
	M	WebCore/page/win/AccessibilityObjectWin.cpp
	M	WebCore/page/wx/AccessibilityObjectWx.cpp
Committed r38244