<!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>[164053] trunk</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/164053">164053</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2014-02-13 13:55:29 -0800 (Thu, 13 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>During a copy, position:fixed gets converted to position:absolute even if only part of the document is selected
https://bugs.webkit.org/show_bug.cgi?id=128688
Reviewed by Ryosuke Niwa.
Source/WebCore:
Adds a field, m_needsPositionStyleConversion, to StyledMarkupAccumulator.
Also, renames the ConvertPositionStyleOnCopy setting to ShouldConvertPositionStyleOnCopy
Test: editing/pasteboard/copy-paste-doesnt-convert-sticky-and-fixed-during-partial-copy.html
* editing/markup.cpp:
(WebCore::StyledMarkupAccumulator::StyledMarkupAccumulator):
(WebCore::StyledMarkupAccumulator::appendElement):
(WebCore::createMarkupInternal):
* page/Settings.in:
* testing/InternalSettings.cpp:
(WebCore::InternalSettings::Backup::Backup):
(WebCore::InternalSettings::Backup::restoreTo):
(WebCore::InternalSettings::setShouldConvertPositionStyleOnCopy):
* testing/InternalSettings.h:
* testing/InternalSettings.idl:
Source/WebKit/mac:
Renames the ConvertPositionStyleOnCopy setting to ShouldConvertPositionStyleOnCopy
* WebView/WebPreferenceKeysPrivate.h:
* WebView/WebPreferences.mm:
(-[WebPreferences shouldConvertPositionStyleOnCopy]):
(-[WebPreferences setShouldConvertPositionStyleOnCopy:]):
* WebView/WebPreferencesPrivate.h:
* WebView/WebView.mm:
(-[WebView _preferencesChanged:]):
Source/WebKit2:
Renames the ConvertPositionStyleOnCopy setting to ShouldConvertPositionStyleOnCopy
* Shared/WebPreferencesStore.h:
* UIProcess/API/C/WKPreferences.cpp:
(WKPreferencesSetShouldConvertPositionStyleOnCopy):
(WKPreferencesGetShouldConvertPositionStyleOnCopy):
* UIProcess/API/C/WKPreferencesPrivate.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences):
LayoutTests:
Performs a copy of the contents of a particular div, rather than the entire body. Makes sure that
no position:fixed -> position:absolute conversion occurs.
* editing/pasteboard/copy-paste-converts-sticky-and-fixed-expected.txt:
* editing/pasteboard/copy-paste-converts-sticky-and-fixed.html:
* editing/pasteboard/copy-paste-doesnt-convert-sticky-and-fixed-during-partial-copy-expected.txt: Added.
* editing/pasteboard/copy-paste-doesnt-convert-sticky-and-fixed-during-partial-copy.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestseditingpasteboardcopypasteconvertsstickyandfixedexpectedtxt">trunk/LayoutTests/editing/pasteboard/copy-paste-converts-sticky-and-fixed-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingpasteboardcopypasteconvertsstickyandfixedhtml">trunk/LayoutTests/editing/pasteboard/copy-paste-converts-sticky-and-fixed.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingmarkupcpp">trunk/Source/WebCore/editing/markup.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSettingsin">trunk/Source/WebCore/page/Settings.in</a></li>
<li><a href="#trunkSourceWebCoretestingInternalSettingscpp">trunk/Source/WebCore/testing/InternalSettings.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalSettingsh">trunk/Source/WebCore/testing/InternalSettings.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalSettingsidl">trunk/Source/WebCore/testing/InternalSettings.idl</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferenceKeysPrivateh">trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesmm">trunk/Source/WebKit/mac/WebView/WebPreferences.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesPrivateh">trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPreferencesStoreh">trunk/Source/WebKit2/Shared/WebPreferencesStore.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPreferencescpp">trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPreferencesPrivateh">trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestseditingpasteboardcopypastedoesntconvertstickyandfixedduringpartialcopyexpectedtxt">trunk/LayoutTests/editing/pasteboard/copy-paste-doesnt-convert-sticky-and-fixed-during-partial-copy-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingpasteboardcopypastedoesntconvertstickyandfixedduringpartialcopyhtml">trunk/LayoutTests/editing/pasteboard/copy-paste-doesnt-convert-sticky-and-fixed-during-partial-copy.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (164052 => 164053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-13 21:38:05 UTC (rev 164052)
+++ trunk/LayoutTests/ChangeLog 2014-02-13 21:55:29 UTC (rev 164053)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-02-13 Myles C. Maxfield <mmaxfield@apple.com>
+
+ During a copy, position:fixed gets converted to position:absolute even if only part of the document is selected
+ https://bugs.webkit.org/show_bug.cgi?id=128688
+
+ Reviewed by Ryosuke Niwa.
+
+ Performs a copy of the contents of a particular div, rather than the entire body. Makes sure that
+ no position:fixed -> position:absolute conversion occurs.
+
+ * editing/pasteboard/copy-paste-converts-sticky-and-fixed-expected.txt:
+ * editing/pasteboard/copy-paste-converts-sticky-and-fixed.html:
+ * editing/pasteboard/copy-paste-doesnt-convert-sticky-and-fixed-during-partial-copy-expected.txt: Added.
+ * editing/pasteboard/copy-paste-doesnt-convert-sticky-and-fixed-during-partial-copy.html: Added.
+
</ins><span class="cx"> 2014-02-13 Chang Shu <cshu@webkit.org>
</span><span class="cx">
</span><span class="cx"> Copying (createMarkup) wrapping text results in space between wrapped lines stripped.
</span></span></pre></div>
<a id="trunkLayoutTestseditingpasteboardcopypasteconvertsstickyandfixedexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/pasteboard/copy-paste-converts-sticky-and-fixed-expected.txt (164052 => 164053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/pasteboard/copy-paste-converts-sticky-and-fixed-expected.txt 2014-02-13 21:38:05 UTC (rev 164052)
+++ trunk/LayoutTests/editing/pasteboard/copy-paste-converts-sticky-and-fixed-expected.txt 2014-02-13 21:55:29 UTC (rev 164053)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> document.designMode = 'on';
</span><span class="cx">
</span><span class="cx"> if (window.internals)
</span><del>- window.internals.settings.setConvertPositionStyleOnCopy(true);
</del><ins>+ window.internals.settings.setShouldConvertPositionStyleOnCopy(true);
</ins><span class="cx">
</span><span class="cx"> var s = window.getSelection();
</span><span class="cx">
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> document.designMode = 'on';
</span><span class="cx">
</span><span class="cx"> if (window.internals)
</span><del>- window.internals.settings.setConvertPositionStyleOnCopy(true);
</del><ins>+ window.internals.settings.setShouldConvertPositionStyleOnCopy(true);
</ins><span class="cx">
</span><span class="cx"> var s = window.getSelection();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestseditingpasteboardcopypasteconvertsstickyandfixedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/pasteboard/copy-paste-converts-sticky-and-fixed.html (164052 => 164053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/pasteboard/copy-paste-converts-sticky-and-fixed.html 2014-02-13 21:38:05 UTC (rev 164052)
+++ trunk/LayoutTests/editing/pasteboard/copy-paste-converts-sticky-and-fixed.html 2014-02-13 21:55:29 UTC (rev 164053)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> document.designMode = 'on';
</span><span class="cx">
</span><span class="cx"> if (window.internals)
</span><del>- window.internals.settings.setConvertPositionStyleOnCopy(true);
</del><ins>+ window.internals.settings.setShouldConvertPositionStyleOnCopy(true);
</ins><span class="cx">
</span><span class="cx"> var s = window.getSelection();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestseditingpasteboardcopypastedoesntconvertstickyandfixedduringpartialcopyexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/pasteboard/copy-paste-doesnt-convert-sticky-and-fixed-during-partial-copy-expected.txt (0 => 164053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/pasteboard/copy-paste-doesnt-convert-sticky-and-fixed-during-partial-copy-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/pasteboard/copy-paste-doesnt-convert-sticky-and-fixed-during-partial-copy-expected.txt 2014-02-13 21:55:29 UTC (rev 164053)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+This tests to see if position:sticky and position:fixed don't get converted to position:static and position:absolute upon copy/paste when there is only a partial selection (not the entire body is selected)
+
+Before:
+| "
+abc"
+| <div>
+| style="position: fixed; left: 0px; top: 0px;"
+| "def"
+| "ghi
+"
+
+After:
+| "abc"
+| <div>
+| style="position: fixed; left: 0px; top: 0px;"
+| "def"
+| "ghi<#selection-caret>"
</ins></span></pre></div>
<a id="trunkLayoutTestseditingpasteboardcopypastedoesntconvertstickyandfixedduringpartialcopyhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/pasteboard/copy-paste-doesnt-convert-sticky-and-fixed-during-partial-copy.html (0 => 164053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/pasteboard/copy-paste-doesnt-convert-sticky-and-fixed-during-partial-copy.html (rev 0)
+++ trunk/LayoutTests/editing/pasteboard/copy-paste-doesnt-convert-sticky-and-fixed-during-partial-copy.html 2014-02-13 21:55:29 UTC (rev 164053)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+<html>
+<head>
+<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+<script type="text/javascript" src="../../resources/dump-as-markup.js"></script>
+</head>
+<body>
+<div contenteditable="true" id="test">
+abc<div style="position: fixed; left: 0px; top: 0px;">def</div>ghi
+</div>
+
+<script>
+
+Markup.description('This tests to see if position:sticky and position:fixed don\'t get converted to position:static and position:absolute upon copy/paste when there is only a partial selection (not the entire body is selected)');
+
+if (window.internals)
+ window.internals.settings.setShouldConvertPositionStyleOnCopy(true);
+
+var e = document.getElementById("test");
+var s = window.getSelection();
+
+Markup.dump('test', 'Before');
+s.setPosition(e, 0);
+document.execCommand("SelectAll");
+document.execCommand("Cut");
+document.execCommand("Paste");
+Markup.dump('test', 'After');
+
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164052 => 164053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-13 21:38:05 UTC (rev 164052)
+++ trunk/Source/WebCore/ChangeLog 2014-02-13 21:55:29 UTC (rev 164053)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-02-13 Myles C. Maxfield <mmaxfield@apple.com>
+
+ During a copy, position:fixed gets converted to position:absolute even if only part of the document is selected
+ https://bugs.webkit.org/show_bug.cgi?id=128688
+
+ Reviewed by Ryosuke Niwa.
+
+ Adds a field, m_needsPositionStyleConversion, to StyledMarkupAccumulator.
+
+ Also, renames the ConvertPositionStyleOnCopy setting to ShouldConvertPositionStyleOnCopy
+
+ Test: editing/pasteboard/copy-paste-doesnt-convert-sticky-and-fixed-during-partial-copy.html
+
+ * editing/markup.cpp:
+ (WebCore::StyledMarkupAccumulator::StyledMarkupAccumulator):
+ (WebCore::StyledMarkupAccumulator::appendElement):
+ (WebCore::createMarkupInternal):
+ * page/Settings.in:
+ * testing/InternalSettings.cpp:
+ (WebCore::InternalSettings::Backup::Backup):
+ (WebCore::InternalSettings::Backup::restoreTo):
+ (WebCore::InternalSettings::setShouldConvertPositionStyleOnCopy):
+ * testing/InternalSettings.h:
+ * testing/InternalSettings.idl:
+
</ins><span class="cx"> 2014-02-12 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Enable inspection of recently used IndexedDB databases.
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingmarkupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/markup.cpp (164052 => 164053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/markup.cpp 2014-02-13 21:38:05 UTC (rev 164052)
+++ trunk/Source/WebCore/editing/markup.cpp 2014-02-13 21:55:29 UTC (rev 164053)
</span><span class="lines">@@ -117,17 +117,14 @@
</span><span class="cx"> public:
</span><span class="cx"> enum RangeFullySelectsNode { DoesFullySelectNode, DoesNotFullySelectNode };
</span><span class="cx">
</span><del>- StyledMarkupAccumulator(Vector<Node*>* nodes, EAbsoluteURLs, EAnnotateForInterchange, const Range*, Node* highestNodeToBeSerialized = 0);
</del><ins>+ StyledMarkupAccumulator(Vector<Node*>* nodes, EAbsoluteURLs, EAnnotateForInterchange, const Range*, bool needsPositionStyleConversion, Node* highestNodeToBeSerialized = 0);
</ins><span class="cx">
</span><span class="cx"> Node* serializeNodes(Node* startNode, Node* pastEnd);
</span><span class="cx"> void wrapWithNode(Node&, bool convertBlocksToInlines = false, RangeFullySelectsNode = DoesFullySelectNode);
</span><span class="cx"> void wrapWithStyleNode(StyleProperties*, Document&, bool isBlock = false);
</span><span class="cx"> String takeResults();
</span><span class="cx">
</span><del>- bool needRelativeStyleWrapper() const
- {
- return m_needRelativeStyleWrapper;
- }
</del><ins>+ bool needRelativeStyleWrapper() const { return m_needRelativeStyleWrapper; }
</ins><span class="cx">
</span><span class="cx"> using MarkupAccumulator::appendString;
</span><span class="cx">
</span><span class="lines">@@ -164,13 +161,15 @@
</span><span class="cx"> Node* m_highestNodeToBeSerialized;
</span><span class="cx"> RefPtr<EditingStyle> m_wrappingStyle;
</span><span class="cx"> bool m_needRelativeStyleWrapper;
</span><ins>+ bool m_needsPositionStyleConversion;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-inline StyledMarkupAccumulator::StyledMarkupAccumulator(Vector<Node*>* nodes, EAbsoluteURLs shouldResolveURLs, EAnnotateForInterchange shouldAnnotate, const Range* range, Node* highestNodeToBeSerialized)
</del><ins>+inline StyledMarkupAccumulator::StyledMarkupAccumulator(Vector<Node*>* nodes, EAbsoluteURLs shouldResolveURLs, EAnnotateForInterchange shouldAnnotate, const Range* range, bool needsPositionStyleConversion, Node* highestNodeToBeSerialized)
</ins><span class="cx"> : MarkupAccumulator(nodes, shouldResolveURLs, range)
</span><span class="cx"> , m_shouldAnnotate(shouldAnnotate)
</span><span class="cx"> , m_highestNodeToBeSerialized(highestNodeToBeSerialized)
</span><span class="cx"> , m_needRelativeStyleWrapper(false)
</span><ins>+ , m_needsPositionStyleConversion(needsPositionStyleConversion)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -328,7 +327,7 @@
</span><span class="cx"> if (addDisplayInline)
</span><span class="cx"> newInlineStyle->forceInline();
</span><span class="cx">
</span><del>- if (element.document().settings() && element.document().settings()->convertPositionStyleOnCopy())
</del><ins>+ if (m_needsPositionStyleConversion)
</ins><span class="cx"> m_needRelativeStyleWrapper |= newInlineStyle->convertFixedAndStickyPosition();
</span><span class="cx">
</span><span class="cx"> // If the node is not fully selected by the range, then we don't want to keep styles that affect its relationship to the nodes around it
</span><span class="lines">@@ -571,7 +570,9 @@
</span><span class="cx"> fullySelectedRoot = body;
</span><span class="cx"> Node* specialCommonAncestor = highestAncestorToWrapMarkup(&updatedRange, shouldAnnotate);
</span><span class="cx">
</span><del>- StyledMarkupAccumulator accumulator(nodes, shouldResolveURLs, shouldAnnotate, &updatedRange, specialCommonAncestor);
</del><ins>+ bool needsPositionStyleConversion = body && fullySelectedRoot == body
+ && document.settings() && document.settings()->shouldConvertPositionStyleOnCopy();
+ StyledMarkupAccumulator accumulator(nodes, shouldResolveURLs, shouldAnnotate, &updatedRange, needsPositionStyleConversion, specialCommonAncestor);
</ins><span class="cx"> Node* pastEnd = updatedRange.pastLastNode();
</span><span class="cx">
</span><span class="cx"> Node* startNode = updatedRange.firstNode();
</span><span class="lines">@@ -627,7 +628,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (accumulator.needRelativeStyleWrapper() && body && fullySelectedRoot == body) {
</del><ins>+ if (accumulator.needRelativeStyleWrapper() && needsPositionStyleConversion) {
</ins><span class="cx"> RefPtr<EditingStyle> positionRelativeStyle = styleFromMatchedRulesAndInlineDecl(body);
</span><span class="cx"> positionRelativeStyle->style()->setProperty(CSSPropertyPosition, CSSValueRelative);
</span><span class="cx"> accumulator.wrapWithStyleNode(positionRelativeStyle->style(), document, true);
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.in (164052 => 164053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.in 2014-02-13 21:38:05 UTC (rev 164052)
+++ trunk/Source/WebCore/page/Settings.in 2014-02-13 21:55:29 UTC (rev 164053)
</span><span class="lines">@@ -205,4 +205,4 @@
</span><span class="cx">
</span><span class="cx"> mediaPlaybackAllowsAirPlay initial=true, conditional=IOS_AIRPLAY
</span><span class="cx">
</span><del>-convertPositionStyleOnCopy initial=false
</del><ins>+shouldConvertPositionStyleOnCopy initial=false
</ins></span></pre></div>
<a id="trunkSourceWebCoretestingInternalSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/InternalSettings.cpp (164052 => 164053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/InternalSettings.cpp 2014-02-13 21:38:05 UTC (rev 164052)
+++ trunk/Source/WebCore/testing/InternalSettings.cpp 2014-02-13 21:55:29 UTC (rev 164053)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> , m_useLegacyBackgroundSizeShorthandBehavior(settings.useLegacyBackgroundSizeShorthandBehavior())
</span><span class="cx"> , m_autoscrollForDragAndDropEnabled(settings.autoscrollForDragAndDropEnabled())
</span><span class="cx"> , m_pluginReplacementEnabled(RuntimeEnabledFeatures::sharedFeatures().pluginReplacementEnabled())
</span><del>- , m_convertPositionStyleOnCopy(settings.convertPositionStyleOnCopy())
</del><ins>+ , m_shouldConvertPositionStyleOnCopy(settings.shouldConvertPositionStyleOnCopy())
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> settings.setTimeWithoutMouseMovementBeforeHidingControls(m_originalTimeWithoutMouseMovementBeforeHidingControls);
</span><span class="cx"> settings.setUseLegacyBackgroundSizeShorthandBehavior(m_useLegacyBackgroundSizeShorthandBehavior);
</span><span class="cx"> settings.setAutoscrollForDragAndDropEnabled(m_autoscrollForDragAndDropEnabled);
</span><del>- settings.setConvertPositionStyleOnCopy(m_convertPositionStyleOnCopy);
</del><ins>+ settings.setShouldConvertPositionStyleOnCopy(m_shouldConvertPositionStyleOnCopy);
</ins><span class="cx"> RuntimeEnabledFeatures::sharedFeatures().setPluginReplacementEnabled(m_pluginReplacementEnabled);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -529,10 +529,10 @@
</span><span class="cx"> settings()->setBackgroundShouldExtendBeyondPage(hasExtendedBackground);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InternalSettings::setConvertPositionStyleOnCopy(bool convert, ExceptionCode& ec)
</del><ins>+void InternalSettings::setShouldConvertPositionStyleOnCopy(bool convert, ExceptionCode& ec)
</ins><span class="cx"> {
</span><span class="cx"> InternalSettingsGuardForSettings();
</span><del>- settings()->setConvertPositionStyleOnCopy(convert);
</del><ins>+ settings()->setShouldConvertPositionStyleOnCopy(convert);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalSettingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/InternalSettings.h (164052 => 164053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/InternalSettings.h 2014-02-13 21:38:05 UTC (rev 164052)
+++ trunk/Source/WebCore/testing/InternalSettings.h 2014-02-13 21:55:29 UTC (rev 164053)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> bool m_useLegacyBackgroundSizeShorthandBehavior;
</span><span class="cx"> bool m_autoscrollForDragAndDropEnabled;
</span><span class="cx"> bool m_pluginReplacementEnabled;
</span><del>- bool m_convertPositionStyleOnCopy;
</del><ins>+ bool m_shouldConvertPositionStyleOnCopy;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static PassRefPtr<InternalSettings> create(Page* page)
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> void setFontFallbackPrefersPictographs(bool preferPictographs, ExceptionCode&);
</span><span class="cx"> void setPluginReplacementEnabled(bool);
</span><span class="cx"> void setBackgroundShouldExtendBeyondPage(bool hasExtendedBackground, ExceptionCode&);
</span><del>- void setConvertPositionStyleOnCopy(bool convert, ExceptionCode&);
</del><ins>+ void setShouldConvertPositionStyleOnCopy(bool convert, ExceptionCode&);
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalSettingsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/InternalSettings.idl (164052 => 164053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/InternalSettings.idl 2014-02-13 21:38:05 UTC (rev 164052)
+++ trunk/Source/WebCore/testing/InternalSettings.idl 2014-02-13 21:55:29 UTC (rev 164053)
</span><span class="lines">@@ -60,5 +60,5 @@
</span><span class="cx"> [RaisesException] void setFontFallbackPrefersPictographs(boolean preferPictographs);
</span><span class="cx"> void setPluginReplacementEnabled(boolean enabled);
</span><span class="cx"> [RaisesException] void setBackgroundShouldExtendBeyondPage(boolean hasExtendedBackground);
</span><del>- [RaisesException] void setConvertPositionStyleOnCopy(boolean convert);
</del><ins>+ [RaisesException] void setShouldConvertPositionStyleOnCopy(boolean convert);
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (164052 => 164053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-02-13 21:38:05 UTC (rev 164052)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-02-13 21:55:29 UTC (rev 164053)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-02-13 Myles C. Maxfield <mmaxfield@apple.com>
+
+ During a copy, position:fixed gets converted to position:absolute even if only part of the document is selected
+ https://bugs.webkit.org/show_bug.cgi?id=128688
+
+ Reviewed by Ryosuke Niwa.
+
+ Renames the ConvertPositionStyleOnCopy setting to ShouldConvertPositionStyleOnCopy
+
+ * WebView/WebPreferenceKeysPrivate.h:
+ * WebView/WebPreferences.mm:
+ (-[WebPreferences shouldConvertPositionStyleOnCopy]):
+ (-[WebPreferences setShouldConvertPositionStyleOnCopy:]):
+ * WebView/WebPreferencesPrivate.h:
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]):
+
</ins><span class="cx"> 2014-02-13 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Add a WebKit1 SPI to get WebCrypto master key from a client
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (164052 => 164053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2014-02-13 21:38:05 UTC (rev 164052)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2014-02-13 21:55:29 UTC (rev 164053)
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> #define WebKitLowPowerVideoAudioBufferSizeEnabledPreferenceKey @"WebKitLowPowerVideoAudioBufferSizeEnabled"
</span><span class="cx"> #define WebKitUseLegacyTextAlignPositionedElementBehaviorPreferenceKey @"WebKitUseLegacyTextAlignPositionedElementBehavior"
</span><span class="cx"> #define WebKitMediaSourceEnabledPreferenceKey @"WebKitMediaSourceEnabled"
</span><del>-#define WebKitConvertPositionStyleOnCopyPreferenceKey @"WebKitConvertPositionStyleOnCopy"
</del><ins>+#define WebKitShouldConvertPositionStyleOnCopyPreferenceKey @"WebKitShouldConvertPositionStyleOnCopy"
</ins><span class="cx">
</span><span class="cx"> #if !TARGET_OS_IPHONE
</span><span class="cx"> // These are private both because callers should be using the cover methods and because the
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (164052 => 164053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2014-02-13 21:38:05 UTC (rev 164052)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2014-02-13 21:55:29 UTC (rev 164053)
</span><span class="lines">@@ -2535,14 +2535,14 @@
</span><span class="cx"> [self _setBoolValue:enabled forKey:WebKitMediaSourceEnabledPreferenceKey];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (BOOL)convertPositionStyleOnCopy
</del><ins>+- (BOOL)shouldConvertPositionStyleOnCopy
</ins><span class="cx"> {
</span><del>- return [self _boolValueForKey:WebKitConvertPositionStyleOnCopyPreferenceKey];
</del><ins>+ return [self _boolValueForKey:WebKitShouldConvertPositionStyleOnCopyPreferenceKey];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)setConvertPositionStyleOnCopy:(BOOL)enabled
</del><ins>+- (void)setShouldConvertPositionStyleOnCopy:(BOOL)enabled
</ins><span class="cx"> {
</span><del>- [self _setBoolValue:enabled forKey:WebKitConvertPositionStyleOnCopyPreferenceKey];
</del><ins>+ [self _setBoolValue:enabled forKey:WebKitShouldConvertPositionStyleOnCopyPreferenceKey];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (164052 => 164053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2014-02-13 21:38:05 UTC (rev 164052)
+++ trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2014-02-13 21:55:29 UTC (rev 164053)
</span><span class="lines">@@ -432,7 +432,7 @@
</span><span class="cx"> - (void)setMediaSourceEnabled:(BOOL)flag;
</span><span class="cx"> - (BOOL)mediaSourceEnabled;
</span><span class="cx">
</span><del>-- (void)setConvertPositionStyleOnCopy:(BOOL)flag;
-- (BOOL)convertPositionStyleOnCopy;
</del><ins>+- (void)setShouldConvertPositionStyleOnCopy:(BOOL)flag;
+- (BOOL)shouldConvertPositionStyleOnCopy;
</ins><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (164052 => 164053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-02-13 21:38:05 UTC (rev 164052)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-02-13 21:55:29 UTC (rev 164053)
</span><span class="lines">@@ -2382,7 +2382,7 @@
</span><span class="cx"> settings.setMediaSourceEnabled([preferences mediaSourceEnabled]);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- settings.setConvertPositionStyleOnCopy([preferences convertPositionStyleOnCopy]);
</del><ins>+ settings.setShouldConvertPositionStyleOnCopy([preferences shouldConvertPositionStyleOnCopy]);
</ins><span class="cx">
</span><span class="cx"> switch ([preferences storageBlockingPolicy]) {
</span><span class="cx"> case WebAllowAllStorage:
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (164052 => 164053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-13 21:38:05 UTC (rev 164052)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-13 21:55:29 UTC (rev 164053)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-02-13 Myles C. Maxfield <mmaxfield@apple.com>
+
+ During a copy, position:fixed gets converted to position:absolute even if only part of the document is selected
+ https://bugs.webkit.org/show_bug.cgi?id=128688
+
+ Reviewed by Ryosuke Niwa.
+
+ Renames the ConvertPositionStyleOnCopy setting to ShouldConvertPositionStyleOnCopy
+
+ * Shared/WebPreferencesStore.h:
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesSetShouldConvertPositionStyleOnCopy):
+ (WKPreferencesGetShouldConvertPositionStyleOnCopy):
+ * UIProcess/API/C/WKPreferencesPrivate.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+
</ins><span class="cx"> 2014-02-12 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Enable inspection of recently used IndexedDB databases.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesStore.h (164052 => 164053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2014-02-13 21:38:05 UTC (rev 164052)
+++ trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2014-02-13 21:55:29 UTC (rev 164053)
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx"> macro(SpatialNavigationEnabled, spatialNavigationEnabled, Bool, bool, false) \
</span><span class="cx"> macro(MediaSourceEnabled, mediaSourceEnabled, Bool, bool, false) \
</span><span class="cx"> macro(ViewGestureDebuggingEnabled, viewGestureDebuggingEnabled, Bool, bool, false) \
</span><del>- macro(ConvertPositionStyleOnCopy, convertPositionStyleOnCopy, Bool, bool, false) \
</del><ins>+ macro(ShouldConvertPositionStyleOnCopy, shouldConvertPositionStyleOnCopy, Bool, bool, false) \
</ins><span class="cx"> \
</span><span class="cx">
</span><span class="cx"> #define FOR_EACH_WEBKIT_DOUBLE_PREFERENCE(macro) \
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (164052 => 164053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2014-02-13 21:38:05 UTC (rev 164052)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2014-02-13 21:55:29 UTC (rev 164053)
</span><span class="lines">@@ -1236,12 +1236,12 @@
</span><span class="cx"> return toImpl(preferencesRef)->viewGestureDebuggingEnabled();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKPreferencesSetConvertPositionStyleOnCopy(WKPreferencesRef preferencesRef, bool convert)
</del><ins>+void WKPreferencesSetShouldConvertPositionStyleOnCopy(WKPreferencesRef preferencesRef, bool convert)
</ins><span class="cx"> {
</span><del>- toImpl(preferencesRef)->setConvertPositionStyleOnCopy(convert);
</del><ins>+ toImpl(preferencesRef)->setShouldConvertPositionStyleOnCopy(convert);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool WKPreferencesGetConvertPositionStyleOnCopy(WKPreferencesRef preferencesRef)
</del><ins>+bool WKPreferencesGetShouldConvertPositionStyleOnCopy(WKPreferencesRef preferencesRef)
</ins><span class="cx"> {
</span><del>- return toImpl(preferencesRef)->convertPositionStyleOnCopy();
</del><ins>+ return toImpl(preferencesRef)->shouldConvertPositionStyleOnCopy();
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h (164052 => 164053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h 2014-02-13 21:38:05 UTC (rev 164052)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h 2014-02-13 21:55:29 UTC (rev 164053)
</span><span class="lines">@@ -315,8 +315,8 @@
</span><span class="cx"> WK_EXPORT bool WKPreferencesGetViewGestureDebuggingEnabled(WKPreferencesRef preferencesRef);
</span><span class="cx">
</span><span class="cx"> // Default to false.
</span><del>-WK_EXPORT void WKPreferencesSetConvertPositionStyleOnCopy(WKPreferencesRef preferencesRef, bool convert);
-WK_EXPORT bool WKPreferencesGetConvertPositionStyleOnCopy(WKPreferencesRef preferencesRef);
</del><ins>+WK_EXPORT void WKPreferencesSetShouldConvertPositionStyleOnCopy(WKPreferencesRef preferencesRef, bool convert);
+WK_EXPORT bool WKPreferencesGetShouldConvertPositionStyleOnCopy(WKPreferencesRef preferencesRef);
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (164052 => 164053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-02-13 21:38:05 UTC (rev 164052)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-02-13 21:55:29 UTC (rev 164053)
</span><span class="lines">@@ -2575,7 +2575,7 @@
</span><span class="cx"> settings.setMediaSourceEnabled(store.getBoolValueForKey(WebPreferencesKey::mediaSourceEnabledKey()));
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- settings.setConvertPositionStyleOnCopy(store.getBoolValueForKey(WebPreferencesKey::convertPositionStyleOnCopyKey()));
</del><ins>+ settings.setShouldConvertPositionStyleOnCopy(store.getBoolValueForKey(WebPreferencesKey::shouldConvertPositionStyleOnCopyKey()));
</ins><span class="cx">
</span><span class="cx"> if (store.getBoolValueForKey(WebPreferencesKey::pageVisibilityBasedProcessSuppressionEnabledKey())) {
</span><span class="cx"> if (m_processSuppressionDisabledByWebPreference.isActive())
</span></span></pre>
</div>
</div>
</body>
</html>