Diff
Modified: trunk/LayoutTests/ChangeLog (211117 => 211118)
--- trunk/LayoutTests/ChangeLog 2017-01-24 23:29:33 UTC (rev 211117)
+++ trunk/LayoutTests/ChangeLog 2017-01-24 23:49:34 UTC (rev 211118)
@@ -1,3 +1,17 @@
+2017-01-24 Joseph Pecoraro <[email protected]>
+
+ Remove always true unsafePluginPastingEnabled setting
+ https://bugs.webkit.org/show_bug.cgi?id=167360
+
+ Reviewed by Andreas Kling.
+
+ * editing/pasteboard/paste-noplugin-expected.txt: Removed.
+ * editing/pasteboard/paste-noplugin-xhtml-expected.txt: Removed.
+ * editing/pasteboard/paste-noplugin-xhtml.xhtml: Removed.
+ * editing/pasteboard/paste-noplugin.html: Removed.
+ * platform/efl/TestExpectations:
+ * platform/wk2/TestExpectations:
+
2017-01-24 Zalan Bujtas <[email protected]>
Simple line layout: Add support for hyphen: auto.
Deleted: trunk/LayoutTests/editing/pasteboard/paste-noplugin-expected.txt (211117 => 211118)
--- trunk/LayoutTests/editing/pasteboard/paste-noplugin-expected.txt 2017-01-24 23:29:33 UTC (rev 211117)
+++ trunk/LayoutTests/editing/pasteboard/paste-noplugin-expected.txt 2017-01-24 23:49:34 UTC (rev 211118)
@@ -1,27 +0,0 @@
-This test copies embed and object elements, pastes them into an editable area, and verifies that unsafe tags are not pasted when the setting prohibits this.
-
-Original contents:
-| "
-"
-| <p>
-| "Some text to paste."
-| "
-"
-| <embed>
-| src=""
-| "
-"
-| <object>
-| data=""
-| <param>
-| name="src"
-| value="http://localhost:8000/evil.swf"
-| <embed>
-| src=""
-| "
-"
-
-Pasted contents:
-| <p>
-| "Some text to paste."
-| " <#selection-caret>"
Deleted: trunk/LayoutTests/editing/pasteboard/paste-noplugin-xhtml-expected.txt (211117 => 211118)
--- trunk/LayoutTests/editing/pasteboard/paste-noplugin-xhtml-expected.txt 2017-01-24 23:29:33 UTC (rev 211117)
+++ trunk/LayoutTests/editing/pasteboard/paste-noplugin-xhtml-expected.txt 2017-01-24 23:49:34 UTC (rev 211118)
@@ -1,27 +0,0 @@
-This test copies embed and object elements, pastes them into an editable area, and verifies that unsafe tags are not pasted when the setting prohibits this.
-
-Original contents:
-| "
-"
-| <p>
-| "Some text to paste."
-| "
-"
-| <embed>
-| src=""
-| "
-"
-| <object>
-| data=""
-| <param>
-| name="src"
-| value="http://localhost:8000/evil.swf"
-| <embed>
-| src=""
-| "
-"
-
-Pasted contents:
-| <p>
-| "Some text to paste."
-| " <#selection-caret>"
Deleted: trunk/LayoutTests/editing/pasteboard/paste-noplugin-xhtml.xhtml (211117 => 211118)
--- trunk/LayoutTests/editing/pasteboard/paste-noplugin-xhtml.xhtml 2017-01-24 23:29:33 UTC (rev 211117)
+++ trunk/LayoutTests/editing/pasteboard/paste-noplugin-xhtml.xhtml 2017-01-24 23:49:34 UTC (rev 211118)
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- if (testRunner.setBlockAllPlugins)
- testRunner.setBlockAllPlugins(true);
- internals.settings.setUnsafePluginPastingEnabled(false);
-}
-</script>
-<script src=""
-<body>
-<div id="source">
-<p>Some text to paste.</p>
-<embed src=""
-<object data="" name="src" value="http://localhost:8000/evil.swf"/><embed src=""
-</div>
-<div id="destination" contenteditable="true"></div>
-<ul id="console"></ul>
-<script>
-var source = document.getElementById("source");
-var destination = document.getElementById("destination");
-var selection = window.getSelection();
-selection.setBaseAndExtent(source, 0, source, 5);
-document.execCommand("Copy");
-selection.setPosition(destination, 0);
-document.execCommand("Paste");
-Markup.description("This test copies embed and object elements, pastes them into an editable area, and verifies that unsafe tags are not pasted when the setting prohibits this.");
-Markup.dump("source", "Original contents");
-Markup.dump("destination", "Pasted contents");
-</script>
-</body>
-</html>
Deleted: trunk/LayoutTests/editing/pasteboard/paste-noplugin.html (211117 => 211118)
--- trunk/LayoutTests/editing/pasteboard/paste-noplugin.html 2017-01-24 23:29:33 UTC (rev 211117)
+++ trunk/LayoutTests/editing/pasteboard/paste-noplugin.html 2017-01-24 23:49:34 UTC (rev 211118)
@@ -1,29 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- internals.settings.setUnsafePluginPastingEnabled(false);
-}
-</script>
-<script src=""
-<div id="source">
-<p>Some text to paste.</p>
-<embed src=""
-<object data="" name="src" value="http://localhost:8000/evil.swf"><embed src=""
-</div>
-<div id="destination" contenteditable="true"></div>
-<ul id="console"></ul>
-<script>
-var source = document.getElementById("source");
-var destination = document.getElementById("destination");
-var selection = window.getSelection();
-selection.setBaseAndExtent(source, 0, source, 5);
-document.execCommand("Copy");
-selection.setPosition(destination, 0);
-document.execCommand("Paste");
-Markup.description("This test copies embed and object elements, pastes them into an editable area, and verifies that unsafe tags are not pasted when the setting prohibits this.");
-Markup.dump("source", "Original contents");
-Markup.dump("destination", "Pasted contents");
-</script>
-</html>
Modified: trunk/LayoutTests/platform/efl/TestExpectations (211117 => 211118)
--- trunk/LayoutTests/platform/efl/TestExpectations 2017-01-24 23:29:33 UTC (rev 211117)
+++ trunk/LayoutTests/platform/efl/TestExpectations 2017-01-24 23:49:34 UTC (rev 211118)
@@ -1713,7 +1713,6 @@
Bug(EFL) editing/pasteboard/paste-list-002.html [ Failure ]
Bug(EFL) editing/pasteboard/paste-list-003.html [ Failure ]
Bug(EFL) editing/pasteboard/paste-list-004.html [ Failure ]
-Bug(EFL) editing/pasteboard/paste-noplugin-xhtml.xhtml [ Failure ]
Bug(EFL) editing/pasteboard/paste-noscript-svg.html [ Failure ]
Bug(EFL) editing/pasteboard/paste-noscript-xhtml.xhtml [ Failure ]
Bug(EFL) editing/pasteboard/paste-noscript.html [ Failure ]
Modified: trunk/LayoutTests/platform/wk2/TestExpectations (211117 => 211118)
--- trunk/LayoutTests/platform/wk2/TestExpectations 2017-01-24 23:29:33 UTC (rev 211117)
+++ trunk/LayoutTests/platform/wk2/TestExpectations 2017-01-24 23:49:34 UTC (rev 211118)
@@ -305,7 +305,6 @@
# These tests use Flash, which is not a good idea, because it is not installed on all machines that run tests.
# WebKitTestRunner detects attempts to use Flash, and raises an assertion.
-editing/pasteboard/paste-noplugin.html [ Skip ]
fast/dom/beforeload/flash-before-load.html [ Skip ]
fast/dom/beforeload/remove-flash-in-beforeload-listener.html [ Skip ]
fast/loader/sandboxed-plugin-crash.html [ Skip ]
Modified: trunk/Source/WebCore/ChangeLog (211117 => 211118)
--- trunk/Source/WebCore/ChangeLog 2017-01-24 23:29:33 UTC (rev 211117)
+++ trunk/Source/WebCore/ChangeLog 2017-01-24 23:49:34 UTC (rev 211118)
@@ -1,3 +1,16 @@
+2017-01-24 Joseph Pecoraro <[email protected]>
+
+ Remove always true unsafePluginPastingEnabled setting
+ https://bugs.webkit.org/show_bug.cgi?id=167360
+
+ Reviewed by Andreas Kling.
+
+ Setting added by Chromium and never used by other ports.
+
+ * dom/ScriptableDocumentParser.cpp:
+ (WebCore::ScriptableDocumentParser::ScriptableDocumentParser):
+ * page/Settings.in:
+
2017-01-24 Anders Carlsson <[email protected]>
When Safari reloads pages with Flash objects after Flash is installed, placeholders don't paint (but do work!)
Modified: trunk/Source/WebCore/dom/ScriptableDocumentParser.cpp (211117 => 211118)
--- trunk/Source/WebCore/dom/ScriptableDocumentParser.cpp 2017-01-24 23:29:33 UTC (rev 211117)
+++ trunk/Source/WebCore/dom/ScriptableDocumentParser.cpp 2017-01-24 23:49:34 UTC (rev 211118)
@@ -27,8 +27,6 @@
#include "ScriptableDocumentParser.h"
#include "Document.h"
-#include "Frame.h"
-#include "ScriptController.h"
#include "Settings.h"
namespace WebCore {
@@ -38,7 +36,7 @@
, m_wasCreatedByScript(false)
, m_parserContentPolicy(parserContentPolicy)
{
- if (!pluginContentIsAllowed(m_parserContentPolicy) && (!document.settings() || document.settings()->unsafePluginPastingEnabled()))
+ if (!pluginContentIsAllowed(m_parserContentPolicy))
m_parserContentPolicy = allowPluginContent(m_parserContentPolicy);
if (scriptingContentIsAllowed(m_parserContentPolicy) && (document.settings() && !document.settings()->scriptMarkupEnabled()))
Modified: trunk/Source/WebCore/page/Settings.in (211117 => 211118)
--- trunk/Source/WebCore/page/Settings.in 2017-01-24 23:29:33 UTC (rev 211117)
+++ trunk/Source/WebCore/page/Settings.in 2017-01-24 23:49:34 UTC (rev 211118)
@@ -98,7 +98,6 @@
downloadableBinaryFontsEnabled initial=true
xssAuditorEnabled initial=false
-unsafePluginPastingEnabled initial=true
acceleratedCompositingForFixedPositionEnabled initial=defaultAcceleratedCompositingForFixedPositionEnabled
acceleratedCompositingForOverflowScrollEnabled initial=false
rubberBandingForSubScrollableRegionsEnabled initial=true, conditional=RUBBER_BANDING