Title: [205713] branches/safari-602-branch/Source/WebKit/win
- Revision
- 205713
- Author
- [email protected]
- Date
- 2016-09-09 01:42:32 -0700 (Fri, 09 Sep 2016)
Log Message
Merge r205393. rdar://problem/27806012
Modified Paths
Diff
Modified: branches/safari-602-branch/Source/WebKit/win/ChangeLog (205712 => 205713)
--- branches/safari-602-branch/Source/WebKit/win/ChangeLog 2016-09-09 08:42:30 UTC (rev 205712)
+++ branches/safari-602-branch/Source/WebKit/win/ChangeLog 2016-09-09 08:42:32 UTC (rev 205713)
@@ -1,3 +1,13 @@
+2016-09-09 Babak Shafiei <[email protected]>
+
+ Merge r205393. rdar://problem/27806012
+
+ 2016-09-02 Ryosuke Niwa <[email protected]>
+
+ Build fix attempt after r205381.
+
+ * WebCoreSupport/WebEditorClient.h:
+
2016-08-17 Babak Shafiei <[email protected]>
Merge r204575. rdar://problem/27850667
Modified: branches/safari-602-branch/Source/WebKit/win/WebCoreSupport/WebEditorClient.h (205712 => 205713)
--- branches/safari-602-branch/Source/WebKit/win/WebCoreSupport/WebEditorClient.h 2016-09-09 08:42:30 UTC (rev 205712)
+++ branches/safari-602-branch/Source/WebKit/win/WebCoreSupport/WebEditorClient.h 2016-09-09 08:42:32 UTC (rev 205713)
@@ -56,8 +56,9 @@
virtual void respondToChangedContents();
virtual void respondToChangedSelection(WebCore::Frame*);
- void didChangeSelectionAndUpdateLayout() override { }
- void discardedComposition(WebCore::Frame*) override;
+ void didChangeSelectionAndUpdateLayout() final { }
+ void updateEditorStateAfterLayoutIfEditabilityChanged() final { }
+ void discardedComposition(WebCore::Frame*) final;
bool shouldDeleteRange(WebCore::Range*);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
