Changeset 204378 in webkit


Ignore:
Timestamp:
Aug 11, 2016 11:14:05 AM (8 years ago)
Author:
Simon Fraser
Message:

[iOS DRT] Allow DRT to be iPad-sized in the iPad simulator
​https://bugs.webkit.org/show_bug.cgi?id=160761

Reviewed by Tim Horton.

Give iOS DRT a Launch storyboard.

Have it use a UIViewController so future forms testing works correctly.

Add TARGETED_DEVICE_FAMILY = "1,2" to the build settings for the .app, so that it
can run in iPad mode.

Remove empty InfoPlist.strings files.

  • DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
  • DumpRenderTree/ios/Info.plist:
  • DumpRenderTree/ios/Launch.storyboard: Added.
  • DumpRenderTree/mac/DumpRenderTree.mm:

(createWebViewAndOffscreenWindow):

  • WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:
  • WebKitTestRunner/WebKitTestRunnerApp/en.lproj/InfoPlist.strings: Removed.
  • WebKitTestRunner/ios/PlatformWebViewIOS.mm:

(WTR::PlatformWebView::PlatformWebView): Drive-by leak fix.

Location:
trunk/Tools
Files:
1 added
1 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r204376 r204378  
     12016-08-10  Simon Fraser  <simon.fraser@apple.com>
     2
     3        [iOS DRT] Allow DRT to be iPad-sized in the iPad simulator
     4        https://bugs.webkit.org/show_bug.cgi?id=160761
     5
     6        Reviewed by Tim Horton.
     7
     8        Give iOS DRT a Launch storyboard.
     9
     10        Have it use a UIViewController so future forms testing works correctly.
     11
     12        Add TARGETED_DEVICE_FAMILY = "1,2" to the build settings for the .app, so that it
     13        can run in iPad mode.
     14
     15        Remove empty InfoPlist.strings files.
     16
     17        * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
     18        * DumpRenderTree/ios/Info.plist:
     19        * DumpRenderTree/ios/Launch.storyboard: Added.
     20        * DumpRenderTree/mac/DumpRenderTree.mm:
     21        (createWebViewAndOffscreenWindow):
     22        * WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:
     23        * WebKitTestRunner/WebKitTestRunnerApp/en.lproj/InfoPlist.strings: Removed.
     24        * WebKitTestRunner/ios/PlatformWebViewIOS.mm:
     25        (WTR::PlatformWebView::PlatformWebView): Drive-by leak fix.
     26
    1272016-08-11  Per Arne Vollan  <pvollan@apple.com>
    228

  • trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj

    r195405 r204378  
    2929                0F37A4A711E6628700275F54 /* PluginObjectMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F37A4A611E6628700275F54 /* PluginObjectMac.mm */; };
    3030                0F37A4AA11E6629100275F54 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5A752A108AF5D1F00138E45 /* QuartzCore.framework */; };
     31                0F4E43E31D5C2BAF008EBA5C /* Launch.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0F4E43E11D5C037A008EBA5C /* Launch.storyboard */; };
    3132                141BF435096A455900E0753C /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9335435F03D75502008635CE /* WebKit.framework */; };
    3233                141BF436096A455900E0753C /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A84F608908B136DA00E9745F /* Cocoa.framework */; };
    … …  
    215216                00F048531A0C3C9A000244DB /* URLRedirect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = URLRedirect.cpp; sourceTree = "<group>"; };
    216217                0F37A4A611E6628700275F54 /* PluginObjectMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PluginObjectMac.mm; sourceTree = "<group>"; };
     218                0F4E43E11D5C037A008EBA5C /* Launch.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Launch.storyboard; path = ios/Launch.storyboard; sourceTree = "<group>"; };
    217219                141BF233096A44CF00E0753C /* TestNetscapePlugIn.plugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TestNetscapePlugIn.plugin; sourceTree = BUILT_PRODUCTS_DIR; };
    218220                141BF447096A45C800E0753C /* PluginObject.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PluginObject.h; sourceTree = "<group>"; };
    … …  
    646648                        isa = PBXGroup;
    647649                        children = (
     650                                0F4E43E11D5C037A008EBA5C /* Launch.storyboard */,
    648651                                4464CABD1C20A07000E5BB55 /* DumpRenderTreeAppMain.mm */,
    649652                                A1158D55189273EB0088C17B /* DumpRenderTreeBrowserView.h */,
    … …  
    903906                        buildActionMask = 2147483647;
    904907                        files = (
     908                                0F4E43E31D5C2BAF008EBA5C /* Launch.storyboard in Resources */,
    905909                        );
    906910                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    11991203                        buildSettings = {
    12001204                                INFOPLIST_FILE = "$(SRCROOT)/ios/Info.plist";
     1205                                TARGETED_DEVICE_FAMILY = "1,2";
    12011206                        };
    12021207                        name = Debug;
    … …  
    12071212                        buildSettings = {
    12081213                                INFOPLIST_FILE = "$(SRCROOT)/ios/Info.plist";
     1214                                TARGETED_DEVICE_FAMILY = "1,2";
    12091215                        };
    12101216                        name = Release;
    … …  
    12151221                        buildSettings = {
    12161222                                INFOPLIST_FILE = "$(SRCROOT)/ios/Info.plist";
     1223                                TARGETED_DEVICE_FAMILY = "1,2";
    12171224                        };
    12181225                        name = Production;

  • trunk/Tools/DumpRenderTree/ios/Info.plist

    r185330 r204378  
    2828                <true/>
    2929        </dict>
     30        <key>UILaunchStoryboardName</key>
     31        <string>Launch</string>
     32        <key>UIRequiredDeviceCapabilities</key>
     33        <array>
     34                <string>armv7</string>
     35        </array>
     36        <key>UISupportedInterfaceOrientations</key>
     37        <array>
     38                <string>UIInterfaceOrientationPortrait</string>
     39                <string>UIInterfaceOrientationLandscapeLeft</string>
     40                <string>UIInterfaceOrientationLandscapeRight</string>
     41        </array>
     42        <key>UISupportedInterfaceOrientations~ipad</key>
     43        <array>
     44                <string>UIInterfaceOrientationPortrait</string>
     45                <string>UIInterfaceOrientationPortraitUpsideDown</string>
     46                <string>UIInterfaceOrientationLandscapeLeft</string>
     47                <string>UIInterfaceOrientationLandscapeRight</string>
     48        </array>
    3049</dict>
    3150</plist>

  • trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig

    r194115 r204378  
    3131PLATFORM_OTHER_LDFLAGS[sdk=iphone*] = -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -lWebCoreTestSupport -force_load $(BUILT_PRODUCTS_DIR)/libDumpRenderTree.a -framework QuartzCore -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework Foundation -framework GraphicsServices -framework ImageIO -framework MobileCoreServices -framework UIKit -framework WebCore -framework JavaScriptCore -framework WebKit $(OTHER_LDFLAGS_FONTS);
    3232PLATFORM_OTHER_LDFLAGS[sdk=macosx*] = -framework JavaScriptCore;
     33
    3334LD_RUNPATH_SEARCH_PATHS = "@loader_path/.";
     35
     36EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = ios/*;
     37
    3438PRODUCT_NAME = DumpRenderTree;
     39

  • trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm

    r203855 r204378  
    821821    UIWindow *uiWindow = [[[UIWindow alloc] initWithFrame:uiWindowRect] autorelease];
    822822
     823    UIViewController *viewController = [[UIViewController alloc] init];
     824    [uiWindow setRootViewController:viewController];
     825    [viewController release];
     826
    823827    // The UIWindow and UIWebBrowserView are released when the DumpRenderTreeWindow is closed.
    824828    drtWindow.uiWindow = uiWindow;
    … …  
    828832    [scrollView addSubview:webBrowserView];
    829833
    830     [uiWindow addSubview:scrollView];
     834    [viewController.view addSubview:scrollView];
    831835    [scrollView release];
    832836

  • trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj

    r204364 r204378  
    7575                2E63EDA61891BDC0002A7AFC /* TestRunner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC9981711D3F51E0017BCA2 /* TestRunner.cpp */; };
    7676                2E749BF21891EBFA007FC175 /* EventSenderProxyIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2E63ED7A1891ACE9002A7AFC /* EventSenderProxyIOS.mm */; };
    77                 2EE52CED1890A9A80010ED21 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2EE52CEB1890A9A80010ED21 /* InfoPlist.strings */; };
    7877                5641E2D014335E95008307E5 /* JSTextInputController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5641E2CE14335E95008307E5 /* JSTextInputController.cpp */; };
    7978                5664A49A14326384008881BE /* TextInputController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5664A49814326384008881BE /* TextInputController.cpp */; };
    … …  
    248247                2EE52CE41890A9A80010ED21 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
    249248                2EE52CEA1890A9A80010ED21 /* WebKitTestRunnerApp-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "WebKitTestRunnerApp-Info.plist"; path = "WebKitTestRunnerApp/WebKitTestRunnerApp-Info.plist"; sourceTree = "<group>"; };
    250                 2EE52CEC1890A9A80010ED21 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
    251249                2EE52CF11890A9A80010ED21 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
    252250                2EE52CF21890A9A80010ED21 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
    … …  
    563561                                2EE52CF11890A9A80010ED21 /* AppDelegate.h */,
    564562                                2EE52CF21890A9A80010ED21 /* AppDelegate.m */,
    565                                 2EE52CEB1890A9A80010ED21 /* InfoPlist.strings */,
    566563                                0F4B08721D5BE88D00EC1B78 /* Launch.storyboard */,
    567564                                2EE52D161890A9FB0010ED21 /* mainIOS.mm */,
    … …  
    890887                        buildActionMask = 2147483647;
    891888                        files = (
    892                                 2EE52CED1890A9A80010ED21 /* InfoPlist.strings in Resources */,
    893889                                0F4B08731D5BE88D00EC1B78 /* Launch.storyboard in Resources */,
    894890                        );
    … …  
    10691065/* End PBXTargetDependency section */
    10701066
    1071 /* Begin PBXVariantGroup section */
    1072                 2EE52CEB1890A9A80010ED21 /* InfoPlist.strings */ = {
    1073                         isa = PBXVariantGroup;
    1074                         children = (
    1075                                 2EE52CEC1890A9A80010ED21 /* en */,
    1076                         );
    1077                         name = InfoPlist.strings;
    1078                         sourceTree = "<group>";
    1079                 };
    1080 /* End PBXVariantGroup section */
    1081 
    10821067/* Begin XCBuildConfiguration section */
    10831068                1DEB927508733DD40010E9CD /* Debug */ = {

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

    r204364 r204378  
    117117    UIViewController *viewController = [[UIViewController alloc] init];
    118118    [m_window setRootViewController:viewController];
     119    [viewController release];
    119120
    120121    m_view = [[TestRunnerWKWebView alloc] initWithFrame:viewRectForWindowRect(rect) configuration:configuration];
Note: See TracChangeset for help on using the changeset viewer.