<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[173340] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/173340">173340</a></dd>
<dt>Author</dt> <dd>enrica@apple.com</dd>
<dt>Date</dt> <dd>2014-09-05 16:30:30 -0700 (Fri, 05 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove PLATFORM(IOS) from WebCore/editing (Part 3).
https://bugs.webkit.org/show_bug.cgi?id=136474
Reviewed by Benjamin Poulain.
This patch removes the use of PLATFORM(IOS) from TextAffinity.h
and removes the assumption that EAffinity values match NSSelectionAffinity
values. It also removes the includes in TextAffinity.h, creating the need to
include explicitly the files when necessary. It also removes the unnecessary
use of platform specific types, replacing them with WebCore types.
Source/WebCore:
* editing/TextAffinity.h:
(kit): Deleted.
(core): Deleted.
* editing/cocoa/HTMLConverter.mm:
* page/mac/WebCoreFrameView.h:
* platform/ios/ScrollViewIOS.mm:
(WebCore::ScrollView::platformSetScrollPosition):
(WebCore::ScrollView::platformSetScrollOrigin):
* platform/ios/wak/WAKScrollView.mm:
(-[WAKScrollView setScrollOrigin:updatePositionAtAll:immediately:]):
(-[WAKScrollView scrollOrigin]):
Source/WebKit/mac:
* WebCoreSupport/WebEditorClient.h: Added kit and core for EAffinity.
* WebView/WebFrameView.mm:
(-[WebFrameView _scrollToBeginningOfDocument]):
(-[WebFrameView _scrollToEndOfDocument]):
Source/WebKit2:
* WebProcess/InjectedBundle/API/mac/WKDOMInternals.mm:
* WebProcess/WebPage/WKAccessibilityWebPageObjectIOS.mm:
(-[WKAccessibilityWebPageObject accessibilityHitTest:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingTextAffinityh">trunk/Source/WebCore/editing/TextAffinity.h</a></li>
<li><a href="#trunkSourceWebCoreeditingcocoaHTMLConvertermm">trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm</a></li>
<li><a href="#trunkSourceWebCorepagemacWebCoreFrameViewh">trunk/Source/WebCore/page/mac/WebCoreFrameView.h</a></li>
<li><a href="#trunkSourceWebCoreplatformiosScrollViewIOSmm">trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformioswakWAKScrollViewmm">trunk/Source/WebCore/platform/ios/wak/WAKScrollView.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacScrollViewMacmm">trunk/Source/WebCore/platform/mac/ScrollViewMac.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebEditorClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFrameViewmm">trunk/Source/WebKit/mac/WebView/WebFrameView.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPImacWKDOMInternalsmm">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMInternals.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWKAccessibilityWebPageObjectIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/WKAccessibilityWebPageObjectIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173339 => 173340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-05 23:01:16 UTC (rev 173339)
+++ trunk/Source/WebCore/ChangeLog 2014-09-05 23:30:30 UTC (rev 173340)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-09-05 Enrica Casucci <enrica@apple.com>
+
+ Remove PLATFORM(IOS) from WebCore/editing (Part 3).
+ https://bugs.webkit.org/show_bug.cgi?id=136474
+
+ Reviewed by Benjamin Poulain.
+
+ This patch removes the use of PLATFORM(IOS) from TextAffinity.h
+ and removes the assumption that EAffinity values match NSSelectionAffinity
+ values. It also removes the includes in TextAffinity.h, creating the need to
+ include explicitly the files when necessary. It also removes the unnecessary
+ use of platform specific types, replacing them with WebCore types.
+
+ * editing/TextAffinity.h:
+ (kit): Deleted.
+ (core): Deleted.
+ * editing/cocoa/HTMLConverter.mm:
+ * page/mac/WebCoreFrameView.h:
+ * platform/ios/ScrollViewIOS.mm:
+ (WebCore::ScrollView::platformSetScrollPosition):
+ (WebCore::ScrollView::platformSetScrollOrigin):
+ * platform/ios/wak/WAKScrollView.mm:
+ (-[WAKScrollView setScrollOrigin:updatePositionAtAll:immediately:]):
+ (-[WAKScrollView scrollOrigin]):
+
</ins><span class="cx"> 2014-09-05 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed GTK build fix; include StringPrintStream to pull in toString().
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingTextAffinityh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/TextAffinity.h (173339 => 173340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/TextAffinity.h 2014-09-05 23:01:16 UTC (rev 173339)
+++ trunk/Source/WebCore/editing/TextAffinity.h 2014-09-05 23:30:30 UTC (rev 173340)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2004 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2004-2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -26,36 +26,10 @@
</span><span class="cx"> #ifndef TextAffinity_h
</span><span class="cx"> #define TextAffinity_h
</span><span class="cx">
</span><del>-#ifdef __OBJC__
-#if !PLATFORM(IOS)
-#include <AppKit/NSTextView.h>
-#else
-#include "WAKAppKitStubs.h"
-#endif // !PLATFORM(IOS)
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-// These match the AppKit values for these concepts.
-// From NSTextView.h:
-// NSSelectionAffinityUpstream = 0
-// NSSelectionAffinityDownstream = 1
</del><span class="cx"> enum EAffinity { UPSTREAM = 0, DOWNSTREAM = 1 };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#ifdef __OBJC__
-
-inline NSSelectionAffinity kit(WebCore::EAffinity affinity)
-{
- return static_cast<NSSelectionAffinity>(affinity);
-}
-
-inline WebCore::EAffinity core(NSSelectionAffinity affinity)
-{
- return static_cast<WebCore::EAffinity>(affinity);
-}
-
-#endif
-
</del><span class="cx"> #endif // TextAffinity_h
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingcocoaHTMLConvertermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm (173339 => 173340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm 2014-09-05 23:01:16 UTC (rev 173339)
+++ trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm 2014-09-05 23:30:30 UTC (rev 173340)
</span><span class="lines">@@ -62,6 +62,8 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">
</span><ins>+#import "WAKAppKitStubs.h"
+
</ins><span class="cx"> SOFT_LINK_FRAMEWORK(UIKit)
</span><span class="cx"> SOFT_LINK_CLASS(UIKit, UIColor)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacWebCoreFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/WebCoreFrameView.h (173339 => 173340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/WebCoreFrameView.h 2014-09-05 23:01:16 UTC (rev 173339)
+++ trunk/Source/WebCore/page/mac/WebCoreFrameView.h 2014-09-05 23:30:30 UTC (rev 173340)
</span><span class="lines">@@ -28,7 +28,8 @@
</span><span class="cx"> // WTF_PLATFORM_IOS
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> namespace WebCore {
</span><del>- class Frame;
</del><ins>+class Frame;
+class IntPoint;
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -37,13 +38,13 @@
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> - (void)setScrollingModes:(WebCore::ScrollbarMode)hMode vertical:(WebCore::ScrollbarMode)vMode andLock:(BOOL)lock;
</span><span class="cx"> - (void)scrollingModes:(WebCore::ScrollbarMode*)hMode vertical:(WebCore::ScrollbarMode*)vMode;
</span><ins>+- (void)setScrollOrigin:(WebCore::IntPoint)origin updatePositionAtAll:(BOOL)updatePositionAtAll immediately:(BOOL)updatePositionImmediately;
+- (WebCore::IntPoint)scrollOrigin;
</ins><span class="cx"> #else
</span><span class="cx"> - (void)setScrollingModes:(int)hMode vertical:(int)vMode andLock:(BOOL)lock;
</span><span class="cx"> - (void)scrollingModes:(int*)hMode vertical:(int*)vMode;
</span><span class="cx"> #endif
</span><span class="cx"> - (void)setScrollBarsSuppressed:(BOOL)suppressed repaintOnUnsuppress:(BOOL)repaint;
</span><del>-- (void)setScrollOrigin:(NSPoint)origin updatePositionAtAll:(BOOL)updatePositionAtAll immediately:(BOOL)updatePositionImmediately;
-- (NSPoint)scrollOrigin;
</del><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @protocol WebCoreFrameView
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosScrollViewIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm (173339 => 173340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm 2014-09-05 23:01:16 UTC (rev 173339)
+++ trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm 2014-09-05 23:30:30 UTC (rev 173340)
</span><span class="lines">@@ -243,9 +243,7 @@
</span><span class="cx"> void ScrollView::platformSetScrollPosition(const IntPoint& scrollPoint)
</span><span class="cx"> {
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><del>- NSPoint floatPoint = scrollPoint;
- NSPoint tempPoint = { max(-[scrollView() scrollOrigin].x, floatPoint.x), max(-[scrollView() scrollOrigin].y, floatPoint.y) }; // Don't use NSMakePoint to work around 4213314.
- [documentView() scrollPoint:tempPoint];
</del><ins>+ [documentView() scrollPoint:NSMakePoint(max(-[scrollView() scrollOrigin].x(), scrollPoint.x()), max(-[scrollView() scrollOrigin].y(), scrollPoint.y()))];
</ins><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -307,7 +305,7 @@
</span><span class="cx"> void ScrollView::platformSetScrollOrigin(const IntPoint& origin, bool updatePositionAll, bool updatePositionSynchronously)
</span><span class="cx"> {
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><del>- [scrollView() setScrollOrigin:static_cast<CGPoint>(origin) updatePositionAtAll:updatePositionAll immediately:updatePositionSynchronously];
</del><ins>+ [scrollView() setScrollOrigin:origin updatePositionAtAll:updatePositionAll immediately:updatePositionSynchronously];
</ins><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformioswakWAKScrollViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/wak/WAKScrollView.mm (173339 => 173340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/wak/WAKScrollView.mm 2014-09-05 23:01:16 UTC (rev 173339)
+++ trunk/Source/WebCore/platform/ios/wak/WAKScrollView.mm 2014-09-05 23:30:30 UTC (rev 173340)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">
</span><ins>+#import "IntPoint.h"
</ins><span class="cx"> #import "WAKAppKitStubs.h"
</span><span class="cx"> #import "WAKClipView.h"
</span><span class="cx"> #import "WAKViewInternal.h"
</span><span class="lines">@@ -232,7 +233,7 @@
</span><span class="cx"> UNUSED_PARAM(repaint);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)setScrollOrigin:(NSPoint)scrollOrigin updatePositionAtAll:(BOOL)updatePositionAtAll immediately:(BOOL)updatePositionImmediately
</del><ins>+- (void)setScrollOrigin:(WebCore::IntPoint)scrollOrigin updatePositionAtAll:(BOOL)updatePositionAtAll immediately:(BOOL)updatePositionImmediately
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(updatePositionAtAll);
</span><span class="cx"> UNUSED_PARAM(updatePositionImmediately);
</span><span class="lines">@@ -241,12 +242,12 @@
</span><span class="cx"> // so we don't have to check for equivalence here.
</span><span class="cx"> _scrollOrigin = scrollOrigin;
</span><span class="cx">
</span><del>- [_documentView setBoundsOrigin:NSMakePoint(-scrollOrigin.x, -scrollOrigin.y)];
</del><ins>+ [_documentView setBoundsOrigin:NSMakePoint(-scrollOrigin.x(), -scrollOrigin.y())];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (NSPoint)scrollOrigin
</del><ins>+- (WebCore::IntPoint)scrollOrigin
</ins><span class="cx"> {
</span><del>- return _scrollOrigin;
</del><ins>+ return WebCore::IntPoint(_scrollOrigin);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark -
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollViewMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollViewMac.mm (173339 => 173340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ScrollViewMac.mm 2014-09-05 23:01:16 UTC (rev 173339)
+++ trunk/Source/WebCore/platform/mac/ScrollViewMac.mm 2014-09-05 23:30:30 UTC (rev 173340)
</span><span class="lines">@@ -201,8 +201,7 @@
</span><span class="cx"> void ScrollView::platformSetScrollPosition(const IntPoint& scrollPoint)
</span><span class="cx"> {
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><del>- NSPoint floatPoint = scrollPoint;
- NSPoint tempPoint = { std::max(-[scrollView() scrollOrigin].x, floatPoint.x), std::max(-[scrollView() scrollOrigin].y, floatPoint.y) }; // Don't use NSMakePoint to work around 4213314.
</del><ins>+ NSPoint tempPoint = NSMakePoint(std::max(-[scrollView() scrollOrigin].x(), scrollPoint.x()), std::max(-[scrollView() scrollOrigin].y(), scrollPoint.y()));
</ins><span class="cx">
</span><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><span class="cx"> // AppKit has the inset factored into all of its scroll positions. In WebCore, we use positions that ignore
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (173339 => 173340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-09-05 23:01:16 UTC (rev 173339)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-09-05 23:30:30 UTC (rev 173340)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-09-05 Enrica Casucci <enrica@apple.com>
+
+ Remove PLATFORM(IOS) from WebCore/editing (Part 3).
+ https://bugs.webkit.org/show_bug.cgi?id=136474
+
+ Reviewed by Benjamin Poulain.
+
+ This patch removes the use of PLATFORM(IOS) from TextAffinity.h
+ and removes the assumption that EAffinity values match NSSelectionAffinity
+ values. It also removes the includes in TextAffinity.h, creating the need to
+ include explicitly the files when necessary. It also removes the unnecessary
+ use of platform specific types, replacing them with WebCore types.
+
+ * WebCoreSupport/WebEditorClient.h: Added kit and core for EAffinity.
+ * WebView/WebFrameView.mm:
+ (-[WebFrameView _scrollToBeginningOfDocument]):
+ (-[WebFrameView _scrollToEndOfDocument]):
+
</ins><span class="cx"> 2014-09-05 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Another attempt to fix the iOS build after <http://trac.webkit.org/changeset/173309>
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebEditorClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h (173339 => 173340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h 2014-09-05 23:01:16 UTC (rev 173339)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h 2014-09-05 23:30:30 UTC (rev 173340)
</span><span class="lines">@@ -34,6 +34,10 @@
</span><span class="cx"> #import <wtf/Vector.h>
</span><span class="cx"> #import <wtf/text/StringView.h>
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+#import <WebCore/WAKAppKitStubs.h>
+#endif
+
</ins><span class="cx"> @class WebView;
</span><span class="cx"> @class WebEditorUndoTarget;
</span><span class="cx">
</span><span class="lines">@@ -176,6 +180,28 @@
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
+inline NSSelectionAffinity kit(WebCore::EAffinity affinity)
+{
+ switch (affinity) {
+ case WebCore::EAffinity::UPSTREAM:
+ return NSSelectionAffinityUpstream;
+ case WebCore::EAffinity::DOWNSTREAM:
+ return NSSelectionAffinityDownstream;
+ }
+}
+
+inline WebCore::EAffinity core(NSSelectionAffinity affinity)
+{
+ switch (affinity) {
+ case NSSelectionAffinityUpstream:
+ return WebCore::EAffinity::UPSTREAM;
+ case NSSelectionAffinityDownstream:
+ return WebCore::EAffinity::DOWNSTREAM;
+ }
+}
+#endif
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> inline bool WebEditorClient::isGrammarCheckingEnabled()
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFrameViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrameView.mm (173339 => 173340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrameView.mm 2014-09-05 23:01:16 UTC (rev 173339)
+++ trunk/Source/WebKit/mac/WebView/WebFrameView.mm 2014-09-05 23:30:30 UTC (rev 173340)
</span><span class="lines">@@ -669,8 +669,8 @@
</span><span class="cx"> if (![self _isScrollable])
</span><span class="cx"> return NO;
</span><span class="cx"> NSPoint point = [(NSView *)[[self _scrollView] documentView] frame].origin;
</span><del>- point.x += [[self _scrollView] scrollOrigin].x;
- point.y += [[self _scrollView] scrollOrigin].y;
</del><ins>+ point.x += [[self _scrollView] scrollOrigin].x();
+ point.y += [[self _scrollView] scrollOrigin].y();
</ins><span class="cx"> return [[self _contentView] _scrollTo:&point animate:YES];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -700,9 +700,9 @@
</span><span class="cx">
</span><span class="cx"> // Reset the position opposite to the block progression direction.
</span><span class="cx"> if (isVertical)
</span><del>- point.x += [[self _scrollView] scrollOrigin].x;
</del><ins>+ point.x += [[self _scrollView] scrollOrigin].x();
</ins><span class="cx"> else
</span><del>- point.y += [[self _scrollView] scrollOrigin].y;
</del><ins>+ point.y += [[self _scrollView] scrollOrigin].y();
</ins><span class="cx"> return [[self _contentView] _scrollTo:&point animate:YES];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (173339 => 173340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-09-05 23:01:16 UTC (rev 173339)
+++ trunk/Source/WebKit2/ChangeLog 2014-09-05 23:30:30 UTC (rev 173340)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-09-05 Enrica Casucci <enrica@apple.com>
+
+ Remove PLATFORM(IOS) from WebCore/editing (Part 3).
+ https://bugs.webkit.org/show_bug.cgi?id=136474
+
+ Reviewed by Benjamin Poulain.
+
+ This patch removes the use of PLATFORM(IOS) from TextAffinity.h
+ and removes the assumption that EAffinity values match NSSelectionAffinity
+ values. It also removes the includes in TextAffinity.h, creating the need to
+ include explicitly the files when necessary. It also removes the unnecessary
+ use of platform specific types, replacing them with WebCore types.
+
+ * WebProcess/InjectedBundle/API/mac/WKDOMInternals.mm:
+ * WebProcess/WebPage/WKAccessibilityWebPageObjectIOS.mm:
+ (-[WKAccessibilityWebPageObject accessibilityHitTest:]):
+
</ins><span class="cx"> 2014-09-05 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> JavaScriptCore should build with newer clang
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPImacWKDOMInternalsmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMInternals.mm (173339 => 173340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMInternals.mm 2014-09-05 23:01:16 UTC (rev 173339)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMInternals.mm 2014-09-05 23:30:30 UTC (rev 173340)
</span><span class="lines">@@ -40,6 +40,10 @@
</span><span class="cx"> #import "WKDOMDocument.h"
</span><span class="cx"> #import "WKDOMText.h"
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+#import <WebCore/WAKAppKitStubs.h>
+#endif
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> template<typename WebCoreType, typename WKDOMType>
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWKAccessibilityWebPageObjectIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WKAccessibilityWebPageObjectIOS.mm (173339 => 173340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WKAccessibilityWebPageObjectIOS.mm 2014-09-05 23:01:16 UTC (rev 173339)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WKAccessibilityWebPageObjectIOS.mm 2014-09-05 23:30:30 UTC (rev 173340)
</span><span class="lines">@@ -69,12 +69,12 @@
</span><span class="cx"> return m_page->pageScaleFactor();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (id)accessibilityHitTest:(NSPoint)point
</del><ins>+- (id)accessibilityHitTest:(WebCore::IntPoint)point
</ins><span class="cx"> {
</span><span class="cx"> if (!m_page)
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- WebCore::IntPoint convertedPoint = m_page->accessibilityScreenToRootView(WebCore::IntPoint(point));
</del><ins>+ WebCore::IntPoint convertedPoint = m_page->accessibilityScreenToRootView(point);
</ins><span class="cx"> return [[self accessibilityRootObjectWrapper] accessibilityHitTest:convertedPoint];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>