Updated iOSSampleApp and related files.
Removed include guard in SkTime_Unix.cpp, which the iOSSampleApp now uses.
git-svn-id: http://skia.googlecode.com/svn/trunk@1820 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/experimental/iOSSampleApp/iPad/MainWindow_iPad.xib b/experimental/iOSSampleApp/iPad/MainWindow_iPad.xib
index 4be60f2..898dd18 100644
--- a/experimental/iOSSampleApp/iPad/MainWindow_iPad.xib
+++ b/experimental/iOSSampleApp/iPad/MainWindow_iPad.xib
@@ -2,7 +2,7 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1056</int>
- <string key="IBDocument.SystemVersion">10J3250</string>
+ <string key="IBDocument.SystemVersion">10J4138</string>
<string key="IBDocument.InterfaceBuilderVersion">851</string>
<string key="IBDocument.AppKitVersion">1038.35</string>
<string key="IBDocument.HIToolboxVersion">461.00</string>
@@ -12,7 +12,7 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="54"/>
+ <integer value="52"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -62,10 +62,10 @@
<int key="IBUIStatusBarStyle">2</int>
</object>
<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
- <int key="interfaceOrientation">3</int>
+ <int key="interfaceOrientation">1</int>
</object>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <bool key="IBUIHorizontal">YES</bool>
+ <bool key="IBUIHorizontal">NO</bool>
<object class="IBUINavigationController" key="IBUIMasterViewController" id="524408385">
<reference key="IBUIParentViewController" ref="143532475"/>
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics">
@@ -91,9 +91,9 @@
<object class="IBUITableView" key="IBUIView" id="805122470">
<reference key="NSNextResponder"/>
<int key="NSvFlags">274</int>
- <string key="NSFrameSize">{320, 704}</string>
+ <string key="NSFrameSize">{320, 960}</string>
<reference key="NSSuperview"/>
- <object class="NSColor" key="IBUIBackgroundColor">
+ <object class="NSColor" key="IBUIBackgroundColor" id="933040628">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
</object>
@@ -134,7 +134,7 @@
<object class="IBUINavigationBar" id="532491637">
<reference key="NSNextResponder" ref="662500735"/>
<int key="NSvFlags">290</int>
- <string key="NSFrameSize">{703, 44}</string>
+ <string key="NSFrameSize">{768, 44}</string>
<reference key="NSSuperview" ref="662500735"/>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@@ -154,16 +154,81 @@
</object>
</object>
</object>
- </object>
- <string key="NSFrameSize">{703, 748}</string>
- <reference key="NSSuperview"/>
- <object class="NSColor" key="IBUIBackgroundColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MQA</bytes>
- <object class="NSColorSpace" key="NSCustomColorSpace">
- <int key="NSID">2</int>
+ <object class="IBUIToolbar" id="872721022">
+ <reference key="NSNextResponder" ref="662500735"/>
+ <int key="NSvFlags">266</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUISwitch" id="241745124">
+ <reference key="NSNextResponder" ref="872721022"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{584, 9}, {94, 27}}</string>
+ <reference key="NSSuperview" ref="872721022"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ </object>
+ </object>
+ <string key="NSFrame">{{0, 960}, {768, 44}}</string>
+ <reference key="NSSuperview" ref="662500735"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <int key="IBUIBarStyle">1</int>
+ <object class="NSMutableArray" key="IBUIItems">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUIBarButtonItem" id="732530149">
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <reference key="IBUIToolbar" ref="872721022"/>
+ <int key="IBUISystemItemIdentifier">5</int>
+ </object>
+ <object class="IBUIBarButtonItem" id="829573230">
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <float key="IBUIWidth">55</float>
+ <reference key="IBUIToolbar" ref="872721022"/>
+ <int key="IBUISystemItemIdentifier">6</int>
+ </object>
+ <object class="IBUIBarButtonItem" id="780237299">
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <int key="IBUIStyle">1</int>
+ <reference key="IBUICustomView" ref="241745124"/>
+ <reference key="IBUIToolbar" ref="872721022"/>
+ </object>
+ <object class="IBUIBarButtonItem" id="247862273">
+ <string key="IBUITitle">Server iP</string>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <int key="IBUIStyle">1</int>
+ <reference key="IBUIToolbar" ref="872721022"/>
+ </object>
+ </object>
+ </object>
+ <object class="IBUILabel" id="65333785">
+ <reference key="NSNextResponder" ref="662500735"/>
+ <int key="NSvFlags">265</int>
+ <string key="NSFrame">{{526, 967}, {49, 29}}</string>
+ <reference key="NSSuperview" ref="662500735"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">Pipe</string>
+ <object class="NSFont" key="IBUIFont">
+ <string key="NSName">Helvetica</string>
+ <double key="NSSize">24</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <reference key="IBUITextColor" ref="933040628"/>
+ <reference key="IBUIHighlightedColor" ref="933040628"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUITextAlignment">1</int>
</object>
</object>
+ <string key="NSFrameSize">{768, 1004}</string>
+ <reference key="NSSuperview"/>
+ <reference key="IBUIBackgroundColor" ref="933040628"/>
<bool key="IBUIMultipleTouchEnabled">YES</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
</object>
@@ -268,6 +333,23 @@
</object>
<int key="connectionID">96</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">usePipe:</string>
+ <reference key="source" ref="241745124"/>
+ <reference key="destination" ref="324576857"/>
+ <int key="IBEventType">13</int>
+ </object>
+ <int key="connectionID">110</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">enterServerIP:</string>
+ <reference key="source" ref="247862273"/>
+ <reference key="destination" ref="324576857"/>
+ </object>
+ <int key="connectionID">129</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -357,10 +439,17 @@
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="532491637"/>
+ <reference ref="872721022"/>
+ <reference ref="65333785"/>
</object>
<reference key="parent" ref="324576857"/>
</object>
<object class="IBObjectRecord">
+ <int key="objectID">89</int>
+ <reference key="object" ref="805122470"/>
+ <reference key="parent" ref="714382558"/>
+ </object>
+ <object class="IBObjectRecord">
<int key="objectID">64</int>
<reference key="object" ref="532491637"/>
<object class="NSMutableArray" key="children">
@@ -379,15 +468,56 @@
<reference key="parent" ref="532491637"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">89</int>
- <reference key="object" ref="805122470"/>
- <reference key="parent" ref="714382558"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">94</int>
<reference key="object" ref="271380391"/>
<reference key="parent" ref="719745349"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">106</int>
+ <reference key="object" ref="872721022"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="732530149"/>
+ <reference ref="829573230"/>
+ <reference ref="780237299"/>
+ <reference ref="247862273"/>
+ </object>
+ <reference key="parent" ref="662500735"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">113</int>
+ <reference key="object" ref="732530149"/>
+ <reference key="parent" ref="872721022"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">123</int>
+ <reference key="object" ref="65333785"/>
+ <reference key="parent" ref="662500735"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">126</int>
+ <reference key="object" ref="829573230"/>
+ <reference key="parent" ref="872721022"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">109</int>
+ <reference key="object" ref="780237299"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="241745124"/>
+ </object>
+ <reference key="parent" ref="872721022"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">108</int>
+ <reference key="object" ref="241745124"/>
+ <reference key="parent" ref="780237299"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">127</int>
+ <reference key="object" ref="247862273"/>
+ <reference key="parent" ref="872721022"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -396,6 +526,14 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>-1.CustomClassName</string>
<string>-2.CustomClassName</string>
+ <string>106.IBPluginDependency</string>
+ <string>106.IBViewBoundsToFrameTransform</string>
+ <string>108.IBPluginDependency</string>
+ <string>113.IBPluginDependency</string>
+ <string>123.IBPluginDependency</string>
+ <string>123.IBViewBoundsToFrameTransform</string>
+ <string>126.IBPluginDependency</string>
+ <string>127.IBPluginDependency</string>
<string>2.IBEditorWindowLastContentRect</string>
<string>2.IBPluginDependency</string>
<string>52.CustomClassName</string>
@@ -423,10 +561,22 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>UIApplication</string>
<string>UIResponder</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAAAAAAAAxDqAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABD8AAAxHiAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>{{125, 4}, {768, 1024}}</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>SkUISplitViewController</string>
- <string>{{105, 216}, {1024, 768}}</string>
+ <string>{{-34, 57}, {768, 1024}}</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>SkUIDetailViewController</string>
@@ -444,7 +594,7 @@
</object>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABBYAAAwigAAA</bytes>
+ <bytes key="NSTransformStruct">P4AAAL+AAAAAAAAAwigAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -467,7 +617,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">96</int>
+ <int key="maxID">129</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -519,20 +669,14 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>handleDoubleTapGesture:</string>
- <string>handlePanGesture:</string>
- <string>handlePinchGesture:</string>
- <string>handleRotationGesture:</string>
- <string>handleSwipeGesture:</string>
+ <string>enterServerIP:</string>
<string>printContent:</string>
+ <string>usePipe:</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>UIGestureRecognizer</string>
- <string>UIPanGestureRecognizer</string>
- <string>UIPinchGestureRecognizer</string>
- <string>UIRotationGestureRecognizer</string>
- <string>UISwipeGestureRecognizer</string>
+ <string>id</string>
+ <string>id</string>
<string>id</string>
</object>
</object>
@@ -540,39 +684,24 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>handleDoubleTapGesture:</string>
- <string>handlePanGesture:</string>
- <string>handlePinchGesture:</string>
- <string>handleRotationGesture:</string>
- <string>handleSwipeGesture:</string>
+ <string>enterServerIP:</string>
<string>printContent:</string>
+ <string>usePipe:</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBActionInfo">
- <string key="name">handleDoubleTapGesture:</string>
- <string key="candidateClassName">UIGestureRecognizer</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">handlePanGesture:</string>
- <string key="candidateClassName">UIPanGestureRecognizer</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">handlePinchGesture:</string>
- <string key="candidateClassName">UIPinchGestureRecognizer</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">handleRotationGesture:</string>
- <string key="candidateClassName">UIRotationGestureRecognizer</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">handleSwipeGesture:</string>
- <string key="candidateClassName">UISwipeGestureRecognizer</string>
+ <string key="name">enterServerIP:</string>
+ <string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">printContent:</string>
<string key="candidateClassName">id</string>
</object>
+ <object class="IBActionInfo">
+ <string key="name">usePipe:</string>
+ <string key="candidateClassName">id</string>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
@@ -657,7 +786,7 @@
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">SkUISplitViewController.h</string>
+ <string key="minorKey">iPad/SkUISplitViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -745,20 +874,6 @@
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
</object>
</object>
@@ -801,18 +916,19 @@
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">UIGestureRecognizer</string>
- <string key="superclassName">NSObject</string>
+ <string key="className">UIControl</string>
+ <string key="superclassName">UIView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIGestureRecognizer.h</string>
+ <string key="minorKey">UIKit.framework/Headers/UIControl.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">UIGestureRecognizer</string>
+ <string key="className">UILabel</string>
+ <string key="superclassName">UIView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIGestureRecognizerSubclass.h</string>
+ <string key="minorKey">UIKit.framework/Headers/UILabel.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -837,35 +953,11 @@
<reference key="sourceIdentifier" ref="840300946"/>
</object>
<object class="IBPartialClassDescription">
- <string key="className">UIPanGestureRecognizer</string>
- <string key="superclassName">UIGestureRecognizer</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIPanGestureRecognizer.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIPinchGestureRecognizer</string>
- <string key="superclassName">UIGestureRecognizer</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIPinchGestureRecognizer.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
<string key="className">UIResponder</string>
<string key="superclassName">NSObject</string>
<reference key="sourceIdentifier" ref="786211723"/>
</object>
<object class="IBPartialClassDescription">
- <string key="className">UIRotationGestureRecognizer</string>
- <string key="superclassName">UIGestureRecognizer</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIRotationGestureRecognizer.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
<string key="className">UIScrollView</string>
<string key="superclassName">UIView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -898,11 +990,11 @@
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">UISwipeGestureRecognizer</string>
- <string key="superclassName">UIGestureRecognizer</string>
+ <string key="className">UISwitch</string>
+ <string key="superclassName">UIControl</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISwipeGestureRecognizer.h</string>
+ <string key="minorKey">UIKit.framework/Headers/UISwitch.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -922,6 +1014,14 @@
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">UIToolbar</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIToolbar.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">UIView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
@@ -994,7 +1094,7 @@
<integer value="3100" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
- <string key="IBDocument.LastKnownRelativeProjectPath">../iOSShell.xcodeproj</string>
+ <string key="IBDocument.LastKnownRelativeProjectPath">../iOSSampleApp.xcodeproj</string>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<string key="IBCocoaTouchPluginVersion">141</string>
</data>