[webkit-changes] [238487] trunk/LayoutTests
Title: [238487] trunk/LayoutTests Revision 238487 Author ryanhad...@apple.com Date 2018-11-25 22:55:00 -0800 (Sun, 25 Nov 2018) Log Message Unreviewed test gardening, rebaseline webgpu/queue-creation.html. * webgpu/queue-creation-expected.txt: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/webgpu/queue-creation-expected.txt Diff Modified: trunk/LayoutTests/ChangeLog (238486 => 238487) --- trunk/LayoutTests/ChangeLog 2018-11-26 01:06:39 UTC (rev 238486) +++ trunk/LayoutTests/ChangeLog 2018-11-26 06:55:00 UTC (rev 238487) @@ -1,3 +1,9 @@ +2018-11-25 Ryan Haddad + +Unreviewed test gardening, rebaseline webgpu/queue-creation.html. + +* webgpu/queue-creation-expected.txt: + 2018-11-25 Tim Horton Make it possible to insert editable images with a gesture Modified: trunk/LayoutTests/webgpu/queue-creation-expected.txt (238486 => 238487) --- trunk/LayoutTests/webgpu/queue-creation-expected.txt 2018-11-26 01:06:39 UTC (rev 238486) +++ trunk/LayoutTests/webgpu/queue-creation-expected.txt 2018-11-26 06:55:00 UTC (rev 238487) @@ -1,3 +1,3 @@ -PASS getQueue() on WebGPUDevice +PASS getQueue() on WebGPUDevice. ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [238486] trunk/Tools
Title: [238486] trunk/Tools Revision 238486 Author za...@apple.com Date 2018-11-25 17:06:39 -0800 (Sun, 25 Nov 2018) Log Message Unreviewed test fix after r238467. * TestWebKitAPI/Tests/WTF/ListHashSet.cpp: (TestWebKitAPI::TEST): Modified Paths trunk/Tools/ChangeLog trunk/Tools/TestWebKitAPI/Tests/WTF/ListHashSet.cpp Diff Modified: trunk/Tools/ChangeLog (238485 => 238486) --- trunk/Tools/ChangeLog 2018-11-25 22:59:07 UTC (rev 238485) +++ trunk/Tools/ChangeLog 2018-11-26 01:06:39 UTC (rev 238486) @@ -1,3 +1,10 @@ +2018-11-25 Zalan Bujtas + +Unreviewed test fix after r238467. + +* TestWebKitAPI/Tests/WTF/ListHashSet.cpp: +(TestWebKitAPI::TEST): + 2018-11-25 Wenson Hsieh Unreviewed, fix the internal iOS 12 build after r238471 Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/ListHashSet.cpp (238485 => 238486) --- trunk/Tools/TestWebKitAPI/Tests/WTF/ListHashSet.cpp 2018-11-25 22:59:07 UTC (rev 238485) +++ trunk/Tools/TestWebKitAPI/Tests/WTF/ListHashSet.cpp 2018-11-26 01:06:39 UTC (rev 238486) @@ -450,7 +450,7 @@ ASSERT_EQ(3, *firstWith3); auto firstWith4 = list.takeFirst(); -ASSERT_EQ(ptrWith2, firstWith4.get()); +ASSERT_EQ(ptrWith4, firstWith4.get()); ASSERT_EQ(4, *firstWith4); ASSERT_TRUE(list.isEmpty()); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [238485] trunk/Tools
Title: [238485] trunk/Tools
Revision 238485
Author wenson_hs...@apple.com
Date 2018-11-25 14:59:07 -0800 (Sun, 25 Nov 2018)
Log Message
Unreviewed, fix the internal iOS 12 build after r238471
* TestWebKitAPI/Tests/WebKitCocoa/DataDetection.mm:
(TEST):
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/DataDetection.mm
Diff
Modified: trunk/Tools/ChangeLog (238484 => 238485)
--- trunk/Tools/ChangeLog 2018-11-25 22:11:24 UTC (rev 238484)
+++ trunk/Tools/ChangeLog 2018-11-25 22:59:07 UTC (rev 238485)
@@ -1,3 +1,10 @@
+2018-11-25 Wenson Hsieh
+
+Unreviewed, fix the internal iOS 12 build after r238471
+
+* TestWebKitAPI/Tests/WebKitCocoa/DataDetection.mm:
+(TEST):
+
2018-11-25 Tim Horton
Make it possible to insert editable images with a gesture
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/DataDetection.mm (238484 => 238485)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/DataDetection.mm 2018-11-25 22:11:24 UTC (rev 238484)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/DataDetection.mm 2018-11-25 22:59:07 UTC (rev 238485)
@@ -135,17 +135,20 @@
auto checkDataDetectionResults = [] (NSArray *results) {
EXPECT_EQ(3U, results.count);
-EXPECT_EQ(DDResultCategoryUnknown, results[0].category);
EXPECT_TRUE([results[0].value containsString:@"+1-234-567-8900"]);
EXPECT_TRUE([results[0].value containsString:@"https://www.apple.com"]);
EXPECT_TRUE([results[0].value containsString:@"2 Apple Park Way, Cupertino 95014"]);
EXPECT_WK_STREQ("SignatureBlock", results[0].type);
-EXPECT_EQ(DDResultCategoryCalendarEvent, results[1].category);
EXPECT_WK_STREQ("Date", results[1].type);
EXPECT_WK_STREQ("December 21, 2021", results[1].value);
-EXPECT_EQ(DDResultCategoryMisc, results[2].category);
EXPECT_WK_STREQ("FlightInformation", results[2].type);
EXPECT_WK_STREQ("AC780", results[2].value);
+
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 13
+EXPECT_EQ(DDResultCategoryUnknown, results[0].category);
+EXPECT_EQ(DDResultCategoryCalendarEvent, results[1].category);
+EXPECT_EQ(DDResultCategoryMisc, results[2].category);
+#endif
};
[webView synchronouslyDetectDataWithTypes:WKDataDetectorTypeAll];
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [238484] trunk/Source/WebInspectorUI
Title: [238484] trunk/Source/WebInspectorUI Revision 238484 Author drou...@apple.com Date 2018-11-25 14:11:24 -0800 (Sun, 25 Nov 2018) Log Message Web Inspector: Timelines: add Media timeline https://bugs.webkit.org/show_bug.cgi?id=191625 Reviewed by Matt Baker. Add a new timeline to Timelines for media related events (e.g. event/fullscreen/low-power). Mimics what is visible by using the same instrumentation points as the Network tab when "Group Media Requests" is enabled. * UserInterface/Models/MediaInstrument.js: Added. (WI.MediaInstrument): (WI.MediaInstrument.supported): (WI.MediaInstrument.prototype.get timelineRecordType): (WI.MediaInstrument.prototype.startInstrumentation): (WI.MediaInstrument.prototype.stopInstrumentation): * UserInterface/Models/MediaTimelineRecord.js: Added. (WI.MediaTimelineRecord): (WI.MediaTimelineRecord.prototype.get eventType): (WI.MediaTimelineRecord.prototype.get domNode): (WI.MediaTimelineRecord.prototype.get domEvent): (WI.MediaTimelineRecord.prototype.get isLowPower): (WI.MediaTimelineRecord.prototype.get displayName): (WI.MediaTimelineRecord.prototype.saveIdentityToCookie): * UserInterface/Views/MediaTimelineDataGridNode.js: Added. (WI.MediaTimelineDataGridNode): (WI.MediaTimelineDataGridNode.prototype.get records): (WI.MediaTimelineDataGridNode.prototype.get data): (WI.MediaTimelineDataGridNode.prototype.createCellContent): (WI.MediaTimelineDataGridNode.prototype.iconClassNames): (WI.MediaTimelineDataGridNode.prototype.filterableDataForColumn): * UserInterface/Views/MediaTimelineOverviewGraph.js: Added. (WI.MediaTimelineOverviewGraph): (WI.MediaTimelineOverviewGraph.prototype.reset): (WI.MediaTimelineOverviewGraph.prototype.shown): (WI.MediaTimelineOverviewGraph.prototype.hidden): (WI.MediaTimelineOverviewGraph.prototype.layout): (WI.MediaTimelineOverviewGraph.prototype.updateSelectedRecord): (WI.MediaTimelineOverviewGraph.prototype._handleRecordAdded): * UserInterface/Views/MediaTimelineOverviewGraph.css: Added. (.timeline-overview-graph.media > .timeline-record-bar): (.timeline-overview-graph.media > .timeline-record-bar > .segment): * UserInterface/Views/MediaTimelineView.js: Added. (WI.MediaTimelineView): (WI.MediaTimelineView.prototype.get secondsPerPixel): (WI.MediaTimelineView.prototype.get selectionPathComponents): (WI.MediaTimelineView.prototype.closed): (WI.MediaTimelineView.prototype.reset): (WI.MediaTimelineView.prototype.dataGridSortComparator.compareDOMNodes): (WI.MediaTimelineView.prototype.dataGridSortComparator.): (WI.MediaTimelineView.prototype.dataGridSortComparator): (WI.MediaTimelineView.prototype.layout): (WI.MediaTimelineView.prototype._processPendingRecords): (WI.MediaTimelineView.prototype._handleRecordAdded): (WI.MediaTimelineView.prototype._handleSelectionPathComponentSiblingSelected): * UserInterface/Views/MediaTimelineView.css: Added. (.timeline-view.media > .data-grid): * UserInterface/Views/DOMEventsBreakdownView.js: (WI.DOMEventsBreakdownView.prototype.layout): * UserInterface/Views/DOMNodeEventsContentView.js: (WI.DOMNodeEventsContentView.prototype.initialLayout): * UserInterface/Views/NetworkDOMNodeDetailView.js: (WI.NetworkDOMNodeDetailView): (WI.NetworkDOMNodeDetailView.prototype.showContentViewForIdentifier): * UserInterface/Views/NetworkTableContentView.js: (WI.NetworkTableContentView): (WI.NetworkTableContentView.prototype.get filterNavigationItems): (WI.NetworkTableContentView.prototype._populateWaterfallGraph): (WI.NetworkTableContentView.prototype._showDetailView): (WI.NetworkTableContentView.prototype._waterfallPopoverContentForNodeEntry): Remove passing of `startTimestamp` to `WI.DOMEventsBreakdownView`, as we should be showing absolute timestamps for each event, not relative to the start of the recording. * UserInterface/Views/TimelineIcons.css: (.media-icon .icon): Added. (.dom-event-record .icon): Added. (.dom-event-record.fullscreen .icon): Added. (.low-power-record .icon): Added. * UserInterface/Controllers/TimelineManager.js: (WI.TimelineManager.availableTimelineTypes): (WI.TimelineManager.prototype.capturingStarted): (WI.TimelineManager.prototype.capturingStopped): (WI.TimelineManager.prototype._updateAutoCaptureInstruments): (WI.TimelineManager.prototype._handleDOMNodeDidFireEvent): Added. (WI.TimelineManager.prototype._handleDOMNodeLowPowerChanged): Added. * UserInterface/Views/TimelineRuler.js: (WI.TimelineRuler.prototype.clearMarkers): (WI.TimelineRuler.prototype._handleClick): * UserInterface/Views/TimelineOverview.js: (WI.TimelineOverview.prototype._timelineRulerMouseClicked): * UserInterface/Models/TimelineRecording.js: (WI.TimelineRecording.prototype.reset): (WI.TimelineRecording.prototype.addEventMarker): (WI.TimelineRecording.prototype.addRecord): (WI.TimelineRecording.prototype._keyForRecord): Drive-by: rework the logic for "click" event pass-through to the graph underneath. * UserInterface/Models/Instrument.js: (WI.Instrument.createForTimelineType): *
[webkit-changes] [238483] trunk/Source/WebInspectorUI
Title: [238483] trunk/Source/WebInspectorUI Revision 238483 Author mattba...@apple.com Date 2018-11-25 13:44:43 -0800 (Sun, 25 Nov 2018) Log Message Web Inspector: Remove parameters from TreeOutline SelectionDidChange event https://bugs.webkit.org/show_bug.cgi?id=191770 Reviewed by Devin Rousso. * UserInterface/Controllers/CallFrameTreeController.js: (WI.CallFrameTreeController.prototype._treeSelectionDidChange): * UserInterface/Views/AuditNavigationSidebarPanel.js: (WI.AuditNavigationSidebarPanel.prototype._treeSelectionDidChange): * UserInterface/Views/CanvasSidebarPanel.js: (WI.CanvasSidebarPanel): (WI.CanvasSidebarPanel.prototype._treeSelectionDidChange): (WI.CanvasSidebarPanel.prototype._treeOutlineSelectionDidChange): Deleted. * UserInterface/Views/CanvasTabContentView.js: (WI.CanvasTabContentView.prototype._canvasTreeOutlineSelectionDidChange): * UserInterface/Views/DebuggerSidebarPanel.js: (WI.DebuggerSidebarPanel.prototype._treeSelectionDidChange): * UserInterface/Views/OpenResourceDialog.js: (WI.OpenResourceDialog.prototype._treeSelectionDidChange): * UserInterface/Views/ResourceSidebarPanel.js: (WI.ResourceSidebarPanel.prototype._treeSelectionDidChange): * UserInterface/Views/SearchSidebarPanel.js: (WI.SearchSidebarPanel.prototype._treeSelectionDidChange): * UserInterface/Views/StorageSidebarPanel.js: (WI.StorageSidebarPanel._treeSelectionDidChange): * UserInterface/Views/TimelineDataGrid.js: (WI.TimelineDataGrid.prototype._popoverCallStackTreeSelectionDidChange): (WI.TimelineDataGrid): * UserInterface/Views/TimelineTabContentView.js: (WI.TimelineTabContentView.prototype._recordingsTreeSelectionDidChange): Use `event.target.selectedTreeElement` instead of `event.data.selectedElement`. * UserInterface/Views/TimelineOverview.js: (WI.TimelineOverview.prototype._timelinesTreeSelectionDidChange): (WI.TimelineOverview.prototype._timelinesTreeSelectionDidChange.updateGraphSelectedState): Deleted. Refactor away the single place `event.data.deselectedElement` was used. * UserInterface/Views/TreeElement.js: (WI.TreeElement.prototype.select): (WI.TreeElement.prototype.deselect): Remove `selectedElement` and `deselectedElement` from event data. Modified Paths trunk/Source/WebInspectorUI/ChangeLog trunk/Source/WebInspectorUI/UserInterface/Controllers/CallFrameTreeController.js trunk/Source/WebInspectorUI/UserInterface/Views/AuditNavigationSidebarPanel.js trunk/Source/WebInspectorUI/UserInterface/Views/CanvasSidebarPanel.js trunk/Source/WebInspectorUI/UserInterface/Views/CanvasTabContentView.js trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js trunk/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.js trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js trunk/Source/WebInspectorUI/UserInterface/Views/SearchSidebarPanel.js trunk/Source/WebInspectorUI/UserInterface/Views/StorageSidebarPanel.js trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js trunk/Source/WebInspectorUI/UserInterface/Views/TimelineTabContentView.js trunk/Source/WebInspectorUI/UserInterface/Views/TreeElement.js Diff Modified: trunk/Source/WebInspectorUI/ChangeLog (238482 => 238483) --- trunk/Source/WebInspectorUI/ChangeLog 2018-11-25 21:35:18 UTC (rev 238482) +++ trunk/Source/WebInspectorUI/ChangeLog 2018-11-25 21:44:43 UTC (rev 238483) @@ -1,3 +1,47 @@ +2018-11-25 Matt Baker + +Web Inspector: Remove parameters from TreeOutline SelectionDidChange event +https://bugs.webkit.org/show_bug.cgi?id=191770 + +Reviewed by Devin Rousso. + +* UserInterface/Controllers/CallFrameTreeController.js: +(WI.CallFrameTreeController.prototype._treeSelectionDidChange): +* UserInterface/Views/AuditNavigationSidebarPanel.js: +(WI.AuditNavigationSidebarPanel.prototype._treeSelectionDidChange): +* UserInterface/Views/CanvasSidebarPanel.js: +(WI.CanvasSidebarPanel): +(WI.CanvasSidebarPanel.prototype._treeSelectionDidChange): +(WI.CanvasSidebarPanel.prototype._treeOutlineSelectionDidChange): Deleted. +* UserInterface/Views/CanvasTabContentView.js: +(WI.CanvasTabContentView.prototype._canvasTreeOutlineSelectionDidChange): +* UserInterface/Views/DebuggerSidebarPanel.js: +(WI.DebuggerSidebarPanel.prototype._treeSelectionDidChange): +* UserInterface/Views/OpenResourceDialog.js: +(WI.OpenResourceDialog.prototype._treeSelectionDidChange): +* UserInterface/Views/ResourceSidebarPanel.js: +(WI.ResourceSidebarPanel.prototype._treeSelectionDidChange): +* UserInterface/Views/SearchSidebarPanel.js: +(WI.SearchSidebarPanel.prototype._treeSelectionDidChange): +* UserInterface/Views/StorageSidebarPanel.js: +(WI.StorageSidebarPanel._treeSelectionDidChange): +* UserInterface/Views/TimelineDataGrid.js: +
[webkit-changes] [238482] trunk/Source/WebCore
Title: [238482] trunk/Source/WebCore Revision 238482 Author za...@apple.com Date 2018-11-25 13:35:18 -0800 (Sun, 25 Nov 2018) Log Message [LFC] Remove PointInContainingBlock and PositionInContainingBlock https://bugs.webkit.org/show_bug.cgi?id=191954 Reviewed by Antti Koivisto. Use Point and Position instead. Points and positions are by default in the containing block's coordinate system. * layout/FormattingContextGeometry.cpp: (WebCore::Layout::contentHeightForFormattingContextRoot): * layout/LayoutUnits.h: (WebCore::Layout::Position::operator LayoutUnit const): (WebCore::Layout::operator<): (WebCore::Layout::operator==): * layout/floats/FloatAvoider.cpp: (WebCore::Layout::FloatAvoider::FloatAvoider): (WebCore::Layout::FloatAvoider::setHorizontalConstraints): (WebCore::Layout::FloatAvoider::horizontalPositionCandidate): (WebCore::Layout::FloatAvoider::initialHorizontalPosition const): * layout/floats/FloatBox.cpp: (WebCore::Layout::FloatBox::horizontalPositionCandidate): (WebCore::Layout::FloatBox::verticalPositionCandidate): (WebCore::Layout::FloatBox::initialVerticalPosition const): * layout/floats/FloatingContext.cpp: (WebCore::Layout::FloatingContext::positionForFloat const): (WebCore::Layout::FloatingContext::positionForFloatAvoiding const): (WebCore::Layout::FloatingContext::verticalPositionWithClearance const): (WebCore::Layout::FloatingContext::floatingPosition const): (WebCore::Layout::FloatingPair::horizontalConstraints const): (WebCore::Layout::FloatingPair::bottom const): * layout/floats/FloatingContext.h: * layout/floats/FloatingState.cpp: (WebCore::Layout::FloatingState::constraints const): (WebCore::Layout::FloatingState::bottom const): * layout/floats/FloatingState.h: (WebCore::Layout::FloatingState::FloatItem::bottom const): * layout/inlineformatting/InlineFormattingContext.cpp: (WebCore::Layout::InlineFormattingContext::initializeNewLine const): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/layout/FormattingContextGeometry.cpp trunk/Source/WebCore/layout/LayoutUnits.h trunk/Source/WebCore/layout/floats/FloatAvoider.cpp trunk/Source/WebCore/layout/floats/FloatBox.cpp trunk/Source/WebCore/layout/floats/FloatingContext.cpp trunk/Source/WebCore/layout/floats/FloatingContext.h trunk/Source/WebCore/layout/floats/FloatingState.cpp trunk/Source/WebCore/layout/floats/FloatingState.h trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (238481 => 238482) --- trunk/Source/WebCore/ChangeLog 2018-11-25 21:32:55 UTC (rev 238481) +++ trunk/Source/WebCore/ChangeLog 2018-11-25 21:35:18 UTC (rev 238482) @@ -1,5 +1,45 @@ 2018-11-25 Zalan Bujtas +[LFC] Remove PointInContainingBlock and PositionInContainingBlock +https://bugs.webkit.org/show_bug.cgi?id=191954 + +Reviewed by Antti Koivisto. + +Use Point and Position instead. Points and positions are by default in the containing block's coordinate system. + +* layout/FormattingContextGeometry.cpp: +(WebCore::Layout::contentHeightForFormattingContextRoot): +* layout/LayoutUnits.h: +(WebCore::Layout::Position::operator LayoutUnit const): +(WebCore::Layout::operator<): +(WebCore::Layout::operator==): +* layout/floats/FloatAvoider.cpp: +(WebCore::Layout::FloatAvoider::FloatAvoider): +(WebCore::Layout::FloatAvoider::setHorizontalConstraints): +(WebCore::Layout::FloatAvoider::horizontalPositionCandidate): +(WebCore::Layout::FloatAvoider::initialHorizontalPosition const): +* layout/floats/FloatBox.cpp: +(WebCore::Layout::FloatBox::horizontalPositionCandidate): +(WebCore::Layout::FloatBox::verticalPositionCandidate): +(WebCore::Layout::FloatBox::initialVerticalPosition const): +* layout/floats/FloatingContext.cpp: +(WebCore::Layout::FloatingContext::positionForFloat const): +(WebCore::Layout::FloatingContext::positionForFloatAvoiding const): +(WebCore::Layout::FloatingContext::verticalPositionWithClearance const): +(WebCore::Layout::FloatingContext::floatingPosition const): +(WebCore::Layout::FloatingPair::horizontalConstraints const): +(WebCore::Layout::FloatingPair::bottom const): +* layout/floats/FloatingContext.h: +* layout/floats/FloatingState.cpp: +(WebCore::Layout::FloatingState::constraints const): +(WebCore::Layout::FloatingState::bottom const): +* layout/floats/FloatingState.h: +(WebCore::Layout::FloatingState::FloatItem::bottom const): +* layout/inlineformatting/InlineFormattingContext.cpp: +(WebCore::Layout::InlineFormattingContext::initializeNewLine const): + +2018-11-25 Zalan Bujtas + [LFC] Rename Layout::Position to Layout::Point https://bugs.webkit.org/show_bug.cgi?id=191950 Modified: trunk/Source/WebCore/layout/FormattingContextGeometry.cpp
[webkit-changes] [238481] trunk/Source/WebCore
Title: [238481] trunk/Source/WebCore
Revision 238481
Author za...@apple.com
Date 2018-11-25 13:32:55 -0800 (Sun, 25 Nov 2018)
Log Message
[LFC] Rename Layout::Position to Layout::Point
https://bugs.webkit.org/show_bug.cgi?id=191950
Reviewed by Antti Koivisto.
It actually represents a point.
* layout/FormattingContext.cpp:
(WebCore::Layout::FormattingContext::mapTopLeftToAncestor):
(WebCore::Layout::FormattingContext::mapCoordinateToAncestor):
* layout/FormattingContext.h:
* layout/LayoutUnits.h:
(WebCore::Layout::Point::Point):
(WebCore::Layout::Point::moveBy):
(WebCore::Layout::Position::operator LayoutPoint const): Deleted.
(WebCore::Layout::Position::Position): Deleted.
(WebCore::Layout::Position::moveBy): Deleted.
* layout/blockformatting/BlockFormattingContext.h:
* layout/blockformatting/BlockFormattingContextGeometry.cpp:
(WebCore::Layout::BlockFormattingContext::Geometry::staticPosition):
* layout/floats/FloatingState.cpp:
(WebCore::Layout::FloatingState::constraints const):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/layout/FormattingContext.cpp
trunk/Source/WebCore/layout/FormattingContext.h
trunk/Source/WebCore/layout/LayoutUnits.h
trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.h
trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextGeometry.cpp
trunk/Source/WebCore/layout/floats/FloatingState.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (238480 => 238481)
--- trunk/Source/WebCore/ChangeLog 2018-11-25 21:30:34 UTC (rev 238480)
+++ trunk/Source/WebCore/ChangeLog 2018-11-25 21:32:55 UTC (rev 238481)
@@ -1,5 +1,30 @@
2018-11-25 Zalan Bujtas
+[LFC] Rename Layout::Position to Layout::Point
+https://bugs.webkit.org/show_bug.cgi?id=191950
+
+Reviewed by Antti Koivisto.
+
+It actually represents a point.
+
+* layout/FormattingContext.cpp:
+(WebCore::Layout::FormattingContext::mapTopLeftToAncestor):
+(WebCore::Layout::FormattingContext::mapCoordinateToAncestor):
+* layout/FormattingContext.h:
+* layout/LayoutUnits.h:
+(WebCore::Layout::Point::Point):
+(WebCore::Layout::Point::moveBy):
+(WebCore::Layout::Position::operator LayoutPoint const): Deleted.
+(WebCore::Layout::Position::Position): Deleted.
+(WebCore::Layout::Position::moveBy): Deleted.
+* layout/blockformatting/BlockFormattingContext.h:
+* layout/blockformatting/BlockFormattingContextGeometry.cpp:
+(WebCore::Layout::BlockFormattingContext::Geometry::staticPosition):
+* layout/floats/FloatingState.cpp:
+(WebCore::Layout::FloatingState::constraints const):
+
+2018-11-25 Zalan Bujtas
+
[LFC] Floating code should use typed positions (PositionInContextRoot).
https://bugs.webkit.org/show_bug.cgi?id=191949
Modified: trunk/Source/WebCore/layout/FormattingContext.cpp (238480 => 238481)
--- trunk/Source/WebCore/layout/FormattingContext.cpp 2018-11-25 21:30:34 UTC (rev 238480)
+++ trunk/Source/WebCore/layout/FormattingContext.cpp 2018-11-25 21:32:55 UTC (rev 238481)
@@ -183,13 +183,13 @@
return mappedDisplayBox;
}
-Position FormattingContext::mapTopLeftToAncestor(const LayoutState& layoutState, const Box& layoutBox, const Container& ancestor)
+Point FormattingContext::mapTopLeftToAncestor(const LayoutState& layoutState, const Box& layoutBox, const Container& ancestor)
{
ASSERT(layoutBox.isDescendantOf(ancestor));
return mapCoordinateToAncestor(layoutState, layoutState.displayBoxForLayoutBox(layoutBox).topLeft(), *layoutBox.containingBlock(), ancestor);
}
-Position FormattingContext::mapCoordinateToAncestor(const LayoutState& layoutState, Position position, const Container& containingBlock, const Container& ancestor)
+Point FormattingContext::mapCoordinateToAncestor(const LayoutState& layoutState, Point position, const Container& containingBlock, const Container& ancestor)
{
auto mappedPosition = position;
auto* container =
Modified: trunk/Source/WebCore/layout/FormattingContext.h (238480 => 238481)
--- trunk/Source/WebCore/layout/FormattingContext.h 2018-11-25 21:30:34 UTC (rev 238480)
+++ trunk/Source/WebCore/layout/FormattingContext.h 2018-11-25 21:32:55 UTC (rev 238481)
@@ -59,8 +59,8 @@
virtual InstrinsicWidthConstraints instrinsicWidthConstraints() const = 0;
static Display::Box mapBoxToAncestor(const LayoutState&, const Box&, const Container& ancestor);
-static Position mapTopLeftToAncestor(const LayoutState&, const Box&, const Container& ancestor);
-static Position mapCoordinateToAncestor(const LayoutState&, Position, const Container& containingBlock, const Container& ancestor);
+static Point mapTopLeftToAncestor(const LayoutState&, const Box&, const Container& ancestor);
+static Point mapCoordinateToAncestor(const LayoutState&, Point, const Container& containingBlock, const Container& ancestor);
protected:
using
[webkit-changes] [238480] trunk/Source/WebCore
Title: [238480] trunk/Source/WebCore
Revision 238480
Author za...@apple.com
Date 2018-11-25 13:30:34 -0800 (Sun, 25 Nov 2018)
Log Message
[LFC] Floating code should use typed positions (PositionInContextRoot).
https://bugs.webkit.org/show_bug.cgi?id=191949
Reviewed by Antti Koivisto.
Use PositionInContextRoot instead of LayoutUnit.
* layout/floats/FloatingState.cpp:
(WebCore::Layout::FloatingState::constraints const):
(WebCore::Layout::FloatingState::bottom const):
* layout/floats/FloatingState.h:
(WebCore::Layout::FloatingState::leftBottom const):
(WebCore::Layout::FloatingState::rightBottom const):
(WebCore::Layout::FloatingState::bottom const):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/layout/floats/FloatingState.cpp
trunk/Source/WebCore/layout/floats/FloatingState.h
Diff
Modified: trunk/Source/WebCore/ChangeLog (238479 => 238480)
--- trunk/Source/WebCore/ChangeLog 2018-11-25 21:28:33 UTC (rev 238479)
+++ trunk/Source/WebCore/ChangeLog 2018-11-25 21:30:34 UTC (rev 238480)
@@ -1,5 +1,22 @@
2018-11-25 Zalan Bujtas
+[LFC] Floating code should use typed positions (PositionInContextRoot).
+https://bugs.webkit.org/show_bug.cgi?id=191949
+
+Reviewed by Antti Koivisto.
+
+Use PositionInContextRoot instead of LayoutUnit.
+
+* layout/floats/FloatingState.cpp:
+(WebCore::Layout::FloatingState::constraints const):
+(WebCore::Layout::FloatingState::bottom const):
+* layout/floats/FloatingState.h:
+(WebCore::Layout::FloatingState::leftBottom const):
+(WebCore::Layout::FloatingState::rightBottom const):
+(WebCore::Layout::FloatingState::bottom const):
+
+2018-11-25 Zalan Bujtas
+
Fix build after r238472.
* layout/inlineformatting/InlineFormattingContext.cpp:
Modified: trunk/Source/WebCore/layout/floats/FloatingState.cpp (238479 => 238480)
--- trunk/Source/WebCore/layout/floats/FloatingState.cpp 2018-11-25 21:28:33 UTC (rev 238479)
+++ trunk/Source/WebCore/layout/floats/FloatingState.cpp 2018-11-25 21:30:34 UTC (rev 238480)
@@ -86,7 +86,7 @@
m_floats.append({ layoutBox, *this });
}
-FloatingState::Constraints FloatingState::constraints(LayoutUnit verticalPosition, const Box& formattingContextRoot) const
+FloatingState::Constraints FloatingState::constraints(PositionInContextRoot verticalPosition, const Box& formattingContextRoot) const
{
if (isEmpty())
return { };
@@ -134,7 +134,7 @@
return constraints;
}
-std::optional FloatingState::bottom(const Box& formattingContextRoot, Clear type) const
+std::optional FloatingState::bottom(const Box& formattingContextRoot, Clear type) const
{
if (m_floats.isEmpty())
return { };
@@ -141,7 +141,7 @@
// TODO: Currently this is only called once for each formatting context root with floats per layout.
// Cache the value if we end up calling it more frequently (and update it at append/remove).
-std::optional bottom;
+std::optional bottom;
for (auto& floatItem : m_floats) {
// Ignore floats from other formatting contexts when the floating state is inherited.
if (!floatItem.inFormattingContext(formattingContextRoot))
Modified: trunk/Source/WebCore/layout/floats/FloatingState.h (238479 => 238480)
--- trunk/Source/WebCore/layout/floats/FloatingState.h 2018-11-25 21:28:33 UTC (rev 238479)
+++ trunk/Source/WebCore/layout/floats/FloatingState.h 2018-11-25 21:30:34 UTC (rev 238480)
@@ -54,15 +54,15 @@
const Box& root() const { return *m_formattingContextRoot; }
-std::optional leftBottom(const Box& formattingContextRoot) const;
-std::optional rightBottom(const Box& formattingContextRoot) const;
-std::optional bottom(const Box& formattingContextRoot) const;
+std::optional leftBottom(const Box& formattingContextRoot) const;
+std::optional rightBottom(const Box& formattingContextRoot) const;
+std::optional bottom(const Box& formattingContextRoot) const;
struct Constraints {
-std::optional left;
-std::optional right;
+std::optional left;
+std::optional right;
};
-Constraints constraints(LayoutUnit verticalPosition, const Box& formattingContextRoot) const;
+Constraints constraints(PositionInContextRoot verticalPosition, const Box& formattingContextRoot) const;
class FloatItem {
public:
@@ -90,7 +90,7 @@
LayoutState& layoutState() const { return m_layoutState; }
-std::optional bottom(const Box& formattingContextRoot, Clear) const;
+std::optional bottom(const Box& formattingContextRoot, Clear) const;
LayoutState& m_layoutState;
WeakPtr m_formattingContextRoot;
@@ -97,19 +97,19 @@
FloatList m_floats;
};
-inline std::optional FloatingState::leftBottom(const Box& formattingContextRoot) const
+inline std::optional FloatingState::leftBottom(const Box& formattingContextRoot) const
{
[webkit-changes] [238479] trunk/Source/WebCore
Title: [238479] trunk/Source/WebCore
Revision 238479
Author za...@apple.com
Date 2018-11-25 13:28:33 -0800 (Sun, 25 Nov 2018)
Log Message
Fix build after r238472.
* layout/inlineformatting/InlineFormattingContext.cpp:
(WebCore::Layout::InlineFormattingContext::splitInlineRunIfNeeded const):
* layout/inlineformatting/InlineFormattingContextGeometry.cpp:
(WebCore::Layout::InlineFormattingContext::Geometry::runWidth):
* layout/inlineformatting/InlineLineBreaker.cpp:
(WebCore::Layout::InlineLineBreaker::textWidth const):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp
trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContextGeometry.cpp
trunk/Source/WebCore/layout/inlineformatting/InlineLineBreaker.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (238478 => 238479)
--- trunk/Source/WebCore/ChangeLog 2018-11-25 18:22:30 UTC (rev 238478)
+++ trunk/Source/WebCore/ChangeLog 2018-11-25 21:28:33 UTC (rev 238479)
@@ -1,3 +1,14 @@
+2018-11-25 Zalan Bujtas
+
+Fix build after r238472.
+
+* layout/inlineformatting/InlineFormattingContext.cpp:
+(WebCore::Layout::InlineFormattingContext::splitInlineRunIfNeeded const):
+* layout/inlineformatting/InlineFormattingContextGeometry.cpp:
+(WebCore::Layout::InlineFormattingContext::Geometry::runWidth):
+* layout/inlineformatting/InlineLineBreaker.cpp:
+(WebCore::Layout::InlineLineBreaker::textWidth const):
+
2018-11-25 Tim Horton
Make it possible to insert editable images with a gesture
Modified: trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp (238478 => 238479)
--- trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp 2018-11-25 18:22:30 UTC (rev 238478)
+++ trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp 2018-11-25 21:28:33 UTC (rev 238479)
@@ -162,7 +162,7 @@
uncommitted = { };
};
-for (auto iterator = inlineContent.find(()); iterator != inlineContent.end() && remaningLength > 0; ++iterator) {
+for (auto iterator = inlineContent.find(const_cast(())); iterator != inlineContent.end() && remaningLength > 0; ++iterator) {
auto& inlineItem = **iterator;
// Skip all non-inflow boxes (floats, out-of-flow positioned elements). They don't participate in the inline run context.
Modified: trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContextGeometry.cpp (238478 => 238479)
--- trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContextGeometry.cpp 2018-11-25 18:22:30 UTC (rev 238478)
+++ trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContextGeometry.cpp 2018-11-25 21:28:33 UTC (rev 238479)
@@ -180,7 +180,7 @@
{
LayoutUnit width;
auto startPosition = from;
-auto iterator = inlineContent.find();
+auto iterator = inlineContent.find(const_cast());
auto inlineItemEnd = inlineContent.end();
while (length) {
ASSERT(iterator != inlineItemEnd);
Modified: trunk/Source/WebCore/layout/inlineformatting/InlineLineBreaker.cpp (238478 => 238479)
--- trunk/Source/WebCore/layout/inlineformatting/InlineLineBreaker.cpp 2018-11-25 18:22:30 UTC (rev 238478)
+++ trunk/Source/WebCore/layout/inlineformatting/InlineLineBreaker.cpp 2018-11-25 21:28:33 UTC (rev 238479)
@@ -161,7 +161,7 @@
// FIXME: It does not do proper kerning/ligature handling.
LayoutUnit width;
-auto iterator = m_inlineContent.find();
+auto iterator = m_inlineContent.find(const_cast());
auto inlineItemEnd = m_inlineContent.end();
while (length) {
ASSERT(iterator != inlineItemEnd);
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [238478] trunk/Source/WTF
Title: [238478] trunk/Source/WTF Revision 238478 Author mcatanz...@igalia.com Date 2018-11-25 10:22:30 -0800 (Sun, 25 Nov 2018) Log Message CRASH() should call abort() except on Darwin and in developer builds https://bugs.webkit.org/show_bug.cgi?id=184408 Reviewed by Daniel Bates. CRASH() should call abort() except on Darwin and in developer builds, as discussed on webkit-dev. This should be slightly nicer than dereferencing 0xbadbeef. On Darwin, CRASH() uses a breakpoint trap, which seems to corrupt the stack on Linux, so we can't do that. Continue to call WTFCrash() in developer mode, and make no changes to WTFCrash(), since it is reportedly useful in nightmare scenarios where core dumps are unavailable. We also have to define CRASH_UNDER_CONSTEXPR_CONTEXT(). It's a bit odd that it's possible to use a non-constexpr function here, but it works. Currently this macro uses WTFCrash(), which is also non-constexpr. * wtf/Assertions.h: Modified Paths trunk/Source/WTF/ChangeLog trunk/Source/WTF/wtf/Assertions.h Diff Modified: trunk/Source/WTF/ChangeLog (238477 => 238478) --- trunk/Source/WTF/ChangeLog 2018-11-25 16:22:46 UTC (rev 238477) +++ trunk/Source/WTF/ChangeLog 2018-11-25 18:22:30 UTC (rev 238478) @@ -1,5 +1,27 @@ 2018-11-25 Michael Catanzaro +CRASH() should call abort() except on Darwin and in developer builds +https://bugs.webkit.org/show_bug.cgi?id=184408 + +Reviewed by Daniel Bates. + +CRASH() should call abort() except on Darwin and in developer builds, as discussed on +webkit-dev. This should be slightly nicer than dereferencing 0xbadbeef. + +On Darwin, CRASH() uses a breakpoint trap, which seems to corrupt the stack on Linux, so we +can't do that. + +Continue to call WTFCrash() in developer mode, and make no changes to WTFCrash(), since it +is reportedly useful in nightmare scenarios where core dumps are unavailable. + +We also have to define CRASH_UNDER_CONSTEXPR_CONTEXT(). It's a bit odd that it's possible to +use a non-constexpr function here, but it works. Currently this macro uses WTFCrash(), which +is also non-constexpr. + +* wtf/Assertions.h: + +2018-11-25 Michael Catanzaro + Unreviewed, rolling out r238469. Broke the build Modified: trunk/Source/WTF/wtf/Assertions.h (238477 => 238478) --- trunk/Source/WTF/wtf/Assertions.h 2018-11-25 16:22:46 UTC (rev 238477) +++ trunk/Source/WTF/wtf/Assertions.h 2018-11-25 18:22:30 UTC (rev 238478) @@ -44,6 +44,7 @@ #include #include #include +#include #include #if USE(OS_LOG) @@ -239,6 +240,9 @@ WTFBreakpointTrapUnderConstexprContext(); \ __builtin_unreachable(); \ } while (0) +#elif !ENABLE(DEVELOPER_MODE) && !OS(DARWIN) +#define CRASH() abort() +#define CRASH_UNDER_CONSTEXPR_CONTEXT() abort() #else #define CRASH() WTFCrash() #define CRASH_UNDER_CONSTEXPR_CONTEXT() WTFCrash() ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [238477] trunk/Source/WTF
Title: [238477] trunk/Source/WTF
Revision 238477
Author mcatanz...@igalia.com
Date 2018-11-25 08:22:46 -0800 (Sun, 25 Nov 2018)
Log Message
Unreviewed, rolling out r238469.
Broke the build
Reverted changeset:
"CRASH() should call abort() except on Darwin and in developer
builds"
https://bugs.webkit.org/show_bug.cgi?id=184408
https://trac.webkit.org/changeset/238469
Modified Paths
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/Assertions.h
Diff
Modified: trunk/Source/WTF/ChangeLog (238476 => 238477)
--- trunk/Source/WTF/ChangeLog 2018-11-25 12:19:02 UTC (rev 238476)
+++ trunk/Source/WTF/ChangeLog 2018-11-25 16:22:46 UTC (rev 238477)
@@ -1,3 +1,16 @@
+2018-11-25 Michael Catanzaro
+
+Unreviewed, rolling out r238469.
+
+Broke the build
+
+Reverted changeset:
+
+"CRASH() should call abort() except on Darwin and in developer
+builds"
+https://bugs.webkit.org/show_bug.cgi?id=184408
+https://trac.webkit.org/changeset/238469
+
2018-11-24 Andy Estes
[Cocoa] SOFT_LINK_CLASS_FOR_{HEADER,SOURCE} should generate a more concise getter function
Modified: trunk/Source/WTF/wtf/Assertions.h (238476 => 238477)
--- trunk/Source/WTF/wtf/Assertions.h 2018-11-25 12:19:02 UTC (rev 238476)
+++ trunk/Source/WTF/wtf/Assertions.h 2018-11-25 16:22:46 UTC (rev 238477)
@@ -44,7 +44,6 @@
#include
#include
#include
-#include
#include
#if USE(OS_LOG)
@@ -240,8 +239,6 @@
WTFBreakpointTrapUnderConstexprContext(); \
__builtin_unreachable(); \
} while (0)
-#elif !ENABLE(DEVELOPER_MODE) && !OS(DARWIN)
-#define CRASH() abort()
#else
#define CRASH() WTFCrash()
#define CRASH_UNDER_CONSTEXPR_CONTEXT() WTFCrash()
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [238476] trunk/Source/WebKit
Title: [238476] trunk/Source/WebKit
Revision 238476
Author an...@apple.com
Date 2018-11-25 04:19:02 -0800 (Sun, 25 Nov 2018)
Log Message
RemoteLayerTreeNode construction cleanups
https://bugs.webkit.org/show_bug.cgi?id=191951
Reviewed by Tim Horton.
* UIProcess/RemoteLayerTree/RemoteLayerTreeHost.h:
* UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm:
(WebKit::RemoteLayerTreeHost::updateLayerTree):
Drop unused LayerProperties argument.
(WebKit::RemoteLayerTreeHost::createLayer):
Split the actual construction out to makeNode.
Map updating is shared between platforms.
Move setting of layerID and clearing default actions to RemoteLayerTreeNode.
(WebKit::RemoteLayerTreeHost::makeNode):
Returns RemoteLayerTreeNode.
(WebKit::RemoteLayerTreeHost::setLayerID): Deleted.
(WebKit::RemoteLayerTreeHost::layerID): Deleted.
Move to RemoteLayerTreeNode.
* UIProcess/RemoteLayerTree/RemoteLayerTreeNode.h:
* UIProcess/RemoteLayerTree/RemoteLayerTreeNode.mm:
(WebKit::RemoteLayerTreeNode::RemoteLayerTreeNode):
(WebKit::RemoteLayerTreeNode::setLayerID):
(WebKit::RemoteLayerTreeNode::layerID):
* UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm:
(WebKit::RemoteLayerTreeHost::makeNode):
(WebKit::RemoteLayerTreeHost::createEmbeddedView):
(WebKit::RemoteLayerTreeHost::createLayer): Deleted.
* UIProcess/RemoteLayerTree/ios/RemoteLayerTreeViews.mm:
(-[WKCompositingView description]):
(-[WKUIRemoteView description]):
(-[WKBackdropView description]):
* WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemote.mm:
(WebKit::addAnimationToLayer):
Modified Paths
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeHost.h
trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm
trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeNode.h
trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeNode.mm
trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm
trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeViews.mm
trunk/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemote.mm
Diff
Modified: trunk/Source/WebKit/ChangeLog (238475 => 238476)
--- trunk/Source/WebKit/ChangeLog 2018-11-25 12:11:16 UTC (rev 238475)
+++ trunk/Source/WebKit/ChangeLog 2018-11-25 12:19:02 UTC (rev 238476)
@@ -1,3 +1,47 @@
+2018-11-25 Antti Koivisto
+
+RemoteLayerTreeNode construction cleanups
+https://bugs.webkit.org/show_bug.cgi?id=191951
+
+Reviewed by Tim Horton.
+
+* UIProcess/RemoteLayerTree/RemoteLayerTreeHost.h:
+* UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm:
+(WebKit::RemoteLayerTreeHost::updateLayerTree):
+
+Drop unused LayerProperties argument.
+
+(WebKit::RemoteLayerTreeHost::createLayer):
+
+Split the actual construction out to makeNode.
+Map updating is shared between platforms.
+Move setting of layerID and clearing default actions to RemoteLayerTreeNode.
+
+(WebKit::RemoteLayerTreeHost::makeNode):
+
+Returns RemoteLayerTreeNode.
+
+(WebKit::RemoteLayerTreeHost::setLayerID): Deleted.
+(WebKit::RemoteLayerTreeHost::layerID): Deleted.
+
+Move to RemoteLayerTreeNode.
+
+* UIProcess/RemoteLayerTree/RemoteLayerTreeNode.h:
+* UIProcess/RemoteLayerTree/RemoteLayerTreeNode.mm:
+(WebKit::RemoteLayerTreeNode::RemoteLayerTreeNode):
+(WebKit::RemoteLayerTreeNode::setLayerID):
+(WebKit::RemoteLayerTreeNode::layerID):
+* UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm:
+(WebKit::RemoteLayerTreeHost::makeNode):
+(WebKit::RemoteLayerTreeHost::createEmbeddedView):
+(WebKit::RemoteLayerTreeHost::createLayer): Deleted.
+* UIProcess/RemoteLayerTree/ios/RemoteLayerTreeViews.mm:
+(-[WKCompositingView description]):
+(-[WKUIRemoteView description]):
+(-[WKBackdropView description]):
+* WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemote.mm:
+(WebKit::addAnimationToLayer):
+
2018-11-25 Tim Horton
Make it possible to insert editable images with a gesture
Modified: trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeHost.h (238475 => 238476)
--- trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeHost.h 2018-11-25 12:11:16 UTC (rev 238475)
+++ trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeHost.h 2018-11-25 12:19:02 UTC (rev 238476)
@@ -43,13 +43,11 @@
class RemoteLayerTreeHost {
public:
explicit RemoteLayerTreeHost(RemoteLayerTreeDrawingAreaProxy&);
-virtual ~RemoteLayerTreeHost();
+~RemoteLayerTreeHost();
RemoteLayerTreeNode* nodeForID(WebCore::GraphicsLayer::PlatformLayerID) const;
RemoteLayerTreeNode* rootNode() const { return m_rootNode; }
-static WebCore::GraphicsLayer::PlatformLayerID layerID(CALayer*);
-
CALayer
[webkit-changes] [238475] trunk
Title: [238475] trunk Revision 238475 Author timothy_hor...@apple.com Date 2018-11-25 04:11:16 -0800 (Sun, 25 Nov 2018) Log Message Make it possible to insert editable images with a gesture https://bugs.webkit.org/show_bug.cgi?id=191937 Reviewed by Wenson Hsieh. Source/WebCore: Tests: editing/images/redo-insert-editable-image-maintains-strokes.html, editing/images/undo-insert-editable-image.html, editing/images/basic-editable-image-from-execCommand.html * Sources.txt: * WebCore.xcodeproj/project.pbxproj: * Source/WebCore/editing/EditorCommand.cpp: * Source/WebCore/en.lproj/Localizable.strings: * editing/EditAction.h: * editing/Editor.cpp: (WebCore::Editor::insertEditableImage): * editing/Editor.h: * editing/InsertEditableImageCommand.cpp: Added. (WebCore::InsertEditableImageCommand::InsertEditableImageCommand): (WebCore::InsertEditableImageCommand::doApply): * editing/InsertEditableImageCommand.h: Added. (WebCore::InsertEditableImageCommand::create): * editing/VisibleSelection.cpp: Add an editor command that inserts an editable image. It will likely get a bit more complicated, but for now it just inserts a 100% by 300px editable image. Source/WebKit: * UIProcess/API/Cocoa/WKWebView.mm: (-[WKWebView _stylusTapGestureShouldCreateEditableImage]): * UIProcess/API/Cocoa/WKWebViewInternal.h: Add a internal getter for a WKWebViewConfiguration property. * UIProcess/WebEditCommandProxy.cpp: (WebKit::WebEditCommandProxy::nameForEditAction): Add a undo name. * UIProcess/WebPageProxy.h: * UIProcess/ios/WKContentViewInteraction.h: * UIProcess/ios/WKContentViewInteraction.mm: (-[WKContentView setupInteraction]): (-[WKContentView cleanupInteraction]): (-[WKContentView _removeDefaultGestureRecognizers]): (-[WKContentView _addDefaultGestureRecognizers]): Add a single-stylus-tap gesture recognizer. (-[WKContentView _stylusSingleTapRecognized:]): If allowed, request to insert an editable image when a stylus tap occurs. * UIProcess/ios/WebPageProxyIOS.mm: (WebKit::WebPageProxy::handleStylusSingleTapAtPoint): * WebProcess/WebPage/WebPage.h: * WebProcess/WebPage/WebPage.messages.in: * WebProcess/WebPage/ios/WebPageIOS.mm: (WebKit::WebPage::handleStylusSingleTapAtPoint): Do a hit test, select the hit position, insert an editable image, and then de-assist any assisted node (to make the keyboard go away). For now, we'll only insert if we hit non-replaced elements, though this heuristic will need to be enhanced significantly once we decide on a design. Source/WebKitLegacy/mac: * WebCoreSupport/WebEditorClient.mm: (undoNameForEditAction): Add a undo name. Tools: * WebKitTestRunner/ios/UIScriptControllerIOS.mm: (WTR::UIScriptController::drawSquareInEditableImage): If the canvas already has a drawing, draw a new stroke on top of it instead of removing the existing stroke. LayoutTests: * editing/images/basic-editable-image-from-execCommand-expected.txt: Added. * editing/images/basic-editable-image-from-execCommand.html: Added. Add a test that ensures that editable images also work when inserted via the editor command. * editing/images/redo-insert-editable-image-maintains-strokes-expected.txt: Added. * editing/images/redo-insert-editable-image-maintains-strokes.html: Added. Add a test that ensures that strokes are maintained when re-doing an un-done editable image insertion. * editing/images/undo-insert-editable-image-expected.txt: Added. * editing/images/undo-insert-editable-image.html: Added. Add a test that ensures that the selection stays in a sensible place when undoing and redoing editable image insertion. Modified Paths trunk/LayoutTests/ChangeLog trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Sources.txt trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj trunk/Source/WebCore/editing/EditAction.h trunk/Source/WebCore/editing/Editor.cpp trunk/Source/WebCore/editing/Editor.h trunk/Source/WebCore/editing/EditorCommand.cpp trunk/Source/WebCore/editing/VisibleSelection.cpp trunk/Source/WebCore/en.lproj/Localizable.strings trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h trunk/Source/WebKit/UIProcess/WebEditCommandProxy.cpp trunk/Source/WebKit/UIProcess/WebPageProxy.h trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm trunk/Source/WebKit/WebProcess/WebPage/WebPage.h trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm trunk/Source/WebKitLegacy/mac/ChangeLog trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.mm trunk/Tools/ChangeLog trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm Added Paths trunk/LayoutTests/editing/images/basic-editable-image-from-execCommand-expected.txt trunk/LayoutTests/editing/images/basic-editable-image-from-execCommand.html
[webkit-changes] [238474] trunk/Source/WebKit
Title: [238474] trunk/Source/WebKit Revision 238474 Author timothy_hor...@apple.com Date 2018-11-25 04:05:02 -0800 (Sun, 25 Nov 2018) Log Message Scrolling and drawing compete for incoming gestures https://bugs.webkit.org/show_bug.cgi?id=191940 Reviewed by Wenson Hsieh. * Platform/spi/ios/PencilKitSPI.h: * UIProcess/API/Cocoa/WKWebView.mm: (-[WKWebView _initializeWithConfiguration:]): * UIProcess/ios/WKDrawingView.mm: (-[WKDrawingView initWithEmbeddedViewID:webPageProxy:]): Make scrolling and drawing mutually exclusive if editable images are enabled. Modified Paths trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/Platform/spi/ios/PencilKitSPI.h trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm trunk/Source/WebKit/UIProcess/ios/WKDrawingView.mm Diff Modified: trunk/Source/WebKit/ChangeLog (238473 => 238474) --- trunk/Source/WebKit/ChangeLog 2018-11-25 01:45:54 UTC (rev 238473) +++ trunk/Source/WebKit/ChangeLog 2018-11-25 12:05:02 UTC (rev 238474) @@ -1,3 +1,18 @@ +2018-11-25 Tim Horton + +Scrolling and drawing compete for incoming gestures +https://bugs.webkit.org/show_bug.cgi?id=191940 + +Reviewed by Wenson Hsieh. + +* Platform/spi/ios/PencilKitSPI.h: +* UIProcess/API/Cocoa/WKWebView.mm: +(-[WKWebView _initializeWithConfiguration:]): +* UIProcess/ios/WKDrawingView.mm: +(-[WKDrawingView initWithEmbeddedViewID:webPageProxy:]): +Make scrolling and drawing mutually exclusive if editable images +are enabled. + 2018-11-24 Wenson Hsieh [Cocoa] Fix a few localizable string descriptions in WebEditCommandProxy.cpp and WebEditorClient.mm Modified: trunk/Source/WebKit/Platform/spi/ios/PencilKitSPI.h (238473 => 238474) --- trunk/Source/WebKit/Platform/spi/ios/PencilKitSPI.h 2018-11-25 01:45:54 UTC (rev 238473) +++ trunk/Source/WebKit/Platform/spi/ios/PencilKitSPI.h 2018-11-25 12:05:02 UTC (rev 238474) @@ -32,6 +32,9 @@ #else @interface PKCanvasView : UIView + +@property (nonatomic, getter=isFingerDrawingEnabled) BOOL fingerDrawingEnabled; + @end #endif Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (238473 => 238474) --- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2018-11-25 01:45:54 UTC (rev 238473) +++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2018-11-25 12:05:02 UTC (rev 238474) @@ -666,6 +666,9 @@ [_scrollView setInternalDelegate:self]; [_scrollView setBouncesZoom:YES]; +if ([_configuration _editableImagesEnabled]) +[_scrollView panGestureRecognizer].allowedTouchTypes = @[ @(UITouchTypeDirect) ]; + _avoidsUnsafeArea = YES; [self _updateScrollViewInsetAdjustmentBehavior]; Modified: trunk/Source/WebKit/UIProcess/ios/WKDrawingView.mm (238473 => 238474) --- trunk/Source/WebKit/UIProcess/ios/WKDrawingView.mm 2018-11-25 01:45:54 UTC (rev 238473) +++ trunk/Source/WebKit/UIProcess/ios/WKDrawingView.mm 2018-11-25 12:05:02 UTC (rev 238474) @@ -46,6 +46,7 @@ _pencilView = adoptNS([allocPKCanvasViewInstance() initWithFrame:CGRectZero]); +[_pencilView setFingerDrawingEnabled:NO]; [_pencilView setUserInteractionEnabled:YES]; [_pencilView setOpaque:NO]; ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
