Changeset 206287 in webkit


Ignore:
Timestamp:
Sep 22, 2016 7:10:53 PM (8 years ago)
Author:
bshafiei@apple.com
Message:

Merge r206038. rdar://problem/28086237

Location:
branches/safari-602-branch/Tools
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/safari-602-branch/Tools/ChangeLog

    r206286 r206287  
     12016-09-22  Babak Shafiei  <bshafiei@apple.com>
     2
     3        Merge r206038. rdar://problem/28086237
     4
     5    2016-09-16  Wenson Hsieh  <wenson_hsieh@apple.com>
     6
     7            RequiresUserActionForPlayback TestWebKitAPI tests are broken after r206033.
     8            https://bugs.webkit.org/show_bug.cgi?id=162080
     9
     10            Reviewed by Jer Noble.
     11
     12            I renamed "playingHandler" to the more generalized "testHandler", but did not realize that the
     13            RequiresUserActionForPlayback tests also used "playingHandler". Renames the handler to account for this change.
     14
     15            * TestWebKitAPI/Tests/WebKit2Cocoa/RequiresUserActionForPlayback.mm:
     16            (RequiresUserActionForPlaybackTest::SetUp):
     17
    1182016-09-22  Babak Shafiei  <bshafiei@apple.com>
    219

  • branches/safari-602-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/RequiresUserActionForPlayback.mm

    r203883 r206287  
    7373        handler = adoptNS([[RequiresUserActionForPlaybackMessageHandler alloc] init]);
    7474        configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
    75         [[configuration userContentController] addScriptMessageHandler:handler.get() name:@"playingHandler"];
     75        [[configuration userContentController] addScriptMessageHandler:handler.get() name:@"testHandler"];
    7676        configuration.get()._mediaDataLoadsAutomatically = YES;
    7777#if TARGET_OS_IPHONE
Note: See TracChangeset for help on using the changeset viewer.