<!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>[173235] 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/173235">173235</a></dd>
<dt>Author</dt> <dd>enrica@apple.com</dd>
<dt>Date</dt> <dd>2014-09-03 15:15:29 -0700 (Wed, 03 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove PLATFORM(IOS) from WebCore/editing (Part 1).
https://bugs.webkit.org/show_bug.cgi?id=136474
Reviewed by Tim Horton.
Source/WebCore:
This is the first part of the work to remove PLATFORM(IOS) everywhere
in the editing code.
* dom/Range.cpp:
(WebCore::Range::create): Adding create function that takes VisiblePosition.
* dom/Range.h:
* editing/CompositeEditCommand.cpp:
(WebCore::CompositeEditCommand::apply):
(WebCore::CompositeEditCommand::inputText):
* editing/CompositeEditCommand.h:
* editing/DeleteButton.h: No need for the platform guard since it is already under
DELETION_UI
* editing/DeleteButtonController.cpp:
(WebCore::DeleteButtonController::enable):
(WebCore::DeleteButtonController::disable):
* editing/EditAction.h:
* editing/EditCommand.h:
(WebCore::EditCommand::isInsertTextCommand):
* editing/Editor.cpp:
(WebCore::ClearTextCommand::CreateAndApply):
* editing/Editor.h:
* editing/EditorCommand.cpp:
(WebCore::executeClearText):
(WebCore::enabledCopy):
(WebCore::enabledCut):
(WebCore::enabledClearText):
(WebCore::createCommandMap):
* editing/FrameSelection.cpp:
(WebCore::FrameSelection::modifyExtendingRight):
(WebCore::FrameSelection::modifyExtendingForward):
(WebCore::FrameSelection::modifyMovingRight):
(WebCore::FrameSelection::modifyMovingForward):
(WebCore::FrameSelection::modifyExtendingLeft):
(WebCore::FrameSelection::modifyExtendingBackward):
(WebCore::FrameSelection::modifyMovingLeft):
(WebCore::FrameSelection::modifyMovingBackward):
* editing/InsertTextCommand.h:
* editing/TextCheckingHelper.cpp:
* editing/TextGranularity.h:
* editing/VisiblePosition.h:
(WebCore::operator>=):
* editing/VisibleSelection.cpp:
(WebCore::VisibleSelection::setStartAndEndFromBaseAndExtentRespectingGranularity):
* editing/VisibleUnits.cpp:
* editing/VisibleUnits.h:
Source/WebKit/mac:
* WebCoreSupport/WebEditorClient.mm:
(undoNameForEditAction):
Source/WebKit2:
* UIProcess/WebEditCommandProxy.cpp:
(WebKit::WebEditCommandProxy::nameForEditAction):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomRangecpp">trunk/Source/WebCore/dom/Range.cpp</a></li>
<li><a href="#trunkSourceWebCoredomRangeh">trunk/Source/WebCore/dom/Range.h</a></li>
<li><a href="#trunkSourceWebCoreeditingCompositeEditCommandcpp">trunk/Source/WebCore/editing/CompositeEditCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingCompositeEditCommandh">trunk/Source/WebCore/editing/CompositeEditCommand.h</a></li>
<li><a href="#trunkSourceWebCoreeditingDeleteButtonh">trunk/Source/WebCore/editing/DeleteButton.h</a></li>
<li><a href="#trunkSourceWebCoreeditingDeleteButtonControllercpp">trunk/Source/WebCore/editing/DeleteButtonController.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingEditActionh">trunk/Source/WebCore/editing/EditAction.h</a></li>
<li><a href="#trunkSourceWebCoreeditingEditCommandh">trunk/Source/WebCore/editing/EditCommand.h</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorcpp">trunk/Source/WebCore/editing/Editor.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorh">trunk/Source/WebCore/editing/Editor.h</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorCommandcpp">trunk/Source/WebCore/editing/EditorCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingFrameSelectioncpp">trunk/Source/WebCore/editing/FrameSelection.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingInsertTextCommandh">trunk/Source/WebCore/editing/InsertTextCommand.h</a></li>
<li><a href="#trunkSourceWebCoreeditingTextCheckingHelpercpp">trunk/Source/WebCore/editing/TextCheckingHelper.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingTextGranularityh">trunk/Source/WebCore/editing/TextGranularity.h</a></li>
<li><a href="#trunkSourceWebCoreeditingVisiblePositionh">trunk/Source/WebCore/editing/VisiblePosition.h</a></li>
<li><a href="#trunkSourceWebCoreeditingVisibleSelectioncpp">trunk/Source/WebCore/editing/VisibleSelection.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingVisibleUnitscpp">trunk/Source/WebCore/editing/VisibleUnits.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingVisibleUnitsh">trunk/Source/WebCore/editing/VisibleUnits.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebEditorClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebEditCommandProxycpp">trunk/Source/WebKit2/UIProcess/WebEditCommandProxy.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173234 => 173235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-03 22:02:08 UTC (rev 173234)
+++ trunk/Source/WebCore/ChangeLog 2014-09-03 22:15:29 UTC (rev 173235)
</span><span class="lines">@@ -1,3 +1,56 @@
</span><ins>+2014-09-03 Enrica Casucci <enrica@apple.com>
+
+ Remove PLATFORM(IOS) from WebCore/editing (Part 1).
+ https://bugs.webkit.org/show_bug.cgi?id=136474
+
+ Reviewed by Tim Horton.
+
+ This is the first part of the work to remove PLATFORM(IOS) everywhere
+ in the editing code.
+
+ * dom/Range.cpp:
+ (WebCore::Range::create): Adding create function that takes VisiblePosition.
+ * dom/Range.h:
+ * editing/CompositeEditCommand.cpp:
+ (WebCore::CompositeEditCommand::apply):
+ (WebCore::CompositeEditCommand::inputText):
+ * editing/CompositeEditCommand.h:
+ * editing/DeleteButton.h: No need for the platform guard since it is already under
+ DELETION_UI
+ * editing/DeleteButtonController.cpp:
+ (WebCore::DeleteButtonController::enable):
+ (WebCore::DeleteButtonController::disable):
+ * editing/EditAction.h:
+ * editing/EditCommand.h:
+ (WebCore::EditCommand::isInsertTextCommand):
+ * editing/Editor.cpp:
+ (WebCore::ClearTextCommand::CreateAndApply):
+ * editing/Editor.h:
+ * editing/EditorCommand.cpp:
+ (WebCore::executeClearText):
+ (WebCore::enabledCopy):
+ (WebCore::enabledCut):
+ (WebCore::enabledClearText):
+ (WebCore::createCommandMap):
+ * editing/FrameSelection.cpp:
+ (WebCore::FrameSelection::modifyExtendingRight):
+ (WebCore::FrameSelection::modifyExtendingForward):
+ (WebCore::FrameSelection::modifyMovingRight):
+ (WebCore::FrameSelection::modifyMovingForward):
+ (WebCore::FrameSelection::modifyExtendingLeft):
+ (WebCore::FrameSelection::modifyExtendingBackward):
+ (WebCore::FrameSelection::modifyMovingLeft):
+ (WebCore::FrameSelection::modifyMovingBackward):
+ * editing/InsertTextCommand.h:
+ * editing/TextCheckingHelper.cpp:
+ * editing/TextGranularity.h:
+ * editing/VisiblePosition.h:
+ (WebCore::operator>=):
+ * editing/VisibleSelection.cpp:
+ (WebCore::VisibleSelection::setStartAndEndFromBaseAndExtentRespectingGranularity):
+ * editing/VisibleUnits.cpp:
+ * editing/VisibleUnits.h:
+
</ins><span class="cx"> 2014-09-03 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Get rid of some uses of OwnPtr
</span></span></pre></div>
<a id="trunkSourceWebCoredomRangecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Range.cpp (173234 => 173235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Range.cpp 2014-09-03 22:02:08 UTC (rev 173234)
+++ trunk/Source/WebCore/dom/Range.cpp 2014-09-03 22:15:29 UTC (rev 173235)
</span><span class="lines">@@ -109,14 +109,12 @@
</span><span class="cx"> return adoptRef(new Range(toDocument(context)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> PassRefPtr<Range> Range::create(Document& ownerDocument, const VisiblePosition& visibleStart, const VisiblePosition& visibleEnd)
</span><span class="cx"> {
</span><span class="cx"> Position start = visibleStart.deepEquivalent().parentAnchoredEquivalent();
</span><span class="cx"> Position end = visibleEnd.deepEquivalent().parentAnchoredEquivalent();
</span><span class="cx"> return adoptRef(new Range(ownerDocument, start.anchorNode(), start.deprecatedEditingOffset(), end.anchorNode(), end.deprecatedEditingOffset()));
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> Range::~Range()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoredomRangeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Range.h (173234 => 173235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Range.h 2014-09-03 22:02:08 UTC (rev 173234)
+++ trunk/Source/WebCore/dom/Range.h 2014-09-03 22:15:29 UTC (rev 173235)
</span><span class="lines">@@ -45,9 +45,9 @@
</span><span class="cx"> class Node;
</span><span class="cx"> class NodeWithIndex;
</span><span class="cx"> class Text;
</span><ins>+class VisiblePosition;
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> class SelectionRect;
</span><del>-class VisiblePosition;
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> class Range : public RefCounted<Range> {
</span><span class="lines">@@ -56,10 +56,7 @@
</span><span class="cx"> WEBCORE_EXPORT static PassRefPtr<Range> create(Document&, PassRefPtr<Node> startContainer, int startOffset, PassRefPtr<Node> endContainer, int endOffset);
</span><span class="cx"> WEBCORE_EXPORT static PassRefPtr<Range> create(Document&, const Position&, const Position&);
</span><span class="cx"> WEBCORE_EXPORT static PassRefPtr<Range> create(ScriptExecutionContext&);
</span><del>-#if PLATFORM(IOS)
- // FIXME: Consider making this a static non-member, non-friend function.
</del><span class="cx"> WEBCORE_EXPORT static PassRefPtr<Range> create(Document&, const VisiblePosition&, const VisiblePosition&);
</span><del>-#endif
</del><span class="cx"> WEBCORE_EXPORT ~Range();
</span><span class="cx">
</span><span class="cx"> Document& ownerDocument() const { return const_cast<Document&>(m_ownerDocument.get()); }
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingCompositeEditCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/CompositeEditCommand.cpp (173234 => 173235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/CompositeEditCommand.cpp 2014-09-03 22:02:08 UTC (rev 173234)
+++ trunk/Source/WebCore/editing/CompositeEditCommand.cpp 2014-09-03 22:15:29 UTC (rev 173235)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "AppendNodeCommand.h"
</span><span class="cx"> #include "ApplyStyleCommand.h"
</span><ins>+#include "BreakBlockquoteCommand.h"
</ins><span class="cx"> #include "DeleteFromTextNodeCommand.h"
</span><span class="cx"> #include "DeleteSelectionCommand.h"
</span><span class="cx"> #include "Document.h"
</span><span class="lines">@@ -72,9 +73,6 @@
</span><span class="cx"> #include "DeleteButtonController.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
-#include "BreakBlockquoteCommand.h"
-#endif
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -202,10 +200,8 @@
</span><span class="cx"> case EditActionSetWritingDirection:
</span><span class="cx"> case EditActionCut:
</span><span class="cx"> case EditActionUnspecified:
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> case EditActionDelete:
</span><span class="cx"> case EditActionDictation:
</span><del>-#endif
</del><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="lines">@@ -502,7 +498,6 @@
</span><span class="cx"> applyCommandToComposite(SplitTextNodeContainingElementCommand::create(text, offset));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> void CompositeEditCommand::inputText(const String& text, bool selectInsertedText)
</span><span class="cx"> {
</span><span class="cx"> unsigned offset = 0;
</span><span class="lines">@@ -543,7 +538,6 @@
</span><span class="cx"> if (selectInsertedText)
</span><span class="cx"> setEndingSelection(VisibleSelection(visiblePositionForIndex(startIndex, scope.get()), visiblePositionForIndex(startIndex + length, scope.get())));
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void CompositeEditCommand::insertTextIntoNode(PassRefPtr<Text> node, unsigned offset, const String& text)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingCompositeEditCommandh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/CompositeEditCommand.h (173234 => 173235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/CompositeEditCommand.h 2014-09-03 22:02:08 UTC (rev 173234)
+++ trunk/Source/WebCore/editing/CompositeEditCommand.h 2014-09-03 22:15:29 UTC (rev 173235)
</span><span class="lines">@@ -104,9 +104,7 @@
</span><span class="cx"> void deleteSelection(bool smartDelete = false, bool mergeBlocksAfterDelete = true, bool replace = false, bool expandForSpecialElements = true, bool sanitizeMarkup = true);
</span><span class="cx"> void deleteSelection(const VisibleSelection&, bool smartDelete = false, bool mergeBlocksAfterDelete = true, bool replace = false, bool expandForSpecialElements = true, bool sanitizeMarkup = true);
</span><span class="cx"> virtual void deleteTextFromNode(PassRefPtr<Text>, unsigned offset, unsigned count);
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> void inputText(const String&, bool selectInsertedText = false);
</span><del>-#endif
</del><span class="cx"> bool isRemovableBlock(const Node*);
</span><span class="cx"> void insertNodeAfter(PassRefPtr<Node>, PassRefPtr<Node> refChild);
</span><span class="cx"> void insertNodeAt(PassRefPtr<Node>, const Position&);
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingDeleteButtonh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/DeleteButton.h (173234 => 173235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/DeleteButton.h 2014-09-03 22:02:08 UTC (rev 173234)
+++ trunk/Source/WebCore/editing/DeleteButton.h 2014-09-03 22:15:29 UTC (rev 173235)
</span><span class="lines">@@ -34,9 +34,7 @@
</span><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<DeleteButton> create(Document&);
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
</del><span class="cx"> virtual bool willRespondToMouseClickEvents() override { return true; }
</span><del>-#endif // !PLATFORM(IOS)
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit DeleteButton(Document&);
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingDeleteButtonControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/DeleteButtonController.cpp (173234 => 173235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/DeleteButtonController.cpp 2014-09-03 22:02:08 UTC (rev 173234)
+++ trunk/Source/WebCore/editing/DeleteButtonController.cpp 2014-09-03 22:15:29 UTC (rev 173235)
</span><span class="lines">@@ -330,7 +330,6 @@
</span><span class="cx">
</span><span class="cx"> void DeleteButtonController::enable()
</span><span class="cx"> {
</span><del>-#if !PLATFORM(IOS)
</del><span class="cx"> ASSERT(m_disableStack > 0);
</span><span class="cx"> if (m_disableStack > 0)
</span><span class="cx"> m_disableStack--;
</span><span class="lines">@@ -341,16 +340,13 @@
</span><span class="cx"> m_frame.document()->updateStyleIfNeeded();
</span><span class="cx"> show(enclosingDeletableElement(m_frame.selection().selection()));
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DeleteButtonController::disable()
</span><span class="cx"> {
</span><del>-#if !PLATFORM(IOS)
</del><span class="cx"> if (enabled())
</span><span class="cx"> hide();
</span><span class="cx"> m_disableStack++;
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class RemoveTargetCommand : public CompositeEditCommand {
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditActionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/EditAction.h (173234 => 173235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/EditAction.h 2014-09-03 22:02:08 UTC (rev 173234)
+++ trunk/Source/WebCore/editing/EditAction.h 2014-09-03 22:15:29 UTC (rev 173235)
</span><span class="lines">@@ -57,10 +57,8 @@
</span><span class="cx"> EditActionCut,
</span><span class="cx"> EditActionBold,
</span><span class="cx"> EditActionItalics,
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> EditActionDelete,
</span><span class="cx"> EditActionDictation,
</span><del>-#endif
</del><span class="cx"> EditActionPaste,
</span><span class="cx"> EditActionPasteFont,
</span><span class="cx"> EditActionPasteRuler,
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditCommandh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/EditCommand.h (173234 => 173235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/EditCommand.h 2014-09-03 22:02:08 UTC (rev 173234)
+++ trunk/Source/WebCore/editing/EditCommand.h 2014-09-03 22:15:29 UTC (rev 173235)
</span><span class="lines">@@ -51,10 +51,7 @@
</span><span class="cx"> const VisibleSelection& startingSelection() const { return m_startingSelection; }
</span><span class="cx"> const VisibleSelection& endingSelection() const { return m_endingSelection; }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- virtual bool isInsertTextCommand() const { return false; }
-#endif
-
</del><ins>+ virtual bool isInsertTextCommand() const { return false; }
</ins><span class="cx"> virtual bool isSimpleEditCommand() const { return false; }
</span><span class="cx"> virtual bool isCompositeEditCommand() const { return false; }
</span><span class="cx"> virtual bool isEditCommandComposition() const { return false; }
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.cpp (173234 => 173235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.cpp 2014-09-03 22:02:08 UTC (rev 173234)
+++ trunk/Source/WebCore/editing/Editor.cpp 2014-09-03 22:15:29 UTC (rev 173235)
</span><span class="lines">@@ -104,7 +104,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> class ClearTextCommand : public DeleteSelectionCommand {
</span><span class="cx"> public:
</span><span class="cx"> ClearTextCommand(Document& document);
</span><span class="lines">@@ -138,7 +137,6 @@
</span><span class="cx"> clearCommand->setStartingSelection(oldSelection);
</span><span class="cx"> applyCommand(clearCommand.release());
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx"> using namespace WTF;
</span><span class="lines">@@ -442,12 +440,12 @@
</span><span class="cx"> applyCommand(DeleteSelectionCommand::create(document(), smartDelete));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> void Editor::clearText()
</span><span class="cx"> {
</span><span class="cx"> ClearTextCommand::CreateAndApply(&m_frame);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
</ins><span class="cx"> void Editor::insertDictationPhrases(PassOwnPtr<Vector<Vector<String> > > dictationPhrases, RetainPtr<id> metadata)
</span><span class="cx"> {
</span><span class="cx"> if (m_frame.selection().isNone())
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.h (173234 => 173235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.h 2014-09-03 22:02:08 UTC (rev 173234)
+++ trunk/Source/WebCore/editing/Editor.h 2014-09-03 22:15:29 UTC (rev 173235)
</span><span class="lines">@@ -175,8 +175,8 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT bool deleteWithDirection(SelectionDirection, TextGranularity, bool killRing, bool isTypingAction);
</span><span class="cx"> WEBCORE_EXPORT void deleteSelectionWithSmartDelete(bool smartDelete);
</span><ins>+ void clearText();
</ins><span class="cx"> #if PLATFORM(IOS)
</span><del>- void clearText();
</del><span class="cx"> WEBCORE_EXPORT void removeUnchangeableStyles();
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/EditorCommand.cpp (173234 => 173235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/EditorCommand.cpp 2014-09-03 22:02:08 UTC (rev 173234)
+++ trunk/Source/WebCore/editing/EditorCommand.cpp 2014-09-03 22:15:29 UTC (rev 173235)
</span><span class="lines">@@ -302,13 +302,11 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> static bool executeClearText(Frame& frame, Event*, EditorCommandSource, const String&)
</span><span class="cx"> {
</span><span class="cx"> frame.editor().clearText();
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> static bool executeDefaultParagraphSeparator(Frame& frame, Event*, EditorCommandSource, const String& value)
</span><span class="cx"> {
</span><span class="lines">@@ -1245,29 +1243,19 @@
</span><span class="cx">
</span><span class="cx"> static bool enabledCopy(Frame& frame, Event*, EditorCommandSource)
</span><span class="cx"> {
</span><del>-#if !PLATFORM(IOS)
</del><span class="cx"> return frame.editor().canDHTMLCopy() || frame.editor().canCopy();
</span><del>-#else
- return frame.editor().canCopy();
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool enabledCut(Frame& frame, Event*, EditorCommandSource)
</span><span class="cx"> {
</span><del>-#if !PLATFORM(IOS)
</del><span class="cx"> return frame.editor().canDHTMLCut() || frame.editor().canCut();
</span><del>-#else
- return frame.editor().canCut();
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> static bool enabledClearText(Frame& frame, Event*, EditorCommandSource)
</span><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(frame);
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> static bool enabledInEditableText(Frame& frame, Event* event, EditorCommandSource)
</span><span class="cx"> {
</span><span class="lines">@@ -1492,6 +1480,7 @@
</span><span class="cx"> { "AlignRight", { executeJustifyRight, supportedFromMenuOrKeyBinding, enabledInRichlyEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
</span><span class="cx"> { "BackColor", { executeBackColor, supported, enabledInRichlyEditableText, stateNone, valueBackColor, notTextInsertion, doNotAllowExecutionWhenDisabled } },
</span><span class="cx"> { "Bold", { executeToggleBold, supported, enabledInRichlyEditableText, stateBold, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
</span><ins>+ { "ClearText", { executeClearText, supported, enabledClearText, stateNone, valueNull, notTextInsertion, allowExecutionWhenDisabled } },
</ins><span class="cx"> { "Copy", { executeCopy, supportedCopyCut, enabledCopy, stateNone, valueNull, notTextInsertion, allowExecutionWhenDisabled } },
</span><span class="cx"> { "CreateLink", { executeCreateLink, supported, enabledInRichlyEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
</span><span class="cx"> { "Cut", { executeCut, supportedCopyCut, enabledCut, stateNone, valueNull, notTextInsertion, allowExecutionWhenDisabled } },
</span><span class="lines">@@ -1630,9 +1619,6 @@
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> { "TakeFindStringFromSelection", { executeTakeFindStringFromSelection, supportedFromMenuOrKeyBinding, enabledTakeFindStringFromSelection, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(IOS)
- { "ClearText", { executeClearText, supported, enabledClearText, stateNone, valueNull, notTextInsertion, allowExecutionWhenDisabled } },
-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // These unsupported commands are listed here since they appear in the Microsoft
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingFrameSelectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/FrameSelection.cpp (173234 => 173235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/FrameSelection.cpp 2014-09-03 22:02:08 UTC (rev 173234)
+++ trunk/Source/WebCore/editing/FrameSelection.cpp 2014-09-03 22:15:29 UTC (rev 173235)
</span><span class="lines">@@ -700,11 +700,9 @@
</span><span class="cx"> // FIXME: implement all of the above?
</span><span class="cx"> pos = modifyExtendingForward(granularity);
</span><span class="cx"> break;
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> case DocumentGranularity:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> break;
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> #if ENABLE(USERSELECT_ALL)
</span><span class="cx"> adjustPositionForUserSelectAll(pos, directionOfEnclosingBlock() == LTR);
</span><span class="lines">@@ -731,11 +729,9 @@
</span><span class="cx"> case ParagraphGranularity:
</span><span class="cx"> pos = nextParagraphPosition(pos, lineDirectionPointForBlockDirectionNavigation(EXTENT));
</span><span class="cx"> break;
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> case DocumentGranularity:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> break;
</span><del>-#endif
</del><span class="cx"> case SentenceBoundary:
</span><span class="cx"> pos = endOfSentence(endForPlatform());
</span><span class="cx"> break;
</span><span class="lines">@@ -791,11 +787,9 @@
</span><span class="cx"> case LineBoundary:
</span><span class="cx"> pos = rightBoundaryOfLine(startForPlatform(), directionOfEnclosingBlock());
</span><span class="cx"> break;
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> case DocumentGranularity:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> break;
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> return pos;
</span><span class="cx"> }
</span><span class="lines">@@ -828,11 +822,9 @@
</span><span class="cx"> case ParagraphGranularity:
</span><span class="cx"> pos = nextParagraphPosition(endForPlatform(), lineDirectionPointForBlockDirectionNavigation(START));
</span><span class="cx"> break;
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> case DocumentGranularity:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> break;
</span><del>-#endif
</del><span class="cx"> case SentenceBoundary:
</span><span class="cx"> pos = endOfSentence(endForPlatform());
</span><span class="cx"> break;
</span><span class="lines">@@ -889,11 +881,9 @@
</span><span class="cx"> case DocumentBoundary:
</span><span class="cx"> pos = modifyExtendingBackward(granularity);
</span><span class="cx"> break;
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> case DocumentGranularity:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> break;
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> #if ENABLE(USERSELECT_ALL)
</span><span class="cx"> adjustPositionForUserSelectAll(pos, !(directionOfEnclosingBlock() == LTR));
</span><span class="lines">@@ -941,11 +931,9 @@
</span><span class="cx"> else
</span><span class="cx"> pos = startOfDocument(pos);
</span><span class="cx"> break;
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> case DocumentGranularity:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> break;
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> #if ENABLE(USERSELECT_ALL)
</span><span class="cx"> adjustPositionForUserSelectAll(pos, !(directionOfEnclosingBlock() == LTR));
</span><span class="lines">@@ -983,11 +971,9 @@
</span><span class="cx"> case LineBoundary:
</span><span class="cx"> pos = leftBoundaryOfLine(startForPlatform(), directionOfEnclosingBlock());
</span><span class="cx"> break;
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> case DocumentGranularity:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> break;
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> return pos;
</span><span class="cx"> }
</span><span class="lines">@@ -1030,11 +1016,9 @@
</span><span class="cx"> else
</span><span class="cx"> pos = startOfDocument(pos);
</span><span class="cx"> break;
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> case DocumentGranularity:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> break;
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> return pos;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingInsertTextCommandh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/InsertTextCommand.h (173234 => 173235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/InsertTextCommand.h 2014-09-03 22:02:08 UTC (rev 173234)
+++ trunk/Source/WebCore/editing/InsertTextCommand.h 2014-09-03 22:15:29 UTC (rev 173235)
</span><span class="lines">@@ -68,9 +68,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void doApply();
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> virtual bool isInsertTextCommand() const override { return true; }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> Position positionInsideTextNode(const Position&);
</span><span class="cx"> Position insertTab(const Position&);
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingTextCheckingHelpercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/TextCheckingHelper.cpp (173234 => 173235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/TextCheckingHelper.cpp 2014-09-03 22:02:08 UTC (rev 173234)
+++ trunk/Source/WebCore/editing/TextCheckingHelper.cpp 2014-09-03 22:15:29 UTC (rev 173235)
</span><span class="lines">@@ -240,8 +240,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
-
</del><span class="cx"> String TextCheckingHelper::findFirstMisspelling(int& firstMisspellingOffset, bool markAll, RefPtr<Range>& firstMisspellingRange)
</span><span class="cx"> {
</span><span class="cx"> firstMisspellingOffset = 0;
</span><span class="lines">@@ -421,8 +419,6 @@
</span><span class="cx"> return firstFoundItem;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // !PLATFORM(IOS)
-
</del><span class="cx"> #if USE(GRAMMAR_CHECKING)
</span><span class="cx">
</span><span class="cx"> int TextCheckingHelper::findFirstGrammarDetail(const Vector<GrammarDetail>& grammarDetails, int badGrammarPhraseLocation, int startOffset, int endOffset, bool markAll) const
</span><span class="lines">@@ -622,8 +618,6 @@
</span><span class="cx"> return guesses;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
-
</del><span class="cx"> void TextCheckingHelper::markAllMisspellings(RefPtr<Range>& firstMisspellingRange)
</span><span class="cx"> {
</span><span class="cx"> // Use the "markAll" feature of findFirstMisspelling. Ignore the return value and the "out parameter";
</span><span class="lines">@@ -643,8 +637,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#endif // !PLATFORM(IOS)
-
</del><span class="cx"> bool TextCheckingHelper::unifiedTextCheckerEnabled() const
</span><span class="cx"> {
</span><span class="cx"> return m_range && WebCore::unifiedTextCheckerEnabled(m_range->ownerDocument().frame());
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingTextGranularityh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/TextGranularity.h (173234 => 173235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/TextGranularity.h 2014-09-03 22:02:08 UTC (rev 173234)
+++ trunk/Source/WebCore/editing/TextGranularity.h 2014-09-03 22:15:29 UTC (rev 173235)
</span><span class="lines">@@ -36,9 +36,7 @@
</span><span class="cx"> SentenceGranularity,
</span><span class="cx"> LineGranularity,
</span><span class="cx"> ParagraphGranularity,
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> DocumentGranularity,
</span><del>-#endif
</del><span class="cx"> SentenceBoundary,
</span><span class="cx"> LineBoundary,
</span><span class="cx"> ParagraphBoundary,
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingVisiblePositionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/VisiblePosition.h (173234 => 173235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/VisiblePosition.h 2014-09-03 22:02:08 UTC (rev 173234)
+++ trunk/Source/WebCore/editing/VisiblePosition.h 2014-09-03 22:15:29 UTC (rev 173235)
</span><span class="lines">@@ -128,7 +128,6 @@
</span><span class="cx"> return !(a == b);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> inline bool operator<(const VisiblePosition& a, const VisiblePosition& b)
</span><span class="cx"> {
</span><span class="cx"> return a.deepEquivalent() < b.deepEquivalent();
</span><span class="lines">@@ -148,7 +147,6 @@
</span><span class="cx"> {
</span><span class="cx"> return a.deepEquivalent() >= b.deepEquivalent();
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT PassRefPtr<Range> makeRange(const VisiblePosition&, const VisiblePosition&);
</span><span class="cx"> bool setStart(Range*, const VisiblePosition&);
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingVisibleSelectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/VisibleSelection.cpp (173234 => 173235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/VisibleSelection.cpp 2014-09-03 22:02:08 UTC (rev 173234)
+++ trunk/Source/WebCore/editing/VisibleSelection.cpp 2014-09-03 22:15:29 UTC (rev 173235)
</span><span class="lines">@@ -393,11 +393,9 @@
</span><span class="cx"> m_start = startOfSentence(VisiblePosition(m_start, m_affinity)).deepEquivalent();
</span><span class="cx"> m_end = endOfSentence(VisiblePosition(m_end, m_affinity)).deepEquivalent();
</span><span class="cx"> break;
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> case DocumentGranularity:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> break;
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Make sure we do not have a dangling start or end.
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingVisibleUnitscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/VisibleUnits.cpp (173234 => 173235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/VisibleUnits.cpp 2014-09-03 22:02:08 UTC (rev 173234)
+++ trunk/Source/WebCore/editing/VisibleUnits.cpp 2014-09-03 22:15:29 UTC (rev 173235)
</span><span class="lines">@@ -1445,8 +1445,6 @@
</span><span class="cx"> return direction == LTR ? logicalEndOfLine(c) : logicalStartOfLine(c);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
-
</del><span class="cx"> static bool directionIsDownstream(SelectionDirection direction)
</span><span class="cx"> {
</span><span class="cx"> if (direction == DirectionBackward)
</span><span class="lines">@@ -1921,6 +1919,4 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif
-
</del><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingVisibleUnitsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/VisibleUnits.h (173234 => 173235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/VisibleUnits.h 2014-09-03 22:02:08 UTC (rev 173234)
+++ trunk/Source/WebCore/editing/VisibleUnits.h 2014-09-03 22:15:29 UTC (rev 173235)
</span><span class="lines">@@ -96,7 +96,6 @@
</span><span class="cx"> WEBCORE_EXPORT VisiblePosition endOfEditableContent(const VisiblePosition&);
</span><span class="cx"> WEBCORE_EXPORT bool isEndOfEditableOrNonEditableContent(const VisiblePosition&);
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> WEBCORE_EXPORT bool atBoundaryOfGranularity(const VisiblePosition&, TextGranularity, SelectionDirection);
</span><span class="cx"> WEBCORE_EXPORT bool withinTextUnitOfGranularity(const VisiblePosition&, TextGranularity, SelectionDirection);
</span><span class="cx"> WEBCORE_EXPORT VisiblePosition positionOfNextBoundaryOfGranularity(const VisiblePosition&, TextGranularity, SelectionDirection);
</span><span class="lines">@@ -105,7 +104,6 @@
</span><span class="cx"> WEBCORE_EXPORT PassRefPtr<Range> wordRangeFromPosition(const VisiblePosition& position);
</span><span class="cx"> WEBCORE_EXPORT VisiblePosition closestWordBoundaryForPosition(const VisiblePosition& position);
</span><span class="cx"> WEBCORE_EXPORT void charactersAroundPosition(const VisiblePosition&, UChar32& oneAfter, UChar32& oneBefore, UChar32& twoBefore);
</span><del>-#endif
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // VisibleUnits_h
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (173234 => 173235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-09-03 22:02:08 UTC (rev 173234)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-09-03 22:15:29 UTC (rev 173235)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-09-03 Enrica Casucci <enrica@apple.com>
+
+ Remove PLATFORM(IOS) from WebCore/editing (Part 1).
+ https://bugs.webkit.org/show_bug.cgi?id=136474
+
+ Reviewed by Tim Horton.
+
+ * WebCoreSupport/WebEditorClient.mm:
+ (undoNameForEditAction):
+
</ins><span class="cx"> 2014-09-02 Maciej Stachowiak <mjs@apple.com>
</span><span class="cx">
</span><span class="cx"> Clean up naming for and slightly refactor legacy video fullscreen support
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebEditorClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm (173234 => 173235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2014-09-03 22:02:08 UTC (rev 173234)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2014-09-03 22:15:29 UTC (rev 173235)
</span><span class="lines">@@ -586,10 +586,8 @@
</span><span class="cx"> case EditActionOutdent: return UI_STRING_KEY_INTERNAL("Outdent", "Outdent (Undo action name)", "Undo action name");
</span><span class="cx"> case EditActionBold: return UI_STRING_KEY_INTERNAL("Bold", "Bold (Undo action name)", "Undo action name");
</span><span class="cx"> case EditActionItalics: return UI_STRING_KEY_INTERNAL("Italics", "Italics (Undo action name)", "Undo action name");
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> case EditActionDelete: return UI_STRING_KEY_INTERNAL("Delete", "Delete (Undo action name)", "Undo action name (Used only by PLATFORM(IOS) code)");
</span><span class="cx"> case EditActionDictation: return UI_STRING_KEY_INTERNAL("Dictation", "Dictation (Undo action name)", "Undo action name (Used only by PLATFORM(IOS) code)");
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> return nil;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (173234 => 173235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-09-03 22:02:08 UTC (rev 173234)
+++ trunk/Source/WebKit2/ChangeLog 2014-09-03 22:15:29 UTC (rev 173235)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-09-03 Enrica Casucci <enrica@apple.com>
+
+ Remove PLATFORM(IOS) from WebCore/editing (Part 1).
+ https://bugs.webkit.org/show_bug.cgi?id=136474
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/WebEditCommandProxy.cpp:
+ (WebKit::WebEditCommandProxy::nameForEditAction):
+
</ins><span class="cx"> 2014-09-03 Yongjun Zhang <yongjun_zhang@apple.com>
</span><span class="cx">
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=136395
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebEditCommandProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebEditCommandProxy.cpp (173234 => 173235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebEditCommandProxy.cpp 2014-09-03 22:02:08 UTC (rev 173234)
+++ trunk/Source/WebKit2/UIProcess/WebEditCommandProxy.cpp 2014-09-03 22:15:29 UTC (rev 173235)
</span><span class="lines">@@ -129,12 +129,10 @@
</span><span class="cx"> return WEB_UI_STRING_KEY("Bold", "Bold (Undo action name)", "Undo action name");
</span><span class="cx"> case EditActionItalics:
</span><span class="cx"> return WEB_UI_STRING_KEY("Italics", "Italics (Undo action name)", "Undo action name");
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> case EditActionDelete:
</span><span class="cx"> return WEB_UI_STRING_KEY("Delete", "Delete (Undo action name)", "Undo action name");
</span><span class="cx"> case EditActionDictation:
</span><span class="cx"> return WEB_UI_STRING_KEY("Dictation", "Dictation (Undo action name)", "Undo action name");
</span><del>-#endif
</del><span class="cx"> case EditActionPaste:
</span><span class="cx"> return WEB_UI_STRING_KEY("Paste", "Paste (Undo action name)", "Undo action name");
</span><span class="cx"> case EditActionPasteFont:
</span></span></pre>
</div>
</div>
</body>
</html>