Changeset 195641 in webkit


Ignore:
Timestamp:
Jan 26, 2016 5:11:53 PM (8 years ago)
Author:
commit-queue@webkit.org
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

Location:
trunk/Source/WebKit2
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r195635 r195641  
     12016-01-26  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r195602.
     4        https://bugs.webkit.org/show_bug.cgi?id=153526
     5
     6        broke more than it fixed (Requested by thorton on #webkit).
     7
     8        Reverted changeset:
     9
     10        "REGRESSION (r194557): Keyboard shortcuts stop working after
     11        the WKWebView is unparented and reparented"
     12        https://bugs.webkit.org/show_bug.cgi?id=153492
     13        http://trac.webkit.org/changeset/195602
     14
    1152016-01-26  Anders Carlsson  <andersca@apple.com>
    216

  • trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h

    r195602 r195641  
    162162    BOOL _isExpectingFastSingleTapCommit;
    163163    BOOL _showDebugTapHighlightsForFastClicking;
    164 
    165     BOOL _isResigningFirstResponder;
    166164}
    167165

  • trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm

    r195602 r195641  
    670670- (BOOL)canBecomeFirstResponder
    671671{
    672     if (_isResigningFirstResponder)
    673         return NO;
    674672    // We might want to return something else
    675673    // if we decide to enable/disable interaction programmatically.
    … …  
    679677- (BOOL)becomeFirstResponder
    680678{
    681     if (_isResigningFirstResponder)
    682         return NO;
    683679    BOOL didBecomeFirstResponder = [super becomeFirstResponder];
    684680    if (didBecomeFirstResponder)
    … …  
    692688    // FIXME: Maybe we should call resignFirstResponder on the superclass
    693689    // and do nothing if the return value is NO.
    694 
    695     _isResigningFirstResponder = YES;
    696690
    697691    if (!_webView->_activeFocusedStateRetainCount) {
    … …  
    705699    [_textSelectionAssistant deactivateSelection];
    706700
    707     bool superDidResign = [super resignFirstResponder];
    708 
    709     _isResigningFirstResponder = NO;
    710 
    711     return superDidResign;
     701    return [super resignFirstResponder];
    712702}
    713703
Note: See TracChangeset for help on using the changeset viewer.