From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 27 Jun 2017 06:07:23 +0000 Subject: webkitgtk-2.16.5 --- .../InjectedBundle/AccessibilityTextMarker.h | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'Tools/WebKitTestRunner/InjectedBundle/AccessibilityTextMarker.h') diff --git a/Tools/WebKitTestRunner/InjectedBundle/AccessibilityTextMarker.h b/Tools/WebKitTestRunner/InjectedBundle/AccessibilityTextMarker.h index c4d4d0481..041f81bc7 100644 --- a/Tools/WebKitTestRunner/InjectedBundle/AccessibilityTextMarker.h +++ b/Tools/WebKitTestRunner/InjectedBundle/AccessibilityTextMarker.h @@ -23,15 +23,14 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef AccessibilityTextMarker_h -#define AccessibilityTextMarker_h +#pragma once #include "JSWrappable.h" #include -#include #include +#include -#if PLATFORM(MAC) +#if PLATFORM(COCOA) #include typedef CFTypeRef PlatformTextMarker; #else @@ -44,8 +43,8 @@ class AccessibilityUIElement; class AccessibilityTextMarker : public JSWrappable { public: - static PassRefPtr create(PlatformTextMarker); - static PassRefPtr create(const AccessibilityTextMarker&); + static Ref create(PlatformTextMarker); + static Ref create(const AccessibilityTextMarker&); ~AccessibilityTextMarker(); @@ -59,17 +58,15 @@ private: AccessibilityTextMarker(PlatformTextMarker); AccessibilityTextMarker(const AccessibilityTextMarker&); -#if PLATFORM(MAC) +#if PLATFORM(COCOA) RetainPtr m_textMarker; #else PlatformTextMarker m_textMarker; #endif }; -#if !PLATFORM(MAC) +#if !PLATFORM(COCOA) inline bool AccessibilityTextMarker::isEqual(AccessibilityTextMarker*) { return false; } #endif } // namespace WTR - -#endif // AccessibilityTextMarker_h -- cgit v1.2.1