[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

eric at webkit.org eric at webkit.org
Thu Feb 4 21:31:50 UTC 2010


The following commit has been merged in the webkit-1.1 branch:
commit eab31fd449f21a0a3b5b2c106953382e8c4fea72
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 29 04:27:35 2010 +0000

    2010-01-28  Steve Block  <steveblock at google.com>
    
            Reviewed by David Levin.
    
            Add stub for AXObjectCache::contentChanged when HAVE(ACCESSIBILITY) is not defined
            https://bugs.webkit.org/show_bug.cgi?id=34271
    
            No new tests, build fix only.
    
            * accessibility/AXObjectCache.cpp: Modified. Added HAVE(ACCESSIBILITY) guards around contentChanged
            * accessibility/AXObjectCache.h: Modified.
            (WebCore::AXObjectCache::contentChanged): Added stub
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54041 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 80ad831..abe39e9 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,19 @@
 
         Reviewed by David Levin.
 
+        Add stub for AXObjectCache::contentChanged when HAVE(ACCESSIBILITY) is not defined
+        https://bugs.webkit.org/show_bug.cgi?id=34271
+
+        No new tests, build fix only.
+
+        * accessibility/AXObjectCache.cpp: Modified. Added HAVE(ACCESSIBILITY) guards around contentChanged
+        * accessibility/AXObjectCache.h: Modified.
+        (WebCore::AXObjectCache::contentChanged): Added stub
+
+2010-01-28  Steve Block  <steveblock at google.com>
+
+        Reviewed by David Levin.
+
         Use long long rather than int64 in V8Binding.h
         https://bugs.webkit.org/show_bug.cgi?id=34270
 
diff --git a/WebCore/accessibility/AXObjectCache.cpp b/WebCore/accessibility/AXObjectCache.cpp
index 60ac97a..c347a81 100644
--- a/WebCore/accessibility/AXObjectCache.cpp
+++ b/WebCore/accessibility/AXObjectCache.cpp
@@ -351,13 +351,15 @@ void AXObjectCache::removeAXID(AccessibilityObject* object)
     m_idsInUse.remove(objID);
 }
 
+#if HAVE(ACCESSIBILITY)
 void AXObjectCache::contentChanged(RenderObject* renderer)
 {
     AccessibilityObject* object = getOrCreate(renderer);
     if (object)
         object->contentChanged(); 
 }
-    
+#endif
+
 void AXObjectCache::childrenChanged(RenderObject* renderer)
 {
     if (!renderer)
diff --git a/WebCore/accessibility/AXObjectCache.h b/WebCore/accessibility/AXObjectCache.h
index 450396f..dad73f2 100644
--- a/WebCore/accessibility/AXObjectCache.h
+++ b/WebCore/accessibility/AXObjectCache.h
@@ -152,6 +152,7 @@ inline void AXObjectCache::postNotification(RenderObject*, AXNotification, bool
 inline void AXObjectCache::postPlatformNotification(AccessibilityObject*, AXNotification) { }
 inline void AXObjectCache::handleFocusedUIElementChanged(RenderObject*, RenderObject*) { }
 inline void AXObjectCache::handleScrolledToAnchor(const Node*) { }
+inline void AXObjectCache::contentChanged(RenderObject*) { }
 #endif
 
 }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list