Changeset 118012 in webkit

Timestamp:

May 22, 2012 11:50:44 AM (12 years ago)

Author:

abarth@webkit.org

Message:

!HAVE(ACCESSIBILITY) depends on AccessibilityObject::actionVerb in the Chromium Android build
​https://bugs.webkit.org/show_bug.cgi?id=87141

Reviewed by Eric Seidel.

In the Chromium Android build there is still one remaining dependency
on object files in the accessibility directory:
AccessibilityObject::actionVerb. I missed this function in my previous
patch, but this patch changes it to be an inline stub.

• accessibility/AccessibilityObject.cpp:

(WebCore):

• accessibility/AccessibilityObject.h:

(WebCore):
(WebCore::actionVerb):
(WebCore::AccessibilityObject::lineForPosition):
(WebCore::AccessibilityObject::updateBackingStore):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/AccessibilityObject.cpp (modified) (2 diffs)
• accessibility/AccessibilityObject.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-22  Adam Barth  <abarth@webkit.org>
+
+        !HAVE(ACCESSIBILITY) depends on AccessibilityObject::actionVerb in the Chromium Android build
+        https://bugs.webkit.org/show_bug.cgi?id=87141
+
+        Reviewed by Eric Seidel.
+
+        In the Chromium Android build there is still one remaining dependency
+        on object files in the accessibility directory:
+        AccessibilityObject::actionVerb. I missed this function in my previous
+        patch, but this patch changes it to be an inline stub.
+
+        * accessibility/AccessibilityObject.cpp:
+        (WebCore):
+        * accessibility/AccessibilityObject.h:
+        (WebCore):
+        (WebCore::actionVerb):
+        (WebCore::AccessibilityObject::lineForPosition):
+        (WebCore::AccessibilityObject::updateBackingStore):
+
 2012-05-22  Joshua Bell  <jsbell@chromium.org>
 

trunk/Source/WebCore/accessibility/AccessibilityObject.cpp

@@ -1223 +1223 @@
     }    
 }
-    
+
+#if HAVE(ACCESSIBILITY)
 const String& AccessibilityObject::actionVerb() const
 {
@@ -1258 +1259 @@
     }
 }
+#endif
 
 bool AccessibilityObject::ariaIsMultiline() const

trunk/Source/WebCore/accessibility/AccessibilityObject.h

@@ -733 +733 @@
 
 #if !HAVE(ACCESSIBILITY)
+inline const AccessibilityObject::AccessibilityChildrenVector& AccessibilityObject::children() { return m_children; }
+inline const String& AccessibilityObject::actionVerb() const { return emptyString(); }
+inline int AccessibilityObject::lineForPosition(const VisiblePosition&) const { return -1; }
 inline void AccessibilityObject::updateBackingStore() { }
-inline int AccessibilityObject::lineForPosition(const VisiblePosition&) const { return -1; }
-inline const AccessibilityObject::AccessibilityChildrenVector& AccessibilityObject::children() { return m_children; }
 #endif