46 lines
3.2 KiB
Diff
46 lines
3.2 KiB
Diff
|
../../third_party/blink/renderer/core/editing/commands/delete_selection_command.cc: In member function 'void blink::DeleteSelectionCommand::InitializePositionData(blink::EditingState*)':
|
||
|
|
../../third_party/blink/renderer/core/editing/commands/delete_selection_command.cc:256:59: error: no matching function for call to 'EnclosingNodeOfType(blink::Position&, <unresolved overloaded function type>)'
|
||
|
|
256 | EnclosingNodeOfType(start, &IsA<HTMLTableRowElement>));
|
||
|
|
| ^
|
||
|
|
In file included from ../../third_party/blink/renderer/core/editing/commands/delete_selection_command.cc:34:
|
||
|
|
../../third_party/blink/renderer/core/editing/editing_utilities.h:112:19: note: candidate: 'blink::Node* blink::EnclosingNodeOfType(const Position&, bool (*)(const blink::Node*), blink::EditingBoundaryCrossingRule)'
|
||
|
|
112 | CORE_EXPORT Node* EnclosingNodeOfType(
|
||
|
|
| ^~~~~~~~~~~~~~~~~~~
|
||
|
|
../../third_party/blink/renderer/core/editing/editing_utilities.h:114:12: note: no known conversion for argument 2 from '<unresolved overloaded function type>' to 'bool (*)(const blink::Node*)'
|
||
|
|
114 | bool (*node_is_of_type)(const Node*),
|
||
|
|
| ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||
|
|
../../third_party/blink/renderer/core/editing/editing_utilities.h:116:19: note: candidate: 'blink::Node* blink::EnclosingNodeOfType(const PositionInFlatTree&, bool (*)(const blink::Node*), blink::EditingBoundaryCrossingRule)'
|
||
|
|
116 | CORE_EXPORT Node* EnclosingNodeOfType(
|
||
|
|
| ^~~~~~~~~~~~~~~~~~~
|
||
|
|
../../third_party/blink/renderer/core/editing/editing_utilities.h:117:5: note: no known conversion for argument 1 from 'blink::Position' {aka 'blink::PositionTemplate<blink::EditingAlgorithm<blink::NodeTraversal> >'} to 'const PositionInFlatTree&' {aka 'const blink::PositionTemplate<blink::EditingAlgorithm<blink::FlatTreeTraversal> >&'}
|
||
|
|
117 | const PositionInFlatTree&,
|
||
|
|
| ^~~~~~~~~~~~~~~~~~~~~~~~~
|
||
|
|
|
||
|
|
diff --git a/third_party/blink/renderer/core/editing/commands/delete_selection_command.cc b/third_party/blink/renderer/core/editing/commands/delete_selection_command.cc
|
||
|
|
index 6ff6906..dd531ae 100644
|
||
|
|
--- a/third_party/blink/renderer/core/editing/commands/delete_selection_command.cc
|
||
|
|
+++ b/third_party/blink/renderer/core/editing/commands/delete_selection_command.cc
|
||
|
|
@@ -224,6 +224,10 @@ static Position TrailingWhitespacePosition(const Position& position,
|
||
|
|
return Position();
|
||
|
|
}
|
||
|
|
|
||
|
|
+static bool IsAHTMLTableRowElement(const Node* node) {
|
||
|
|
+ return IsA<HTMLTableRowElement>(node);
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
void DeleteSelectionCommand::InitializePositionData(
|
||
|
|
EditingState* editing_state) {
|
||
|
|
DCHECK(!GetDocument().NeedsLayoutTreeUpdate());
|
||
|
|
@@ -253,9 +257,9 @@ void DeleteSelectionCommand::InitializePositionData(
|
||
|
|
end_root_ = RootEditableElementOf(end);
|
||
|
|
|
||
|
|
start_table_row_ = To<HTMLTableRowElement>(
|
||
|
|
- EnclosingNodeOfType(start, &IsA<HTMLTableRowElement>));
|
||
|
|
+ EnclosingNodeOfType(start, &IsAHTMLTableRowElement));
|
||
|
|
end_table_row_ = To<HTMLTableRowElement>(
|
||
|
|
- EnclosingNodeOfType(end, &IsA<HTMLTableRowElement>));
|
||
|
|
+ EnclosingNodeOfType(end, &IsAHTMLTableRowElement));
|
||
|
|
|
||
|
|
// Don't move content out of a table cell.
|
||
|
|
// If the cell is non-editable, enclosingNodeOfType won't return it by
|