Diff
Modified: trunk/LayoutTests/ChangeLog (211091 => 211092)
--- trunk/LayoutTests/ChangeLog 2017-01-24 18:57:36 UTC (rev 211091)
+++ trunk/LayoutTests/ChangeLog 2017-01-24 19:08:42 UTC (rev 211092)
@@ -1,3 +1,14 @@
+2017-01-24 Joseph Pecoraro <[email protected]>
+
+ Remove always true selectionIncludesAltImageText setting
+ https://bugs.webkit.org/show_bug.cgi?id=167358
+
+ Reviewed by Alex Christensen.
+
+ * editing/pasteboard/copy-image-with-alt-text-expected.txt:
+ * editing/pasteboard/copy-image-with-alt-text.html:
+ * platform/efl/TestExpectations:
+
2017-01-24 Ryan Haddad <[email protected]>
Marking media/modern-media-controls/media-controller/media-controller-resize.html as flaky on macOS WK1.
Modified: trunk/LayoutTests/editing/pasteboard/copy-image-with-alt-text-expected.txt (211091 => 211092)
--- trunk/LayoutTests/editing/pasteboard/copy-image-with-alt-text-expected.txt 2017-01-24 18:57:36 UTC (rev 211091)
+++ trunk/LayoutTests/editing/pasteboard/copy-image-with-alt-text-expected.txt 2017-01-24 19:08:42 UTC (rev 211092)
@@ -4,27 +4,12 @@
| <shadow:root>
| <div>
| contenteditable="plaintext-only"
-| "Here is an emoticon [], some more text [], an empty alt tag [], no alt tag [] and two consecutive images [].
+| "Here is an emoticon [:)], some more text [sample text], an empty alt tag [], no alt tag [] and two consecutive images [firstsecond].
"
Dump of markup 2:
| <div>
-| "Here is an emoticon [], some more text [], an empty alt tag [], no alt tag [] and two consecutive images []."
-| <div>
-| <#selection-caret>
-| <br>
-
-Dump of markup 3:
-| <shadow:root>
-| <div>
-| contenteditable="plaintext-only"
-| "Here is an emoticon [:)], some more text [sample text], an empty alt tag [], no alt tag [] and two consecutive images [firstsecond].
-
-"
-
-Dump of markup 4:
-| <div>
| "Here is an emoticon [:)], some more text [sample text], an empty alt tag [], no alt tag [] and two consecutive images [firstsecond]."
| <div>
| <#selection-caret>
Modified: trunk/LayoutTests/editing/pasteboard/copy-image-with-alt-text.html (211091 => 211092)
--- trunk/LayoutTests/editing/pasteboard/copy-image-with-alt-text.html 2017-01-24 18:57:36 UTC (rev 211091)
+++ trunk/LayoutTests/editing/pasteboard/copy-image-with-alt-text.html 2017-01-24 19:08:42 UTC (rev 211092)
@@ -27,16 +27,10 @@
window._onload_ = function()
{
- if (window.internals)
- internals.settings.setSelectionIncludesAltImageText(false);
-
if (window.testRunner)
testRunner.dumpAsText();
runTest();
- if (window.internals)
- internals.settings.setSelectionIncludesAltImageText(true);
- runTest();
Markup.notifyDone();
};
Modified: trunk/LayoutTests/platform/efl/TestExpectations (211091 => 211092)
--- trunk/LayoutTests/platform/efl/TestExpectations 2017-01-24 18:57:36 UTC (rev 211091)
+++ trunk/LayoutTests/platform/efl/TestExpectations 2017-01-24 19:08:42 UTC (rev 211092)
@@ -1652,7 +1652,6 @@
Bug(EFL) editing/pasteboard/contenteditable-pre-2.html [ Failure ]
Bug(EFL) editing/pasteboard/contenteditable-pre.html [ Failure ]
Bug(EFL) editing/pasteboard/copy-backslash-with-euc.html [ Failure ]
-Bug(EFL) editing/pasteboard/copy-image-with-alt-text.html [ Failure ]
Bug(EFL) editing/pasteboard/copy-in-password-field.html [ Failure ]
Bug(EFL) editing/pasteboard/copy-inside-h1-preserves-h1.html [ Failure ]
Bug(EFL) editing/pasteboard/copy-null-characters.html [ Failure ]
Modified: trunk/Source/WebCore/ChangeLog (211091 => 211092)
--- trunk/Source/WebCore/ChangeLog 2017-01-24 18:57:36 UTC (rev 211091)
+++ trunk/Source/WebCore/ChangeLog 2017-01-24 19:08:42 UTC (rev 211092)
@@ -1,3 +1,14 @@
+2017-01-24 Joseph Pecoraro <[email protected]>
+
+ Remove always true selectionIncludesAltImageText setting
+ https://bugs.webkit.org/show_bug.cgi?id=167358
+
+ Reviewed by Alex Christensen.
+
+ * editing/Editor.cpp:
+ (WebCore::Editor::selectedTextForDataTransfer):
+ * page/Settings.in:
+
2017-01-24 Daniel Bates <[email protected]>
StringView.split() should use an iterator design pattern instead of allocating a Vector
Modified: trunk/Source/WebCore/editing/Editor.cpp (211091 => 211092)
--- trunk/Source/WebCore/editing/Editor.cpp 2017-01-24 18:57:36 UTC (rev 211091)
+++ trunk/Source/WebCore/editing/Editor.cpp 2017-01-24 19:08:42 UTC (rev 211092)
@@ -2943,9 +2943,7 @@
String Editor::selectedTextForDataTransfer() const
{
- if (m_frame.settings().selectionIncludesAltImageText())
- return selectedText(TextIteratorEmitsImageAltText);
- return selectedText();
+ return selectedText(TextIteratorEmitsImageAltText);
}
String Editor::selectedText(TextIteratorBehavior behavior) const
Modified: trunk/Source/WebCore/page/Settings.in (211091 => 211092)
--- trunk/Source/WebCore/page/Settings.in 2017-01-24 18:57:36 UTC (rev 211091)
+++ trunk/Source/WebCore/page/Settings.in 2017-01-24 19:08:42 UTC (rev 211092)
@@ -193,7 +193,6 @@
smartInsertDeleteEnabled initial=defaultSmartInsertDeleteEnabled
selectTrailingWhitespaceEnabled initial=defaultSelectTrailingWhitespaceEnabled
-selectionIncludesAltImageText initial=true
useLegacyBackgroundSizeShorthandBehavior initial=false
fixedBackgroundsPaintRelativeToDocument initial=defaultFixedBackgroundsPaintRelativeToDocument
