Summary: | PLATFORM(MAC) build broken with HAVE(ACCESSIBILITY) disabled | ||||||
---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | David Kilzer (:ddkilzer) <ddkilzer> | ||||
Component: | Accessibility | Assignee: | David Kilzer (:ddkilzer) <ddkilzer> | ||||
Status: | RESOLVED FIXED | ||||||
Severity: | Normal | CC: | darin | ||||
Priority: | P2 | ||||||
Version: | 528+ (Nightly build) | ||||||
Hardware: | Mac | ||||||
OS: | OS X 10.5 | ||||||
Attachments: |
|
Description
David Kilzer (:ddkilzer)
2008-11-08 04:49:23 PST
Created attachment 24985 [details]
Patch v1
Proposed fix.
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 (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 $ 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 (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. (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? (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. 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 |