Changeset 205311 in webkit
- Timestamp:
- Sep 1, 2016 1:17:02 PM (8 years ago)
- Location:
- trunk/Tools
- Files:
-
- 2 added
- 1 deleted
- 6 edited
- 8 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r205306 r205311 1 2016-09-01 Commit Queue <commit-queue@webkit.org> 2 3 Unreviewed, rolling out r205295 and r205303. 4 https://bugs.webkit.org/show_bug.cgi?id=161505 5 6 Broke the iOS build (Requested by ryanhaddad on #webkit). 7 8 Reverted changesets: 9 10 "Refactor MobileMiniBrowser into an application framework to 11 allow external XCTesting" 12 https://bugs.webkit.org/show_bug.cgi?id=161462 13 http://trac.webkit.org/changeset/205295 14 15 "Unreviewed build-fix; don't specify an explicit deployment 16 target." 17 http://trac.webkit.org/changeset/205303 18 1 19 2016-09-01 Ricky Mondello <rmondello@apple.com> 2 20 -
trunk/Tools/MobileMiniBrowser/MobileMiniBrowser.xcodeproj/project.pbxproj
r205303 r205311 9 9 /* Begin PBXBuildFile section */ 10 10 CD1DAF971D709E3600017CF0 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = CD1DAF961D709E3600017CF0 /* main.m */; }; 11 CD1DAF9A1D709E3600017CF0 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CD1DAF991D709E3600017CF0 /* AppDelegate.m */; }; 12 CD1DAFA01D709E3600017CF0 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CD1DAF9E1D709E3600017CF0 /* Main.storyboard */; }; 13 CD1DAFA21D709E3600017CF0 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = CD1DAFA11D709E3600017CF0 /* Assets.xcassets */; }; 11 14 CD1DAFA51D709E3600017CF0 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CD1DAFA31D709E3600017CF0 /* LaunchScreen.storyboard */; }; 12 15 CD1DAFB01D709E3600017CF0 /* MobileMiniBrowserUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = CD1DAFAF1D709E3600017CF0 /* MobileMiniBrowserUITests.m */; }; 16 CD1DAFBE1D709EF200017CF0 /* TabViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CD1DAFBB1D709EF200017CF0 /* TabViewController.m */; }; 17 CD1DAFBF1D709EF200017CF0 /* WebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CD1DAFBD1D709EF200017CF0 /* WebViewController.m */; }; 13 18 CD1DAFC21D70E12D00017CF0 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD1DAFC11D70E12D00017CF0 /* WebKit.framework */; }; 14 CD498B421D76348000681FA7 /* MobileMiniBrowser.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD498B3B1D76348000681FA7 /* MobileMiniBrowser.framework */; };15 CD498B431D76348000681FA7 /* MobileMiniBrowser.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CD498B3B1D76348000681FA7 /* MobileMiniBrowser.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };16 CD498B4A1D763D4800681FA7 /* MobileMiniBrowser.h in Headers */ = {isa = PBXBuildFile; fileRef = CD498B481D7634C700681FA7 /* MobileMiniBrowser.h */; settings = {ATTRIBUTES = (Public, ); }; };17 CD498B4B1D763D7100681FA7 /* TabViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CD1DAFBB1D709EF200017CF0 /* TabViewController.m */; };18 CD498B4C1D763D7100681FA7 /* WebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CD1DAFBD1D709EF200017CF0 /* WebViewController.m */; };19 CD498B4D1D763D7100681FA7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CD1DAF991D709E3600017CF0 /* AppDelegate.m */; };20 CD498B4E1D763D7600681FA7 /* TabViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = CD1DAFBA1D709EF200017CF0 /* TabViewController.h */; };21 CD498B4F1D763D7600681FA7 /* WebViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = CD1DAFBC1D709EF200017CF0 /* WebViewController.h */; };22 CD498B501D763D7600681FA7 /* AppDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = CD1DAF981D709E3600017CF0 /* AppDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };23 CD498B511D763D7F00681FA7 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CD1DAF9E1D709E3600017CF0 /* Main.storyboard */; };24 CD498B521D763D8800681FA7 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = CD1DAFA11D709E3600017CF0 /* Assets.xcassets */; };25 CD498B531D763D9300681FA7 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = CD498B471D7634C700681FA7 /* Info.plist */; };26 CDA985191D76483400EBC399 /* test.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = CDA985151D76477900EBC399 /* test.mp4 */; };27 CDA9851A1D76483400EBC399 /* index.html in Resources */ = {isa = PBXBuildFile; fileRef = CDA985131D76474100EBC399 /* index.html */; };28 CDA9851B1D76483400EBC399 /* looping.html in Resources */ = {isa = PBXBuildFile; fileRef = CDA985171D7647CD00EBC399 /* looping.html */; };29 19 /* End PBXBuildFile section */ 30 20 … … 37 27 remoteInfo = MobileMiniBrowser; 38 28 }; 39 CD498B401D76348000681FA7 /* PBXContainerItemProxy */ = {40 isa = PBXContainerItemProxy;41 containerPortal = CD1DAF8A1D709E3600017CF0 /* Project object */;42 proxyType = 1;43 remoteGlobalIDString = CD498B3A1D76348000681FA7;44 remoteInfo = MobileMiniBrowser;45 };46 29 /* End PBXContainerItemProxy section */ 47 48 /* Begin PBXCopyFilesBuildPhase section */49 CD498B231D76341700681FA7 /* Embed Frameworks */ = {50 isa = PBXCopyFilesBuildPhase;51 buildActionMask = 2147483647;52 dstPath = "";53 dstSubfolderSpec = 10;54 files = (55 CD498B431D76348000681FA7 /* MobileMiniBrowser.framework in Embed Frameworks */,56 );57 name = "Embed Frameworks";58 runOnlyForDeploymentPostprocessing = 0;59 };60 /* End PBXCopyFilesBuildPhase section */61 30 62 31 /* Begin PBXFileReference section */ … … 77 46 CD1DAFBD1D709EF200017CF0 /* WebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebViewController.m; sourceTree = "<group>"; }; 78 47 CD1DAFC11D70E12D00017CF0 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = "../../WebKitBuild/Debug-iphonesimulator/WebKit.framework"; sourceTree = "<group>"; }; 79 CD498B3B1D76348000681FA7 /* MobileMiniBrowser.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MobileMiniBrowser.framework; sourceTree = BUILT_PRODUCTS_DIR; };80 CD498B471D7634C700681FA7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };81 CD498B481D7634C700681FA7 /* MobileMiniBrowser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MobileMiniBrowser.h; sourceTree = "<group>"; };82 CDA985131D76474100EBC399 /* index.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = index.html; path = Resources/index.html; sourceTree = "<group>"; };83 CDA985151D76477900EBC399 /* test.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; name = test.mp4; path = Resources/test.mp4; sourceTree = "<group>"; };84 CDA985171D7647CD00EBC399 /* looping.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = looping.html; path = Resources/looping.html; sourceTree = "<group>"; };85 48 /* End PBXFileReference section */ 86 49 … … 90 53 buildActionMask = 2147483647; 91 54 files = ( 92 CD498B421D76348000681FA7 /* MobileMiniBrowser.framework in Frameworks */,93 55 CD1DAFC21D70E12D00017CF0 /* WebKit.framework in Frameworks */, 94 56 ); … … 102 64 runOnlyForDeploymentPostprocessing = 0; 103 65 }; 104 CD498B371D76348000681FA7 /* Frameworks */ = {105 isa = PBXFrameworksBuildPhase;106 buildActionMask = 2147483647;107 files = (108 );109 runOnlyForDeploymentPostprocessing = 0;110 };111 66 /* End PBXFrameworksBuildPhase section */ 112 67 … … 115 70 isa = PBXGroup; 116 71 children = ( 117 CD1DAF941D709E3600017CF0 /* MobileMiniBrowser App */, 118 CD498B3C1D76348000681FA7 /* MobileMiniBrowser Framework */, 72 CD1DAF941D709E3600017CF0 /* MobileMiniBrowser */, 119 73 CD1DAFAE1D709E3600017CF0 /* MobileMiniBrowserUITests */, 120 74 CD1DAF931D709E3600017CF0 /* Products */, … … 128 82 CD1DAF921D709E3600017CF0 /* MobileMiniBrowser.app */, 129 83 CD1DAFAB1D709E3600017CF0 /* MobileMiniBrowserUITests.xctest */, 130 CD498B3B1D76348000681FA7 /* MobileMiniBrowser.framework */,131 84 ); 132 85 name = Products; 133 86 sourceTree = "<group>"; 134 87 }; 135 CD1DAF941D709E3600017CF0 /* MobileMiniBrowser App */ = { 136 isa = PBXGroup; 137 children = ( 138 CD1DAFA61D709E3600017CF0 /* Info.plist */, 139 CD1DAFA31D709E3600017CF0 /* LaunchScreen.storyboard */, 140 CD1DAF961D709E3600017CF0 /* main.m */, 141 ); 142 name = "MobileMiniBrowser App"; 143 path = MobileMiniBrowser; 144 sourceTree = "<group>"; 145 }; 146 CD1DAFAE1D709E3600017CF0 /* MobileMiniBrowserUITests */ = { 147 isa = PBXGroup; 148 children = ( 149 CD1DAFAF1D709E3600017CF0 /* MobileMiniBrowserUITests.m */, 150 CD1DAFB11D709E3600017CF0 /* Info.plist */, 151 ); 152 path = MobileMiniBrowserUITests; 153 sourceTree = "<group>"; 154 }; 155 CD1DAFC01D70E12D00017CF0 /* Frameworks */ = { 156 isa = PBXGroup; 157 children = ( 158 CD1DAFC11D70E12D00017CF0 /* WebKit.framework */, 159 ); 160 name = Frameworks; 161 sourceTree = "<group>"; 162 }; 163 CD498B3C1D76348000681FA7 /* MobileMiniBrowser Framework */ = { 164 isa = PBXGroup; 165 children = ( 166 CDA985121D76471700EBC399 /* Resources */, 167 CD1DAF981D709E3600017CF0 /* AppDelegate.h */, 168 CD1DAF991D709E3600017CF0 /* AppDelegate.m */, 169 CD1DAFA11D709E3600017CF0 /* Assets.xcassets */, 170 CD498B471D7634C700681FA7 /* Info.plist */, 171 CD1DAF9E1D709E3600017CF0 /* Main.storyboard */, 172 CD498B481D7634C700681FA7 /* MobileMiniBrowser.h */, 88 CD1DAF941D709E3600017CF0 /* MobileMiniBrowser */ = { 89 isa = PBXGroup; 90 children = ( 173 91 CD1DAFBA1D709EF200017CF0 /* TabViewController.h */, 174 92 CD1DAFBB1D709EF200017CF0 /* TabViewController.m */, 175 93 CD1DAFBC1D709EF200017CF0 /* WebViewController.h */, 176 94 CD1DAFBD1D709EF200017CF0 /* WebViewController.m */, 177 ); 178 name = "MobileMiniBrowser Framework"; 179 path = MobileMiniBrowserFramework; 180 sourceTree = SOURCE_ROOT; 181 }; 182 CDA985121D76471700EBC399 /* Resources */ = { 183 isa = PBXGroup; 184 children = ( 185 CDA985151D76477900EBC399 /* test.mp4 */, 186 CDA985131D76474100EBC399 /* index.html */, 187 CDA985171D7647CD00EBC399 /* looping.html */, 188 ); 189 name = Resources; 95 CD1DAF981D709E3600017CF0 /* AppDelegate.h */, 96 CD1DAF991D709E3600017CF0 /* AppDelegate.m */, 97 CD1DAF9E1D709E3600017CF0 /* Main.storyboard */, 98 CD1DAFA11D709E3600017CF0 /* Assets.xcassets */, 99 CD1DAFA31D709E3600017CF0 /* LaunchScreen.storyboard */, 100 CD1DAFA61D709E3600017CF0 /* Info.plist */, 101 CD1DAF951D709E3600017CF0 /* Supporting Files */, 102 ); 103 path = MobileMiniBrowser; 104 sourceTree = "<group>"; 105 }; 106 CD1DAF951D709E3600017CF0 /* Supporting Files */ = { 107 isa = PBXGroup; 108 children = ( 109 CD1DAF961D709E3600017CF0 /* main.m */, 110 ); 111 name = "Supporting Files"; 112 sourceTree = "<group>"; 113 }; 114 CD1DAFAE1D709E3600017CF0 /* MobileMiniBrowserUITests */ = { 115 isa = PBXGroup; 116 children = ( 117 CD1DAFAF1D709E3600017CF0 /* MobileMiniBrowserUITests.m */, 118 CD1DAFB11D709E3600017CF0 /* Info.plist */, 119 ); 120 path = MobileMiniBrowserUITests; 121 sourceTree = "<group>"; 122 }; 123 CD1DAFC01D70E12D00017CF0 /* Frameworks */ = { 124 isa = PBXGroup; 125 children = ( 126 CD1DAFC11D70E12D00017CF0 /* WebKit.framework */, 127 ); 128 name = Frameworks; 190 129 sourceTree = "<group>"; 191 130 }; 192 131 /* End PBXGroup section */ 193 194 /* Begin PBXHeadersBuildPhase section */195 CD498B381D76348000681FA7 /* Headers */ = {196 isa = PBXHeadersBuildPhase;197 buildActionMask = 2147483647;198 files = (199 CD498B4A1D763D4800681FA7 /* MobileMiniBrowser.h in Headers */,200 CD498B4F1D763D7600681FA7 /* WebViewController.h in Headers */,201 CD498B4E1D763D7600681FA7 /* TabViewController.h in Headers */,202 CD498B501D763D7600681FA7 /* AppDelegate.h in Headers */,203 );204 runOnlyForDeploymentPostprocessing = 0;205 };206 /* End PBXHeadersBuildPhase section */207 132 208 133 /* Begin PBXNativeTarget section */ … … 214 139 CD1DAF8F1D709E3600017CF0 /* Frameworks */, 215 140 CD1DAF901D709E3600017CF0 /* Resources */, 216 CD498B231D76341700681FA7 /* Embed Frameworks */,217 141 ); 218 142 buildRules = ( 219 143 ); 220 144 dependencies = ( 221 CD498B411D76348000681FA7 /* PBXTargetDependency */,222 145 ); 223 146 name = MobileMiniBrowser; … … 243 166 productReference = CD1DAFAB1D709E3600017CF0 /* MobileMiniBrowserUITests.xctest */; 244 167 productType = "com.apple.product-type.bundle.ui-testing"; 245 };246 CD498B3A1D76348000681FA7 /* MobileMiniBrowser.framework */ = {247 isa = PBXNativeTarget;248 buildConfigurationList = CD498B441D76348000681FA7 /* Build configuration list for PBXNativeTarget "MobileMiniBrowser.framework" */;249 buildPhases = (250 CD498B361D76348000681FA7 /* Sources */,251 CD498B371D76348000681FA7 /* Frameworks */,252 CD498B381D76348000681FA7 /* Headers */,253 CD498B391D76348000681FA7 /* Resources */,254 );255 buildRules = (256 );257 dependencies = (258 );259 name = MobileMiniBrowser.framework;260 productName = MobileMiniBrowser;261 productReference = CD498B3B1D76348000681FA7 /* MobileMiniBrowser.framework */;262 productType = "com.apple.product-type.framework";263 168 }; 264 169 /* End PBXNativeTarget section */ … … 278 183 TestTargetID = CD1DAF911D709E3600017CF0; 279 184 }; 280 CD498B3A1D76348000681FA7 = {281 CreatedOnToolsVersion = 8.0;282 ProvisioningStyle = Automatic;283 };284 185 }; 285 186 }; … … 299 200 CD1DAF911D709E3600017CF0 /* MobileMiniBrowser */, 300 201 CD1DAFAA1D709E3600017CF0 /* MobileMiniBrowserUITests */, 301 CD498B3A1D76348000681FA7 /* MobileMiniBrowser.framework */,302 202 ); 303 203 }; … … 310 210 files = ( 311 211 CD1DAFA51D709E3600017CF0 /* LaunchScreen.storyboard in Resources */, 212 CD1DAFA21D709E3600017CF0 /* Assets.xcassets in Resources */, 213 CD1DAFA01D709E3600017CF0 /* Main.storyboard in Resources */, 312 214 ); 313 215 runOnlyForDeploymentPostprocessing = 0; … … 317 219 buildActionMask = 2147483647; 318 220 files = ( 319 );320 runOnlyForDeploymentPostprocessing = 0;321 };322 CD498B391D76348000681FA7 /* Resources */ = {323 isa = PBXResourcesBuildPhase;324 buildActionMask = 2147483647;325 files = (326 CDA9851A1D76483400EBC399 /* index.html in Resources */,327 CD498B521D763D8800681FA7 /* Assets.xcassets in Resources */,328 CD498B511D763D7F00681FA7 /* Main.storyboard in Resources */,329 CDA9851B1D76483400EBC399 /* looping.html in Resources */,330 CD498B531D763D9300681FA7 /* Info.plist in Resources */,331 CDA985191D76483400EBC399 /* test.mp4 in Resources */,332 221 ); 333 222 runOnlyForDeploymentPostprocessing = 0; … … 340 229 buildActionMask = 2147483647; 341 230 files = ( 231 CD1DAFBE1D709EF200017CF0 /* TabViewController.m in Sources */, 232 CD1DAF9A1D709E3600017CF0 /* AppDelegate.m in Sources */, 342 233 CD1DAF971D709E3600017CF0 /* main.m in Sources */, 234 CD1DAFBF1D709EF200017CF0 /* WebViewController.m in Sources */, 343 235 ); 344 236 runOnlyForDeploymentPostprocessing = 0; … … 349 241 files = ( 350 242 CD1DAFB01D709E3600017CF0 /* MobileMiniBrowserUITests.m in Sources */, 351 );352 runOnlyForDeploymentPostprocessing = 0;353 };354 CD498B361D76348000681FA7 /* Sources */ = {355 isa = PBXSourcesBuildPhase;356 buildActionMask = 2147483647;357 files = (358 CD498B4B1D763D7100681FA7 /* TabViewController.m in Sources */,359 CD498B4C1D763D7100681FA7 /* WebViewController.m in Sources */,360 CD498B4D1D763D7100681FA7 /* AppDelegate.m in Sources */,361 243 ); 362 244 runOnlyForDeploymentPostprocessing = 0; … … 369 251 target = CD1DAF911D709E3600017CF0 /* MobileMiniBrowser */; 370 252 targetProxy = CD1DAFAC1D709E3600017CF0 /* PBXContainerItemProxy */; 371 };372 CD498B411D76348000681FA7 /* PBXTargetDependency */ = {373 isa = PBXTargetDependency;374 target = CD498B3A1D76348000681FA7 /* MobileMiniBrowser.framework */;375 targetProxy = CD498B401D76348000681FA7 /* PBXContainerItemProxy */;376 253 }; 377 254 /* End PBXTargetDependency section */ … … 490 367 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; 491 368 PRODUCT_BUNDLE_IDENTIFIER = org.webkit.MobileMiniBrowser; 492 PRODUCT_NAME = MobileMiniBrowser;369 PRODUCT_NAME = "$(TARGET_NAME)"; 493 370 }; 494 371 name = Debug; … … 501 378 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; 502 379 PRODUCT_BUNDLE_IDENTIFIER = org.webkit.MobileMiniBrowser; 503 PRODUCT_NAME = MobileMiniBrowser;380 PRODUCT_NAME = "$(TARGET_NAME)"; 504 381 }; 505 382 name = Release; … … 524 401 PRODUCT_NAME = "$(TARGET_NAME)"; 525 402 TEST_TARGET_NAME = MobileMiniBrowser; 526 };527 name = Release;528 };529 CD498B451D76348000681FA7 /* Debug */ = {530 isa = XCBuildConfiguration;531 buildSettings = {532 CODE_SIGN_IDENTITY = "";533 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";534 CURRENT_PROJECT_VERSION = 1;535 DEFINES_MODULE = YES;536 DYLIB_COMPATIBILITY_VERSION = 1;537 DYLIB_CURRENT_VERSION = 1;538 DYLIB_INSTALL_NAME_BASE = "@rpath";539 INFOPLIST_FILE = MobileMiniBrowser/Info.plist;540 INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";541 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";542 PRODUCT_BUNDLE_IDENTIFIER = org.webkit.MobileMiniBrowserFramework;543 PRODUCT_NAME = MobileMiniBrowser;544 SKIP_INSTALL = YES;545 VERSIONING_SYSTEM = "apple-generic";546 VERSION_INFO_PREFIX = "";547 };548 name = Debug;549 };550 CD498B461D76348000681FA7 /* Release */ = {551 isa = XCBuildConfiguration;552 buildSettings = {553 CODE_SIGN_IDENTITY = "";554 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";555 CURRENT_PROJECT_VERSION = 1;556 DEFINES_MODULE = YES;557 DYLIB_COMPATIBILITY_VERSION = 1;558 DYLIB_CURRENT_VERSION = 1;559 DYLIB_INSTALL_NAME_BASE = "@rpath";560 INFOPLIST_FILE = MobileMiniBrowser/Info.plist;561 INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";562 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";563 PRODUCT_BUNDLE_IDENTIFIER = org.webkit.MobileMiniBrowserFramework;564 PRODUCT_NAME = MobileMiniBrowser;565 SKIP_INSTALL = YES;566 VERSIONING_SYSTEM = "apple-generic";567 VERSION_INFO_PREFIX = "";568 403 }; 569 404 name = Release; … … 599 434 defaultConfigurationName = Release; 600 435 }; 601 CD498B441D76348000681FA7 /* Build configuration list for PBXNativeTarget "MobileMiniBrowser.framework" */ = {602 isa = XCConfigurationList;603 buildConfigurations = (604 CD498B451D76348000681FA7 /* Debug */,605 CD498B461D76348000681FA7 /* Release */,606 );607 defaultConfigurationIsVisible = 0;608 defaultConfigurationName = Release;609 };610 436 /* End XCConfigurationList section */ 611 437 }; -
trunk/Tools/MobileMiniBrowser/MobileMiniBrowser/AppDelegate.m
r205310 r205311 24 24 */ 25 25 26 #import "config.h"27 26 #import "AppDelegate.h" 28 27 29 #import "WebViewController.h" 28 @interface AppDelegate () 30 29 31 @interface AppDelegate ()32 30 @end 33 31 34 32 @implementation AppDelegate 35 33 34 36 35 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions 37 36 { 38 UIStoryboard *frameworkMainStoryboard = [UIStoryboard storyboardWithName:@"Main" bundle:[NSBundle bundleForClass:[AppDelegate class]]]; 39 WebViewController *viewController = [frameworkMainStoryboard instantiateInitialViewController]; 40 if (!viewController) 41 return NO; 42 43 if (!self.window) 44 self.window = [[UIWindow alloc] init]; 45 self.window.rootViewController = viewController; 46 [self.window makeKeyAndVisible]; 47 37 // Override point for customization after application launch. 48 38 return YES; 49 39 } -
trunk/Tools/MobileMiniBrowser/MobileMiniBrowser/Base.lproj/LaunchScreen.storyboard
r205295 r205311 1 <?xml version="1.0" encoding="UTF-8" ?>2 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="1 1191" systemVersion="16B2314" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">1 <?xml version="1.0" encoding="UTF-8" standalone="no"?> 2 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM"> 3 3 <dependencies> 4 4 <deployment version="2304" identifier="iOS"/> 5 <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="1 1156"/>5 <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/> 6 6 <capability name="Constraints to layout margins" minToolsVersion="6.0"/> 7 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>8 7 </dependencies> 9 8 <scenes> … … 11 10 <scene sceneID="EHf-IW-A2E"> 12 11 <objects> 13 <viewController storyboardIdentifier="idViewController"id="01J-lp-oVM" sceneMemberID="viewController">12 <viewController id="01J-lp-oVM" sceneMemberID="viewController"> 14 13 <layoutGuides> 15 14 <viewControllerLayoutGuide type="top" id="Llm-lL-Icb"/> … … 17 16 </layoutGuides> 18 17 <view key="view" contentMode="scaleToFill" id="9qo-7e-hd1"> 19 <rect key="frame" x="0.0" y="0.0" width=" 375" height="667"/>18 <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> 20 19 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> 21 20 <subviews> 22 <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="F7I-Hn-oUR"> 21 <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="F7I-Hn-oUR"> 22 <rect key="frame" x="0.0" y="0.0" width="0.0" height="44"/> 23 23 <constraints> 24 24 <constraint firstAttribute="height" constant="44" id="h95-xh-m8y"/> … … 34 34 </items> 35 35 </toolbar> 36 <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7Vg-6f-OBr" userLabel="URL Field Container">36 <view clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7Vg-6f-OBr" userLabel="URL Field Container"> 37 37 <subviews> 38 <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nX4-D6-AXV"> 38 <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="nX4-D6-AXV"> 39 <rect key="frame" x="0.0" y="0.0" width="0.0" height="45"/> 39 40 <items/> 40 41 </toolbar> 41 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="249" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="L4i-oL-VFG"> 42 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="249" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="L4i-oL-VFG"> 43 <rect key="frame" x="0.0" y="0.0" width="0.0" height="30"/> 42 44 <nil key="textColor"/> 43 45 <fontDescription key="fontDescription" type="system" pointSize="14"/> 44 46 <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" keyboardType="URL" returnKeyType="go" enablesReturnKeyAutomatically="YES"/> 45 47 </textField> 46 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1CE-0G-4aC">48 <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1CE-0G-4aC"> 47 49 <constraints> 48 50 <constraint firstAttribute="width" constant="45.999999999999886" id="Az8-yd-X45"/> … … 50 52 <state key="normal" title="Go"/> 51 53 </button> 52 <progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vYP-Mc-B8q"/> 54 <progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vYP-Mc-B8q"> 55 <rect key="frame" x="0.0" y="0.0" width="0.0" height="2"/> 56 </progressView> 53 57 </subviews> 54 58 <constraints> … … 69 73 </view> 70 74 </subviews> 71 <color key="backgroundColor" red="1" green=" 0.99997437000274658" blue="0.99999129772186279" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>75 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> 72 76 <constraints> 73 77 <constraint firstItem="F7I-Hn-oUR" firstAttribute="top" secondItem="Llm-lL-Icb" secondAttribute="bottom" id="Dbb-TN-26g"/> -
trunk/Tools/MobileMiniBrowser/MobileMiniBrowser/Base.lproj/Main.storyboard
r205310 r205311 1 <?xml version="1.0" encoding="UTF-8" ?>2 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="1 1191" systemVersion="16B2314" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="Ohh-6U-lsQ">1 <?xml version="1.0" encoding="UTF-8" standalone="no"?> 2 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="Ohh-6U-lsQ"> 3 3 <dependencies> 4 4 <deployment version="2304" identifier="iOS"/> 5 <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11156"/> 6 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> 5 <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/> 7 6 </dependencies> 8 7 <scenes> … … 16 15 </layoutGuides> 17 16 <view key="view" contentMode="scaleToFill" id="1WJ-am-PnB"> 18 <rect key="frame" x="0.0" y="0.0" width=" 375" height="667"/>17 <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> 19 18 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> 20 19 <subviews> 21 <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SYm-x3-D12"> 20 <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="SYm-x3-D12"> 21 <rect key="frame" x="0.0" y="0.0" width="0.0" height="44"/> 22 22 <constraints> 23 23 <constraint firstAttribute="height" constant="44" id="0IC-RY-cRv"/> … … 49 49 </items> 50 50 </toolbar> 51 <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Wkd-K8-BC1" userLabel="URL Field Container">51 <view clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Wkd-K8-BC1" userLabel="URL Field Container"> 52 52 <subviews> 53 <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SSg-5u-loI"> 53 <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="SSg-5u-loI"> 54 <rect key="frame" x="0.0" y="0.0" width="0.0" height="46"/> 54 55 <items/> 55 56 </toolbar> 56 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="249" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="n4f-v4-gO4"> 57 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="249" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="n4f-v4-gO4"> 58 <rect key="frame" x="0.0" y="0.0" width="0.0" height="30"/> 57 59 <accessibility key="accessibilityConfiguration" identifier="idURLField" label="URL Field"/> 58 60 <nil key="textColor"/> … … 64 66 </connections> 65 67 </textField> 66 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qSw-Ym-IBE">68 <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qSw-Ym-IBE"> 67 69 <accessibility key="accessibilityConfiguration" identifier="idGoToURL" label="Go To URL"/> 68 70 <constraints> … … 74 76 </connections> 75 77 </button> 76 <progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" progress="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="2bJ-bG-4SW"/> 78 <progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" misplaced="YES" progress="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="2bJ-bG-4SW"> 79 <rect key="frame" x="0.0" y="0.0" width="0.0" height="2"/> 80 </progressView> 77 81 </subviews> 78 82 <constraints> … … 92 96 </constraints> 93 97 </view> 94 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="719-Zt-fvZ" userLabel="Web View Container">95 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>98 <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="719-Zt-fvZ" userLabel="Web View Container"> 99 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> 96 100 <accessibility key="accessibilityConfiguration" label="Web View Container"/> 97 101 </view> 98 102 </subviews> 99 <color key="backgroundColor" red="1" green=" 0.99997437000274658" blue="0.99999129772186279" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>103 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> 100 104 <constraints> 101 105 <constraint firstItem="Wkd-K8-BC1" firstAttribute="leading" secondItem="1WJ-am-PnB" secondAttribute="leading" id="2cZ-lB-Wel"/> … … 132 136 <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> 133 137 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> 134 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>138 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> 135 139 <prototypes> 136 140 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="idTabViewCustomCell" selectionStyle="default" indentationWidth="10" id="Bxf-dM-uYf"> … … 138 142 <autoresizingMask key="autoresizingMask"/> 139 143 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Bxf-dM-uYf" id="lpb-yc-EJ5"> 140 < frame key="frameInset" width="375" height="44"/>144 <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/> 141 145 <autoresizingMask key="autoresizingMask"/> 142 146 </tableViewCellContentView> -
trunk/Tools/MobileMiniBrowser/MobileMiniBrowser/Info.plist
r205295 r205311 23 23 <key>UILaunchStoryboardName</key> 24 24 <string>LaunchScreen</string> 25 <key>UIMainStoryboardFile</key> 26 <string>Main</string> 25 27 <key>UIRequiredDeviceCapabilities</key> 26 28 <array> -
trunk/Tools/MobileMiniBrowser/MobileMiniBrowser/TabViewController.m
r205310 r205311 24 24 */ 25 25 26 #import "config.h"27 26 #import "TabViewController.h" 28 27 -
trunk/Tools/MobileMiniBrowser/MobileMiniBrowser/WebViewController.m
r205310 r205311 24 24 */ 25 25 26 #import "config.h"27 26 #import "WebViewController.h" 28 27 … … 33 32 #import <WebKit/WKWebViewConfiguration.h> 34 33 35 @implementation NSURL (BundleURLMethods)36 + (NSURL *)__bundleURLForFileURL:(NSURL *)url bundle:(NSBundle *)bundle37 {38 if (![url.scheme isEqualToString:@"file"])39 return nil;40 NSString *resourcePath = [bundle.resourcePath stringByAppendingString:@"/"];41 if (![url.path hasPrefix:resourcePath])42 return nil;43 NSURLComponents *bundleComponents = [[NSURLComponents alloc] init];44 bundleComponents.scheme = @"bundle";45 bundleComponents.path = [url.path substringFromIndex:resourcePath.length];46 return [bundleComponents.URL copy];47 }48 49 + (NSURL *)__fileURLForBundleURL:(NSURL *)url bundle:(NSBundle *)bundle50 {51 if (![url.scheme isEqualToString:@"bundle"])52 return nil;53 return [bundle.resourceURL URLByAppendingPathComponent:url.path];54 }55 @end56 57 34 @interface WebViewController () <WKNavigationDelegate> { 58 35 WKWebView *_currentWebView; … … 114 91 if ([requestedDestination rangeOfString:@"^[\\p{Alphabetic}]+:" options:(NSRegularExpressionSearch | NSCaseInsensitiveSearch | NSAnchoredSearch)].location == NSNotFound) 115 92 requestedDestination = [@"http://" stringByAppendingString:requestedDestination]; 116 NSURL* requestedURL = [NSURL URLWithString:requestedDestination]; 117 if ([requestedURL.scheme isEqualToString:@"bundle"]) { 118 NSBundle *frameworkBundle = [NSBundle bundleForClass:[WebViewController class]]; 119 requestedURL = [NSURL __fileURLForBundleURL:requestedURL bundle:frameworkBundle]; 120 [self.currentWebView loadFileURL:requestedURL allowingReadAccessToURL:frameworkBundle.resourceURL]; 121 } 122 [self.currentWebView loadRequest:[NSURLRequest requestWithURL:requestedURL]]; 93 [self.currentWebView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:requestedDestination]]]; 123 94 } 124 95 125 96 - (IBAction)showTabs:(id)sender 126 97 { 127 [self presentViewController:self.tabViewController animated:YES completion: nil];98 [self presentViewController:self.tabViewController animated:YES completion:^{ }]; 128 99 self.tabViewController.popoverPresentationController.barButtonItem = self.tabButton; 129 100 } … … 216 187 [self.progressView setProgress:value animated:YES]; 217 188 } else if (context == URLContext) { 218 NSURL *newURLValue = [change valueForKey:NSKeyValueChangeNewKey]; 219 if ([newURLValue isKindOfClass:[NSURL class]]) { 220 if ([newURLValue.scheme isEqualToString:@"file"]) 221 newURLValue = [NSURL __bundleURLForFileURL:newURLValue bundle:[NSBundle bundleForClass:[WebViewController class]]]; 189 id newURLValue = [change valueForKey:NSKeyValueChangeNewKey]; 190 if ([newURLValue isKindOfClass:[NSURL class]]) 222 191 self.urlField.text = [newURLValue absoluteString]; 223 }else if ([newURLValue isKindOfClass:[NSNull class]])192 else if ([newURLValue isKindOfClass:[NSNull class]]) 224 193 self.urlField.text = @""; 225 194 } else if (context == TitleContext) -
trunk/Tools/MobileMiniBrowser/MobileMiniBrowser/main.m
r205295 r205311 24 24 */ 25 25 26 #import <MobileMiniBrowser/MobileMiniBrowser.h> 26 #import "AppDelegate.h" 27 #import <UIKit/UIKit.h> 27 28 28 29 int main(int argc, char * argv[]) -
trunk/Tools/MobileMiniBrowser/MobileMiniBrowserUITests/MobileMiniBrowserUITests.m
r205295 r205311 61 61 if (clearButton.exists) 62 62 [clearButton tap]; 63 [urlField typeText:@" bundle:/looping.html"];63 [urlField typeText:@"http://test-safari.apple.com/"]; 64 64 [app.buttons[@"Go To URL"] tap]; 65 66 XCUIElement *captions = app.links[@"Captions"]; 67 [self expectationForPredicate:exists evaluatedWithObject:captions handler:nil]; 68 [self waitForExpectationsWithTimeout:5.0 handler:nil]; 69 [captions tap]; 70 71 XCUIElement *viewInPage = app.links[@"Video in page"]; 72 [self expectationForPredicate:exists evaluatedWithObject:viewInPage handler:nil]; 73 [self waitForExpectationsWithTimeout:5.0 handler:nil]; 74 [viewInPage tap]; 65 75 66 76 XCUIElement *startPlayback = app.buttons[@"Start Playback"];
Note: See TracChangeset
for help on using the changeset viewer.