Title: [195641] trunk/Source/WebKit2
- Revision
- 195641
- Author
- commit-qu...@webkit.org
- Date
- 2016-01-26 17:11:53 -0800 (Tue, 26 Jan 2016)
Log Message
Unreviewed, rolling out r195602.
https://bugs.webkit.org/show_bug.cgi?id=153526
broke more than it fixed (Requested by thorton on #webkit).
Reverted changeset:
"REGRESSION (r194557): Keyboard shortcuts stop working after
the WKWebView is unparented and reparented"
https://bugs.webkit.org/show_bug.cgi?id=153492
http://trac.webkit.org/changeset/195602
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (195640 => 195641)
--- trunk/Source/WebKit2/ChangeLog 2016-01-27 01:10:58 UTC (rev 195640)
+++ trunk/Source/WebKit2/ChangeLog 2016-01-27 01:11:53 UTC (rev 195641)
@@ -1,3 +1,17 @@
+2016-01-26 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r195602.
+ https://bugs.webkit.org/show_bug.cgi?id=153526
+
+ broke more than it fixed (Requested by thorton on #webkit).
+
+ Reverted changeset:
+
+ "REGRESSION (r194557): Keyboard shortcuts stop working after
+ the WKWebView is unparented and reparented"
+ https://bugs.webkit.org/show_bug.cgi?id=153492
+ http://trac.webkit.org/changeset/195602
+
2016-01-26 Anders Carlsson <ander...@apple.com>
WebKitAdditions should be able to modify derived source rules
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (195640 => 195641)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2016-01-27 01:10:58 UTC (rev 195640)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2016-01-27 01:11:53 UTC (rev 195641)
@@ -161,8 +161,6 @@
BOOL _didAccessoryTabInitiateFocus;
BOOL _isExpectingFastSingleTapCommit;
BOOL _showDebugTapHighlightsForFastClicking;
-
- BOOL _isResigningFirstResponder;
}
@end
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (195640 => 195641)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2016-01-27 01:10:58 UTC (rev 195640)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2016-01-27 01:11:53 UTC (rev 195641)
@@ -669,8 +669,6 @@
- (BOOL)canBecomeFirstResponder
{
- if (_isResigningFirstResponder)
- return NO;
// We might want to return something else
// if we decide to enable/disable interaction programmatically.
return YES;
@@ -678,8 +676,6 @@
- (BOOL)becomeFirstResponder
{
- if (_isResigningFirstResponder)
- return NO;
BOOL didBecomeFirstResponder = [super becomeFirstResponder];
if (didBecomeFirstResponder)
[_textSelectionAssistant activateSelection];
@@ -692,8 +688,6 @@
// FIXME: Maybe we should call resignFirstResponder on the superclass
// and do nothing if the return value is NO.
- _isResigningFirstResponder = YES;
-
if (!_webView->_activeFocusedStateRetainCount) {
// We need to complete the editing operation before we blur the element.
[_inputPeripheral endEditing];
@@ -704,11 +698,7 @@
[_webSelectionAssistant resignedFirstResponder];
[_textSelectionAssistant deactivateSelection];
- bool superDidResign = [super resignFirstResponder];
-
- _isResigningFirstResponder = NO;
-
- return superDidResign;
+ return [super resignFirstResponder];
}
#if ENABLE(TOUCH_EVENTS)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
