Diff
Modified: trunk/ChangeLog (271704 => 271705)
--- trunk/ChangeLog 2021-01-21 19:40:38 UTC (rev 271704)
+++ trunk/ChangeLog 2021-01-21 19:50:07 UTC (rev 271705)
@@ -1,3 +1,13 @@
+2021-01-21 Fujii Hironori <hironori.fu...@sony.com>
+
+ Remove ENABLE_USERSELECT_ALL macro which is enabled for all ports
+ https://bugs.webkit.org/show_bug.cgi?id=100424
+
+ Reviewed by Don Olmstead.
+
+ * Source/cmake/OptionsMac.cmake:
+ * Source/cmake/WebKitFeatures.cmake:
+
2021-01-20 Yusuke Suzuki <ysuz...@apple.com>
Unreviewed, ANGLE should not be built in JSCOnly port
Modified: trunk/Source/WTF/ChangeLog (271704 => 271705)
--- trunk/Source/WTF/ChangeLog 2021-01-21 19:40:38 UTC (rev 271704)
+++ trunk/Source/WTF/ChangeLog 2021-01-21 19:50:07 UTC (rev 271705)
@@ -1,3 +1,12 @@
+2021-01-21 Fujii Hironori <hironori.fu...@sony.com>
+
+ Remove ENABLE_USERSELECT_ALL macro which is enabled for all ports
+ https://bugs.webkit.org/show_bug.cgi?id=100424
+
+ Reviewed by Don Olmstead.
+
+ * wtf/PlatformEnableCocoa.h:
+
2021-01-21 Sam Weinig <wei...@apple.com>
Add experimental support for separated layers
Modified: trunk/Source/WTF/wtf/PlatformEnableCocoa.h (271704 => 271705)
--- trunk/Source/WTF/wtf/PlatformEnableCocoa.h 2021-01-21 19:40:38 UTC (rev 271704)
+++ trunk/Source/WTF/wtf/PlatformEnableCocoa.h 2021-01-21 19:50:07 UTC (rev 271705)
@@ -530,10 +530,6 @@
#define ENABLE_UI_SIDE_COMPOSITING 1
#endif
-#if !defined(ENABLE_USERSELECT_ALL)
-#define ENABLE_USERSELECT_ALL 1
-#endif
-
#if !defined(ENABLE_USER_MESSAGE_HANDLERS)
#define ENABLE_USER_MESSAGE_HANDLERS 1
#endif
Modified: trunk/Source/WebCore/ChangeLog (271704 => 271705)
--- trunk/Source/WebCore/ChangeLog 2021-01-21 19:40:38 UTC (rev 271704)
+++ trunk/Source/WebCore/ChangeLog 2021-01-21 19:50:07 UTC (rev 271705)
@@ -1,3 +1,30 @@
+2021-01-21 Fujii Hironori <hironori.fu...@sony.com>
+
+ Remove ENABLE_USERSELECT_ALL macro which is enabled for all ports
+ https://bugs.webkit.org/show_bug.cgi?id=100424
+
+ Reviewed by Don Olmstead.
+
+ * dom/Node.cpp:
+ (WebCore::computeEditabilityFromComputedStyle):
+ * dom/Position.cpp:
+ (WebCore::Position::rootUserSelectAllForNode):
+ * dom/Position.h:
+ (WebCore::Position::nodeIsUserSelectAll): Deleted.
+ (WebCore::Position::rootUserSelectAllForNode): Deleted.
+ * editing/FrameSelection.cpp:
+ (WebCore::adjustPositionForUserSelectAll):
+ (WebCore::FrameSelection::modifyExtendingRight):
+ (WebCore::FrameSelection::modifyExtendingForward):
+ (WebCore::FrameSelection::modifyExtendingLeft):
+ (WebCore::FrameSelection::modifyExtendingBackward):
+ * editing/VisibleUnits.cpp:
+ (WebCore::findStartOfParagraph):
+ (WebCore::findEndOfParagraph):
+ * page/EventHandler.cpp:
+ (WebCore::nodeToSelectOnMouseDownForNode):
+ (WebCore::EventHandler::updateSelectionForMouseDrag):
+
2021-01-21 Devin Rousso <drou...@apple.com>
[Payment Request] increment the current version
Modified: trunk/Source/WebCore/dom/Node.cpp (271704 => 271705)
--- trunk/Source/WebCore/dom/Node.cpp 2021-01-21 19:40:38 UTC (rev 271704)
+++ trunk/Source/WebCore/dom/Node.cpp 2021-01-21 19:50:07 UTC (rev 271705)
@@ -760,14 +760,10 @@
continue;
if (style->display() == DisplayType::None)
continue;
-#if ENABLE(USERSELECT_ALL)
// Elements with user-select: all style are considered atomic
// therefore non editable.
if (treatment == Node::UserSelectAllIsAlwaysNonEditable && style->userSelect() == UserSelect::All)
return Node::Editability::ReadOnly;
-#else
- UNUSED_PARAM(treatment);
-#endif
switch (style->userModify()) {
case UserModify::ReadOnly:
return Node::Editability::ReadOnly;
Modified: trunk/Source/WebCore/dom/Position.cpp (271704 => 271705)
--- trunk/Source/WebCore/dom/Position.cpp 2021-01-21 19:40:38 UTC (rev 271704)
+++ trunk/Source/WebCore/dom/Position.cpp 2021-01-21 19:50:07 UTC (rev 271705)
@@ -931,7 +931,6 @@
return node && node->renderer() && node->renderer()->style().userSelect() == UserSelect::None;
}
-#if ENABLE(USERSELECT_ALL)
bool Position::nodeIsUserSelectAll(const Node* node)
{
return node && node->renderer() && node->renderer()->style().userSelect() == UserSelect::All;
@@ -958,7 +957,6 @@
}
return candidateRoot;
}
-#endif
bool Position::isCandidate() const
{
Modified: trunk/Source/WebCore/dom/Position.h (271704 => 271705)
--- trunk/Source/WebCore/dom/Position.h 2021-01-21 19:40:38 UTC (rev 271704)
+++ trunk/Source/WebCore/dom/Position.h 2021-01-21 19:50:07 UTC (rev 271705)
@@ -179,13 +179,8 @@
static bool hasRenderedNonAnonymousDescendantsWithHeight(const RenderElement&);
static bool nodeIsUserSelectNone(Node*);
-#if ENABLE(USERSELECT_ALL)
static bool nodeIsUserSelectAll(const Node*);
static Node* rootUserSelectAllForNode(Node*);
-#else
- static bool nodeIsUserSelectAll(const Node*) { return false; }
- static Node* rootUserSelectAllForNode(Node*) { return 0; }
-#endif
void debugPosition(const char* msg = "") const;
Modified: trunk/Source/WebCore/editing/FrameSelection.cpp (271704 => 271705)
--- trunk/Source/WebCore/editing/FrameSelection.cpp 2021-01-21 19:40:38 UTC (rev 271704)
+++ trunk/Source/WebCore/editing/FrameSelection.cpp 2021-01-21 19:50:07 UTC (rev 271705)
@@ -737,13 +737,11 @@
return positionAfterCurrentWord;
}
-#if ENABLE(USERSELECT_ALL)
static void adjustPositionForUserSelectAll(VisiblePosition& pos, bool isForward)
{
if (Node* rootUserSelectAll = Position::rootUserSelectAllForNode(pos.deepEquivalent().anchorNode()))
pos = isForward ? positionAfterNode(rootUserSelectAll).downstream(CanCrossEditingBoundary) : positionBeforeNode(rootUserSelectAll).upstream(CanCrossEditingBoundary);
}
-#endif
VisiblePosition FrameSelection::modifyExtendingRight(TextGranularity granularity)
{
@@ -786,9 +784,7 @@
ASSERT_NOT_REACHED();
break;
}
-#if ENABLE(USERSELECT_ALL)
adjustPositionForUserSelectAll(pos, directionOfEnclosingBlock() == TextDirection::LTR);
-#endif
return pos;
}
@@ -831,9 +827,7 @@
pos = endOfDocument(pos);
break;
}
-#if ENABLE(USERSELECT_ALL)
adjustPositionForUserSelectAll(pos, directionOfEnclosingBlock() == TextDirection::LTR);
-#endif
return pos;
}
@@ -1002,9 +996,7 @@
ASSERT_NOT_REACHED();
break;
}
-#if ENABLE(USERSELECT_ALL)
adjustPositionForUserSelectAll(pos, !(directionOfEnclosingBlock() == TextDirection::LTR));
-#endif
return pos;
}
@@ -1052,9 +1044,7 @@
ASSERT_NOT_REACHED();
break;
}
-#if ENABLE(USERSELECT_ALL)
adjustPositionForUserSelectAll(pos, !(directionOfEnclosingBlock() == TextDirection::LTR));
-#endif
return pos;
}
Modified: trunk/Source/WebCore/editing/VisibleUnits.cpp (271704 => 271705)
--- trunk/Source/WebCore/editing/VisibleUnits.cpp 2021-01-21 19:40:38 UTC (rev 271704)
+++ trunk/Source/WebCore/editing/VisibleUnits.cpp 2021-01-21 19:50:07 UTC (rev 271705)
@@ -1110,11 +1110,7 @@
Node* node = startNode;
Node* n = startNode;
while (n) {
-#if ENABLE(USERSELECT_ALL)
if (boundaryCrossingRule == CannotCrossEditingBoundary && !Position::nodeIsUserSelectAll(n) && n->hasEditableStyle() != startNode->hasEditableStyle())
-#else
- if (boundaryCrossingRule == CannotCrossEditingBoundary && n->hasEditableStyle() != startNode->hasEditableStyle())
-#endif
break;
if (boundaryCrossingRule == CanSkipOverEditingBoundary) {
while (n && n->hasEditableStyle() != startNode->hasEditableStyle())
@@ -1171,11 +1167,7 @@
Node* node = startNode;
Node* n = startNode;
while (n) {
-#if ENABLE(USERSELECT_ALL)
if (boundaryCrossingRule == CannotCrossEditingBoundary && !Position::nodeIsUserSelectAll(n) && n->hasEditableStyle() != startNode->hasEditableStyle())
-#else
- if (boundaryCrossingRule == CannotCrossEditingBoundary && n->hasEditableStyle() != startNode->hasEditableStyle())
-#endif
break;
if (boundaryCrossingRule == CanSkipOverEditingBoundary) {
while (n && n->hasEditableStyle() != startNode->hasEditableStyle())
Modified: trunk/Source/WebCore/page/EventHandler.cpp (271704 => 271705)
--- trunk/Source/WebCore/page/EventHandler.cpp 2021-01-21 19:40:38 UTC (rev 271704)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2021-01-21 19:50:07 UTC (rev 271705)
@@ -428,10 +428,8 @@
static Node* nodeToSelectOnMouseDownForNode(Node& targetNode)
{
-#if ENABLE(USERSELECT_ALL)
if (Node* rootUserSelectAll = Position::rootUserSelectAllForNode(&targetNode))
return rootUserSelectAll;
-#endif
if (targetNode.shouldSelectOnMouseDown())
return &targetNode;
@@ -965,7 +963,6 @@
newSelection = VisibleSelection(targetPosition);
}
-#if ENABLE(USERSELECT_ALL)
Node* rootUserSelectAllForMousePressNode = Position::rootUserSelectAllForNode(m_mousePressNode.get());
if (rootUserSelectAllForMousePressNode && rootUserSelectAllForMousePressNode == Position::rootUserSelectAllForNode(target)) {
newSelection.setBase(positionBeforeNode(rootUserSelectAllForMousePressNode).upstream(CanCrossEditingBoundary));
@@ -983,9 +980,6 @@
else
newSelection.setExtent(targetPosition);
}
-#else
- newSelection.setExtent(targetPosition);
-#endif
if (m_frame.selection().granularity() != TextGranularity::CharacterGranularity)
newSelection.expandUsingGranularity(m_frame.selection().granularity());
Modified: trunk/Source/cmake/OptionsMac.cmake (271704 => 271705)
--- trunk/Source/cmake/OptionsMac.cmake 2021-01-21 19:40:38 UTC (rev 271704)
+++ trunk/Source/cmake/OptionsMac.cmake 2021-01-21 19:50:07 UTC (rev 271705)
@@ -85,7 +85,6 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TELEPHONE_NUMBER_DETECTION PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TEXT_AUTOSIZING PRIVATE ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_USERSELECT_ALL PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_USER_MESSAGE_HANDLERS PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VARIATION_FONTS PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO PRIVATE ON)
Modified: trunk/Source/cmake/WebKitFeatures.cmake (271704 => 271705)
--- trunk/Source/cmake/WebKitFeatures.cmake 2021-01-21 19:40:38 UTC (rev 271704)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2021-01-21 19:50:07 UTC (rev 271705)
@@ -236,7 +236,6 @@
WEBKIT_OPTION_DEFINE(ENABLE_TOUCH_EVENTS "Toggle Touch Events support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_TOUCH_SLIDER "Toggle Touch Slider support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_UNIFIED_BUILDS "Toggle unified builds" PRIVATE ${ENABLE_UNIFIED_BUILDS_DEFAULT})
- WEBKIT_OPTION_DEFINE(ENABLE_USERSELECT_ALL "Toggle user-select:all support" PRIVATE ON)
WEBKIT_OPTION_DEFINE(ENABLE_USER_MESSAGE_HANDLERS "Toggle user script message handler support" PRIVATE ON)
WEBKIT_OPTION_DEFINE(ENABLE_VARIATION_FONTS "Toggle variation fonts support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_VIDEO "Toggle Video support" PRIVATE ON)
Modified: trunk/Tools/ChangeLog (271704 => 271705)
--- trunk/Tools/ChangeLog 2021-01-21 19:40:38 UTC (rev 271704)
+++ trunk/Tools/ChangeLog 2021-01-21 19:50:07 UTC (rev 271705)
@@ -1,3 +1,12 @@
+2021-01-21 Fujii Hironori <hironori.fu...@sony.com>
+
+ Remove ENABLE_USERSELECT_ALL macro which is enabled for all ports
+ https://bugs.webkit.org/show_bug.cgi?id=100424
+
+ Reviewed by Don Olmstead.
+
+ * Scripts/webkitperl/FeatureList.pm:
+
2021-01-21 Jonathan Bedard <jbed...@apple.com>
[webkitscmpy] Handle machines that cannot import keyring
Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (271704 => 271705)
--- trunk/Tools/Scripts/webkitperl/FeatureList.pm 2021-01-21 19:40:38 UTC (rev 271704)
+++ trunk/Tools/Scripts/webkitperl/FeatureList.pm 2021-01-21 19:50:07 UTC (rev 271705)
@@ -515,9 +515,6 @@
{ option => "unified-builds", desc => "Toggle unified builds",
define => "ENABLE_UNIFIED_BUILDS", value => \$unifiedBuildsSupport },
- { option => "userselect-all", desc => "Toggle user-select:all support",
- define => "ENABLE_USERSELECT_ALL", value => \$userselectAllSupport },
-
{ option => "user-message-handlers", desc => "Toggle user script message handler support",
define => "ENABLE_USER_MESSAGE_HANDLERS", value => \$userMessageHandlersSupport },
