<!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>[166445] trunk/Source/WebCore</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/166445">166445</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-28 19:26:53 -0700 (Fri, 28 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refactor cut and copy functions as suggested in FIXME line
https://bugs.webkit.org/show_bug.cgi?id=129867
Patch by Lukasz Bialek <l.bialek@samsung.com> on 2014-03-28
Reviewed by Darin Adler.
Cut and Copy functions in Editor.cpp use lots of common code.
Those functions are merged into one to share code, several
additional conditions are added to preserve Cut and Copy
functionality.
* editing/Editor.cpp:
(WebCore::Editor::cut):
(WebCore::Editor::copy):
(WebCore::Editor::performCutOrCopy):
* editing/Editor.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166444 => 166445)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-29 01:15:50 UTC (rev 166444)
+++ trunk/Source/WebCore/ChangeLog 2014-03-29 02:26:53 UTC (rev 166445)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-03-28 Lukasz Bialek <l.bialek@samsung.com>
+
+ Refactor cut and copy functions as suggested in FIXME line
+ https://bugs.webkit.org/show_bug.cgi?id=129867
+
+ Reviewed by Darin Adler.
+
+ Cut and Copy functions in Editor.cpp use lots of common code.
+ Those functions are merged into one to share code, several
+ additional conditions are added to preserve Cut and Copy
+ functionality.
+
+ * editing/Editor.cpp:
+ (WebCore::Editor::cut):
+ (WebCore::Editor::copy):
+ (WebCore::Editor::performCutOrCopy):
+ * editing/Editor.h:
+
</ins><span class="cx"> 2014-03-28 Stephanie Lewis <slewis@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename pluginDidEvaluate to better represent when it’s called.
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.cpp (166444 => 166445)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.cpp 2014-03-29 01:15:50 UTC (rev 166444)
+++ trunk/Source/WebCore/editing/Editor.cpp 2014-03-29 02:26:53 UTC (rev 166445)
</span><span class="lines">@@ -1284,24 +1284,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // FIXME: This should share more code with the copy function; there is a lot of overlap.
- RefPtr<Range> selection = selectedRange();
- willWriteSelectionToPasteboard(selection);
- if (shouldDeleteRange(selection.get())) {
- updateMarkersForWordsAffectedByEditing(true);
- if (enclosingTextFormControl(m_frame.selection().selection().start()))
- Pasteboard::createForCopyAndPaste()->writePlainText(selectedTextForClipboard(), canSmartCopyOrDelete() ? Pasteboard::CanSmartReplace : Pasteboard::CannotSmartReplace);
- else {
-#if PLATFORM(COCOA) || PLATFORM(EFL)
- writeSelectionToPasteboard(*Pasteboard::createForCopyAndPaste());
-#else
- // FIXME: Convert all other platforms to match Mac and delete this.
- Pasteboard::createForCopyAndPaste()->writeSelection(*selection, canSmartCopyOrDelete(), m_frame, IncludeImageAltTextForClipboard);
-#endif
- }
- didWriteSelectionToPasteboard();
- deleteSelectionWithSmartDelete(canSmartCopyOrDelete());
- }
</del><ins>+ performCutOrCopy(CutAction);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Editor::copy()
</span><span class="lines">@@ -1313,12 +1296,28 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- willWriteSelectionToPasteboard(selectedRange());
- if (enclosingTextFormControl(m_frame.selection().selection().start())) {
- Pasteboard::createForCopyAndPaste()->writePlainText(selectedTextForClipboard(),
- canSmartCopyOrDelete() ? Pasteboard::CanSmartReplace : Pasteboard::CannotSmartReplace);
- } else {
- if (HTMLImageElement* imageElement = imageElementFromImageDocument(document())) {
</del><ins>+ performCutOrCopy(CopyAction);
+}
+
+void Editor::performCutOrCopy(EditorActionSpecifier action)
+{
+ RefPtr<Range> selection = selectedRange();
+ willWriteSelectionToPasteboard(selection);
+ if (action == CutAction) {
+ if (!shouldDeleteRange(selection.get()))
+ return;
+
+ updateMarkersForWordsAffectedByEditing(true);
+ }
+
+ if (enclosingTextFormControl(m_frame.selection().selection().start()))
+ Pasteboard::createForCopyAndPaste()->writePlainText(selectedTextForClipboard(), canSmartCopyOrDelete() ? Pasteboard::CanSmartReplace : Pasteboard::CannotSmartReplace);
+ else {
+ HTMLImageElement* imageElement = nullptr;
+ if (action == CopyAction)
+ imageElement = imageElementFromImageDocument(document());
+
+ if (imageElement) {
</ins><span class="cx"> #if PLATFORM(COCOA) || PLATFORM(EFL)
</span><span class="cx"> writeImageToPasteboard(*Pasteboard::createForCopyAndPaste(), *imageElement, document().url(), document().title());
</span><span class="cx"> #else
</span><span class="lines">@@ -1329,12 +1328,14 @@
</span><span class="cx"> writeSelectionToPasteboard(*Pasteboard::createForCopyAndPaste());
</span><span class="cx"> #else
</span><span class="cx"> // FIXME: Convert all other platforms to match Mac and delete this.
</span><del>- Pasteboard::createForCopyAndPaste()->writeSelection(*selectedRange(), canSmartCopyOrDelete(), m_frame, IncludeImageAltTextForClipboard);
</del><ins>+ Pasteboard::createForCopyAndPaste()->writeSelection(*selection, canSmartCopyOrDelete(), m_frame, IncludeImageAltTextForClipboard);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> didWriteSelectionToPasteboard();
</span><ins>+ if (action == CutAction)
+ deleteSelectionWithSmartDelete(canSmartCopyOrDelete());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Editor::paste()
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.h (166444 => 166445)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.h 2014-03-29 01:15:50 UTC (rev 166444)
+++ trunk/Source/WebCore/editing/Editor.h 2014-03-29 02:26:53 UTC (rev 166445)
</span><span class="lines">@@ -464,6 +464,9 @@
</span><span class="cx">
</span><span class="cx"> void changeSelectionAfterCommand(const VisibleSelection& newSelection, FrameSelection::SetSelectionOptions);
</span><span class="cx">
</span><ins>+ enum EditorActionSpecifier { CutAction, CopyAction };
+ void performCutOrCopy(EditorActionSpecifier);
+
</ins><span class="cx"> void editorUIUpdateTimerFired(Timer<Editor>&);
</span><span class="cx">
</span><span class="cx"> Node* findEventTargetFromSelection() const;
</span></span></pre>
</div>
</div>
</body>
</html>