Changeset 202116 in webkit


Ignore:
Timestamp:
Jun 15, 2016 4:44:57 PM (8 years ago)
Author:
Simon Fraser
Message:

[iOS WK2] Make it possible to test the Next/Previous buttons in the keyboard accessory bar
​https://bugs.webkit.org/show_bug.cgi?id=158714

Reviewed by Enrica Casucci.

Add UIScriptController.keyboardAccessoryBar{Next,Previous} and hook it up to the WKContentView
method that gets called from UIKit.

Add a test that exercises it.

Source/WebKit2:

  • UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView keyboardAssistantBarNext]):
(-[WKWebView keyboardAssistantBarPrevious]):

  • UIProcess/API/Cocoa/WKWebViewPrivate.h:

Tools:

  • WebKitTestRunner/UIScriptContext/Bindings/UIScriptController.idl:
  • WebKitTestRunner/UIScriptContext/UIScriptController.cpp:

(WTR::UIScriptController::keyboardAccessoryBarNext):
(WTR::UIScriptController::keyboardAccessoryBarPrevious):

  • WebKitTestRunner/UIScriptContext/UIScriptController.h:
  • WebKitTestRunner/ios/UIScriptControllerIOS.mm:

(WTR::UIScriptController::keyboardAccessoryBarNext):
(WTR::UIScriptController::keyboardAccessoryBarPrevious):

LayoutTests:

  • TestExpectations:
  • fast/forms/ios/accessory-bar-navigation-expected.txt: Added.
  • fast/forms/ios/accessory-bar-navigation.html: Added.
  • fast/forms/ios/resources/zooming-test-utils.js: Added.

(testZoomAfterTap):
(tableFromJSON):

  • platform/ios-simulator-wk2/TestExpectations:
Location:
trunk
Files:
2 added
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r202115 r202116  
     12016-06-13  Simon Fraser  <simon.fraser@apple.com>
     2
     3        [iOS WK2] Make it possible to test the Next/Previous buttons in the keyboard accessory bar
     4        https://bugs.webkit.org/show_bug.cgi?id=158714
     5
     6        Reviewed by Enrica Casucci.
     7
     8        Add UIScriptController.keyboardAccessoryBar{Next,Previous} and hook it up to the WKContentView
     9        method that gets called from UIKit.
     10
     11        Add a test that exercises it.
     12
     13        * TestExpectations:
     14        * fast/forms/ios/accessory-bar-navigation-expected.txt: Added.
     15        * fast/forms/ios/accessory-bar-navigation.html: Added.
     16        * fast/forms/ios/resources/zooming-test-utils.js: Added.
     17        (testZoomAfterTap):
     18        (tableFromJSON):
     19        * platform/ios-simulator-wk2/TestExpectations:
     20
    1212016-06-15  Dean Jackson  <dino@apple.com>
    222

  • trunk/LayoutTests/fast/forms/ios/resources/zooming-test-utils.js

    r202114 r202116  
    55        return;
    66
    7     // Tap near the right end of the text.
    87    var point = getPointInsideElement(targetElement, xOffset, yOffset);
    9    
     8
    109    var uiScript = zoomAfterSingleTapUIScript(point.x, point.y);
    1110    testRunner.runUIScript(uiScript, function(result) {
    … …  
    2625                    'visibleRect' : uiController.contentVisibleRect
    2726                };
    28            
     27
    2928                var result = JSON.stringify(result, function(key, value) {
    3029                      if (typeof value === "number")

  • trunk/Source/WebKit2/ChangeLog

    r202112 r202116  
     12016-06-13  Simon Fraser  <simon.fraser@apple.com>
     2
     3        [iOS WK2] Make it possible to test the Next/Previous buttons in the keyboard accessory bar
     4        https://bugs.webkit.org/show_bug.cgi?id=158714
     5
     6        Reviewed by Enrica Casucci.
     7
     8        Add UIScriptController.keyboardAccessoryBar{Next,Previous} and hook it up to the WKContentView
     9        method that gets called from UIKit.
     10
     11        Add a test that exercises it.
     12
     13        * UIProcess/API/Cocoa/WKWebView.mm:
     14        (-[WKWebView keyboardAssistantBarNext]):
     15        (-[WKWebView keyboardAssistantBarPrevious]):
     16        * UIProcess/API/Cocoa/WKWebViewPrivate.h:
     17
    1182016-06-15  Dean Jackson  <dino@apple.com>
    219

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

    r201888 r202116  
    44394439}
    44404440
     4441- (void)keyboardAccessoryBarNext
     4442{
     4443    [_contentView accessoryTab:YES];
     4444}
     4445
     4446- (void)keyboardAccessoryBarPrevious
     4447{
     4448    [_contentView accessoryTab:NO];
     4449}
     4450
    44414451#endif // PLATFORM(IOS)
    44424452

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h

    r200403 r202116  
    251251- (CGPoint)_convertPointFromContentsToView:(CGPoint)point WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    252252- (CGPoint)_convertPointFromViewToContents:(CGPoint)point WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     253
     254- (void)keyboardAccessoryBarNext;
     255- (void)keyboardAccessoryBarPrevious;
    253256#endif
    254257

  • trunk/Tools/ChangeLog

    r202111 r202116  
     12016-06-13  Simon Fraser  <simon.fraser@apple.com>
     2
     3        [iOS WK2] Make it possible to test the Next/Previous buttons in the keyboard accessory bar
     4        https://bugs.webkit.org/show_bug.cgi?id=158714
     5
     6        Reviewed by Enrica Casucci.
     7
     8        Add UIScriptController.keyboardAccessoryBar{Next,Previous} and hook it up to the WKContentView
     9        method that gets called from UIKit.
     10
     11        Add a test that exercises it.
     12
     13        * WebKitTestRunner/UIScriptContext/Bindings/UIScriptController.idl:
     14        * WebKitTestRunner/UIScriptContext/UIScriptController.cpp:
     15        (WTR::UIScriptController::keyboardAccessoryBarNext):
     16        (WTR::UIScriptController::keyboardAccessoryBarPrevious):
     17        * WebKitTestRunner/UIScriptContext/UIScriptController.h:
     18        * WebKitTestRunner/ios/UIScriptControllerIOS.mm:
     19        (WTR::UIScriptController::keyboardAccessoryBarNext):
     20        (WTR::UIScriptController::keyboardAccessoryBarPrevious):
     21
    1222016-06-15  Sam Weinig  <sam@webkit.org>
    223

  • trunk/Tools/WebKitTestRunner/UIScriptContext/Bindings/UIScriptController.idl

    r200602 r202116  
    4343    void keyUpUsingHardwareKeyboard(DOMString character, object callback);
    4444
     45    void keyboardAccessoryBarNext();
     46    void keyboardAccessoryBarPrevious();
     47
    4548    attribute object didShowKeyboardCallback;
    4649    attribute object didHideKeyboardCallback;

  • trunk/Tools/WebKitTestRunner/UIScriptContext/UIScriptController.cpp

    r200602 r202116  
    151151}
    152152
     153void UIScriptController::keyboardAccessoryBarNext()
     154{
     155}
     156
     157void UIScriptController::keyboardAccessoryBarPrevious()
     158{
     159}
     160
    153161double UIScriptController::zoomScale() const
    154162{

  • trunk/Tools/WebKitTestRunner/UIScriptContext/UIScriptController.h

    r200602 r202116  
    5858    void keyUpUsingHardwareKeyboard(JSStringRef character, JSValueRef callback);
    5959
     60    void keyboardAccessoryBarNext();
     61    void keyboardAccessoryBarPrevious();
     62
    6063    void setWillBeginZoomingCallback(JSValueRef);
    6164    JSValueRef willBeginZoomingCallback() const;

  • trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm

    r200602 r202116  
    176176}
    177177
     178void UIScriptController::keyboardAccessoryBarNext()
     179{
     180    TestRunnerWKWebView *webView = TestController::singleton().mainWebView()->platformView();
     181    [webView keyboardAccessoryBarNext];
     182}
     183
     184void UIScriptController::keyboardAccessoryBarPrevious()
     185{
     186    TestRunnerWKWebView *webView = TestController::singleton().mainWebView()->platformView();
     187    [webView keyboardAccessoryBarPrevious];
     188}
     189
    178190double UIScriptController::minimumZoomScale() const
    179191{
Note: See TracChangeset for help on using the changeset viewer.