[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[cfleizach at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 33c3f489565f98d303d91907cd473b0db7708fb8
Author: cfleizach at apple.com <cfleizach at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 9 19:50:14 2010 +0000

    Fixing GTK and windows build failure.
    
    AX: Support AccessibilityTextMarkers in DRT
    https://bugs.webkit.org/show_bug.cgi?id=44778
    
    * DumpRenderTree/AccessibilityTextMarker.h:
    (AccessibilityTextMarker::platformTextMarker):
    (AccessibilityTextMarkerRange::platformTextMarkerRange):
    * DumpRenderTree/mac/AccessibilityTextMarkerMac.mm:
    (AccessibilityTextMarker::platformTextMarker):
    (AccessibilityTextMarkerRange::platformTextMarkerRange):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67105 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index dbf74a4..262127e 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,19 @@
 2010-09-09  Chris Fleizach  <cfleizach at apple.com>
 
+        Fixing GTK and windows build failure.
+
+        AX: Support AccessibilityTextMarkers in DRT
+        https://bugs.webkit.org/show_bug.cgi?id=44778
+
+        * DumpRenderTree/AccessibilityTextMarker.h:
+        (AccessibilityTextMarker::platformTextMarker):
+        (AccessibilityTextMarkerRange::platformTextMarkerRange):
+        * DumpRenderTree/mac/AccessibilityTextMarkerMac.mm:
+        (AccessibilityTextMarker::platformTextMarker):
+        (AccessibilityTextMarkerRange::platformTextMarkerRange):
+
+2010-09-09  Chris Fleizach  <cfleizach at apple.com>
+
         Reviewed by David Kilzer.
 
         AX: Support AccessibilityTextMarkers in DRT
diff --git a/WebKitTools/DumpRenderTree/AccessibilityTextMarker.h b/WebKitTools/DumpRenderTree/AccessibilityTextMarker.h
index cbb00cc..aeb078d 100644
--- a/WebKitTools/DumpRenderTree/AccessibilityTextMarker.h
+++ b/WebKitTools/DumpRenderTree/AccessibilityTextMarker.h
@@ -51,7 +51,7 @@ public:
     AccessibilityTextMarker(const AccessibilityTextMarker&);
     ~AccessibilityTextMarker();
     
-    PlatformTextMarker platformTextMarker() const { return m_textMarker.get(); }
+    PlatformTextMarker platformTextMarker() const;
     
     static JSObjectRef makeJSAccessibilityTextMarker(JSContextRef, const AccessibilityTextMarker&);
     bool isEqual(AccessibilityTextMarker*);
@@ -71,7 +71,7 @@ public:
     AccessibilityTextMarkerRange(const AccessibilityTextMarkerRange&);
     ~AccessibilityTextMarkerRange();
     
-    PlatformTextMarkerRange platformTextMarkerRange() const { return m_textMarkerRange.get(); }
+    PlatformTextMarkerRange platformTextMarkerRange() const;
     
     static JSObjectRef makeJSAccessibilityTextMarkerRange(JSContextRef, const AccessibilityTextMarkerRange&);
     bool isEqual(AccessibilityTextMarkerRange*);
@@ -93,11 +93,13 @@ inline AccessibilityTextMarker::AccessibilityTextMarker(PlatformTextMarker) { }
 inline AccessibilityTextMarker::AccessibilityTextMarker(const AccessibilityTextMarker&) { }
 inline AccessibilityTextMarker::~AccessibilityTextMarker() { }
 inline bool AccessibilityTextMarker::isEqual(AccessibilityTextMarker*) { return false; }
+inline PlatformTextMarker AccessibilityTextMarker::platformTextMarker() const { return m_textMarker; }
 
 inline AccessibilityTextMarkerRange::AccessibilityTextMarkerRange(PlatformTextMarkerRange) { }
 inline AccessibilityTextMarkerRange::AccessibilityTextMarkerRange(const AccessibilityTextMarkerRange&) { }
 inline AccessibilityTextMarkerRange::~AccessibilityTextMarkerRange() { }
 inline bool AccessibilityTextMarkerRange::isEqual(AccessibilityTextMarkerRange*) { return false; }
+inline PlatformTextMarkerRange AccessibilityTextMarkerRange::platformTextMarkerRange() const { return m_textMarkerRange; }
 #endif
 
 #endif // AccessibilityUIElement_h
diff --git a/WebKitTools/DumpRenderTree/mac/AccessibilityTextMarkerMac.mm b/WebKitTools/DumpRenderTree/mac/AccessibilityTextMarkerMac.mm
index 5856414..9170ab6 100644
--- a/WebKitTools/DumpRenderTree/mac/AccessibilityTextMarkerMac.mm
+++ b/WebKitTools/DumpRenderTree/mac/AccessibilityTextMarkerMac.mm
@@ -49,6 +49,11 @@ bool AccessibilityTextMarker::isEqual(AccessibilityTextMarker* other)
     return [(id)platformTextMarker() isEqual:(id)other->platformTextMarker()];
 }
 
+PlatformTextMarker AccessibilityTextMarker::platformTextMarker() const 
+{ 
+    return m_textMarker.get();
+}
+
 #pragma mark AccessibilityTextMarkerRange
 
 AccessibilityTextMarkerRange::AccessibilityTextMarkerRange(PlatformTextMarkerRange markerRange)
@@ -70,3 +75,7 @@ bool AccessibilityTextMarkerRange::isEqual(AccessibilityTextMarkerRange* other)
     return [(id)platformTextMarkerRange() isEqual:(id)other->platformTextMarkerRange()];
 }
 
+PlatformTextMarkerRange AccessibilityTextMarkerRange::platformTextMarkerRange() const
+{
+    return m_textMarkerRange.get();
+}

-- 
WebKit Debian packaging