Title: [205073] trunk/Tools
- Revision
- 205073
- Author
- [email protected]
- Date
- 2016-08-26 22:44:01 -0700 (Fri, 26 Aug 2016)
Log Message
Keep trying to fix the build after r205057.
* MobileMiniBrowser/MobileMiniBrowser/AppDelegate.m: Don’t try to import nonexistent
config.h. This file is only meant to be built with Xcode anyway.
* MobileMiniBrowser/MobileMiniBrowser/Base.lproj/LaunchScreen.storyboard: Make this compile
with Xcode 7.3 and deploy to iOS 9.0.
* MobileMiniBrowser/MobileMiniBrowser/Base.lproj/Main.storyboard: Ditto.
* MobileMiniBrowser/MobileMiniBrowser/TabViewController.m: Don’t try to import config.h.
* MobileMiniBrowser/MobileMiniBrowser/WebViewController.m: Ditto.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (205072 => 205073)
--- trunk/Tools/ChangeLog 2016-08-27 04:39:28 UTC (rev 205072)
+++ trunk/Tools/ChangeLog 2016-08-27 05:44:01 UTC (rev 205073)
@@ -1,5 +1,17 @@
2016-08-26 Dan Bernstein <[email protected]>
+ Keep trying to fix the build after r205057.
+
+ * MobileMiniBrowser/MobileMiniBrowser/AppDelegate.m: Don’t try to import nonexistent
+ config.h. This file is only meant to be built with Xcode anyway.
+ * MobileMiniBrowser/MobileMiniBrowser/Base.lproj/LaunchScreen.storyboard: Make this compile
+ with Xcode 7.3 and deploy to iOS 9.0.
+ * MobileMiniBrowser/MobileMiniBrowser/Base.lproj/Main.storyboard: Ditto.
+ * MobileMiniBrowser/MobileMiniBrowser/TabViewController.m: Don’t try to import config.h.
+ * MobileMiniBrowser/MobileMiniBrowser/WebViewController.m: Ditto.
+
+2016-08-26 Dan Bernstein <[email protected]>
+
Start trying to fix the build after r205057.
* MobileMiniBrowser/MobileMiniBrowser.xcodeproj/project.pbxproj:
Modified: trunk/Tools/MobileMiniBrowser/MobileMiniBrowser/AppDelegate.m (205072 => 205073)
--- trunk/Tools/MobileMiniBrowser/MobileMiniBrowser/AppDelegate.m 2016-08-27 04:39:28 UTC (rev 205072)
+++ trunk/Tools/MobileMiniBrowser/MobileMiniBrowser/AppDelegate.m 2016-08-27 05:44:01 UTC (rev 205073)
@@ -23,7 +23,6 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import "config.h"
#import "AppDelegate.h"
@interface AppDelegate ()
Modified: trunk/Tools/MobileMiniBrowser/MobileMiniBrowser/Base.lproj/LaunchScreen.storyboard (205072 => 205073)
--- trunk/Tools/MobileMiniBrowser/MobileMiniBrowser/Base.lproj/LaunchScreen.storyboard 2016-08-27 04:39:28 UTC (rev 205072)
+++ trunk/Tools/MobileMiniBrowser/MobileMiniBrowser/Base.lproj/LaunchScreen.storyboard 2016-08-27 05:44:01 UTC (rev 205073)
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11191" systemVersion="16A291" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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">
<dependencies>
- <deployment identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11156"/>
+ <deployment version="2304" identifier="iOS"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
- <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
@@ -16,10 +15,11 @@
<viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="9qo-7e-hd1">
- <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+ <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="F7I-Hn-oUR">
+ <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="F7I-Hn-oUR">
+ <rect key="frame" x="0.0" y="0.0" width="0.0" height="44"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="h95-xh-m8y"/>
</constraints>
@@ -33,23 +33,27 @@
<barButtonItem title="Tabs" id="dXJ-Pm-BgJ"/>
</items>
</toolbar>
- <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7Vg-6f-OBr" userLabel="URL Field Container">
+ <view clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7Vg-6f-OBr" userLabel="URL Field Container">
<subviews>
- <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nX4-D6-AXV">
+ <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="nX4-D6-AXV">
+ <rect key="frame" x="0.0" y="0.0" width="0.0" height="45"/>
<items/>
</toolbar>
- <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">
+ <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">
+ <rect key="frame" x="0.0" y="0.0" width="0.0" height="30"/>
<nil key="textColor"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" keyboardType="URL" returnKeyType="go" enablesReturnKeyAutomatically="YES"/>
</textField>
- <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1CE-0G-4aC">
+ <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1CE-0G-4aC">
<constraints>
<constraint firstAttribute="width" constant="45.999999999999886" id="Az8-yd-X45"/>
</constraints>
<state key="normal" title="Go"/>
</button>
- <progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vYP-Mc-B8q"/>
+ <progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vYP-Mc-B8q">
+ <rect key="frame" x="0.0" y="0.0" width="0.0" height="2"/>
+ </progressView>
</subviews>
<constraints>
<constraint firstItem="nX4-D6-AXV" firstAttribute="top" secondItem="7Vg-6f-OBr" secondAttribute="top" constant="-1" id="2rs-N5-Hdo"/>
Modified: trunk/Tools/MobileMiniBrowser/MobileMiniBrowser/Base.lproj/Main.storyboard (205072 => 205073)
--- trunk/Tools/MobileMiniBrowser/MobileMiniBrowser/Base.lproj/Main.storyboard 2016-08-27 04:39:28 UTC (rev 205072)
+++ trunk/Tools/MobileMiniBrowser/MobileMiniBrowser/Base.lproj/Main.storyboard 2016-08-27 05:44:01 UTC (rev 205073)
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11191" systemVersion="16A291" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="Ohh-6U-lsQ">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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">
<dependencies>
- <deployment identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11156"/>
- <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+ <deployment version="2304" identifier="iOS"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
</dependencies>
<scenes>
<!--Web View-->
@@ -15,10 +14,11 @@
<viewControllerLayoutGuide type="bottom" id="mUo-dB-Gut"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="1WJ-am-PnB">
- <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+ <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SYm-x3-D12">
+ <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="SYm-x3-D12">
+ <rect key="frame" x="0.0" y="0.0" width="0.0" height="44"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="0IC-RY-cRv"/>
</constraints>
@@ -48,12 +48,14 @@
</barButtonItem>
</items>
</toolbar>
- <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Wkd-K8-BC1" userLabel="URL Field Container">
+ <view clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Wkd-K8-BC1" userLabel="URL Field Container">
<subviews>
- <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SSg-5u-loI">
+ <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="SSg-5u-loI">
+ <rect key="frame" x="0.0" y="0.0" width="0.0" height="46"/>
<items/>
</toolbar>
- <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">
+ <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">
+ <rect key="frame" x="0.0" y="0.0" width="0.0" height="30"/>
<accessibility key="accessibilityConfiguration" identifier="idURLField" label="URL Field"/>
<nil key="textColor"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -63,7 +65,7 @@
<action selector="urlFieldEditingBegan:" destination="Ohh-6U-lsQ" eventType="editingDidBegin" id="VDr-b6-Z9E"/>
</connections>
</textField>
- <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qSw-Ym-IBE">
+ <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qSw-Ym-IBE">
<accessibility key="accessibilityConfiguration" identifier="idGoToURL" label="Go To URL"/>
<constraints>
<constraint firstAttribute="width" constant="45.999999999999886" id="hr8-Tf-lDT"/>
@@ -73,7 +75,9 @@
<action selector="navigateTo:" destination="Ohh-6U-lsQ" eventType="touchUpInside" id="va2-3J-Gmh"/>
</connections>
</button>
- <progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" progress="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="2bJ-bG-4SW"/>
+ <progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" misplaced="YES" progress="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="2bJ-bG-4SW">
+ <rect key="frame" x="0.0" y="0.0" width="0.0" height="2"/>
+ </progressView>
</subviews>
<constraints>
<constraint firstItem="SSg-5u-loI" firstAttribute="trailing" secondItem="Wkd-K8-BC1" secondAttribute="trailing" id="6KS-dw-2cN"/>
@@ -91,7 +95,7 @@
<constraint firstAttribute="height" constant="44" id="zaj-6L-uzc"/>
</constraints>
</view>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="719-Zt-fvZ" userLabel="Web View Container">
+ <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="719-Zt-fvZ" userLabel="Web View Container">
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<accessibility key="accessibilityConfiguration" label="Web View Container"/>
</view>
@@ -137,7 +141,7 @@
<rect key="frame" x="0.0" y="28" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Bxf-dM-uYf" id="lpb-yc-EJ5">
- <frame key="frameInset" width="375" height="43.5"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
</tableViewCellContentView>
</tableViewCell>
Modified: trunk/Tools/MobileMiniBrowser/MobileMiniBrowser/TabViewController.m (205072 => 205073)
--- trunk/Tools/MobileMiniBrowser/MobileMiniBrowser/TabViewController.m 2016-08-27 04:39:28 UTC (rev 205072)
+++ trunk/Tools/MobileMiniBrowser/MobileMiniBrowser/TabViewController.m 2016-08-27 05:44:01 UTC (rev 205073)
@@ -23,7 +23,6 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import "config.h"
#import "TabViewController.h"
#import "WebViewController.h"
Modified: trunk/Tools/MobileMiniBrowser/MobileMiniBrowser/WebViewController.m (205072 => 205073)
--- trunk/Tools/MobileMiniBrowser/MobileMiniBrowser/WebViewController.m 2016-08-27 04:39:28 UTC (rev 205072)
+++ trunk/Tools/MobileMiniBrowser/MobileMiniBrowser/WebViewController.m 2016-08-27 05:44:01 UTC (rev 205073)
@@ -23,7 +23,6 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import "config.h"
#import "WebViewController.h"
#import "TabViewController.h"
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
