aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar yangsu@google.com <yangsu@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-08-30 17:08:08 +0000
committerGravatar yangsu@google.com <yangsu@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-08-30 17:08:08 +0000
commit69f2e05b58cd42bb5925214feb1aecc9a1690f6d (patch)
tree2746dc3ea37d61dad75d200657dc9e3b9d3dde66
parentd51bfa0583c82c7b731b993e56159fbf815dd2e0 (diff)
Updated iOS SampleApp and the simple hello world Skia Cocoa App under experimental
git-svn-id: http://skia.googlecode.com/svn/trunk@2194 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat
-rw-r--r--experimental/Debugger/DebuggerContentView.cpp4
-rw-r--r--experimental/Networking/SkSockets.cpp2
-rw-r--r--experimental/SimpleCocoaApp/English.lproj/InfoPlist.strings2
-rw-r--r--experimental/SimpleCocoaApp/SampleWindow.mm30
-rw-r--r--experimental/SimpleCocoaApp/SimpleApp-Info.plist (renamed from experimental/SimpleCocoaApp/SimpleCocoaApp-Info.plist)2
-rw-r--r--experimental/SimpleCocoaApp/SimpleApp.h (renamed from experimental/SimpleCocoaApp/SampleWindow.h)14
-rw-r--r--experimental/SimpleCocoaApp/SimpleApp.mm62
-rw-r--r--experimental/SimpleCocoaApp/SimpleApp.xib (renamed from experimental/SimpleCocoaApp/English.lproj/MainMenu.xib)912
-rw-r--r--experimental/SimpleCocoaApp/SimpleCocoaAppDelegate.h15
-rw-r--r--experimental/SimpleCocoaApp/SimpleCocoaAppDelegate.mm10
-rw-r--r--experimental/SimpleCocoaApp/SimpleCocoaApp_Prefix.pch7
-rw-r--r--experimental/SimpleCocoaApp/SkNSView.h26
-rw-r--r--experimental/SimpleCocoaApp/SkNSView.mm125
-rw-r--r--experimental/SimpleCocoaApp/SkNSWindow.h19
-rw-r--r--experimental/SimpleCocoaApp/SkNSWindow.mm60
-rw-r--r--experimental/SimpleCocoaApp/main.m16
-rw-r--r--experimental/iOSSampleApp/Shared/SkUIView.mm28
-rwxr-xr-xexperimental/iOSSampleApp/iOSSampleApp.xcodeproj/project.pbxproj160
-rw-r--r--gpu/src/ios/GrGLDefaultInterface_iOS.cpp4
19 files changed, 279 insertions, 1219 deletions
diff --git a/experimental/Debugger/DebuggerContentView.cpp b/experimental/Debugger/DebuggerContentView.cpp
index a5f1c0ce23..d12582a12a 100644
--- a/experimental/Debugger/DebuggerContentView.cpp
+++ b/experimental/Debugger/DebuggerContentView.cpp
@@ -1,8 +1,4 @@
#include "SampleCode.h"
-#include "SkView.h"
-#include "SkCanvas.h"
-#include "SkGradientShader.h"
-#include "SkGPipe.h"
#include "SkOSMenu.h"
#include "DebuggerViews.h"
diff --git a/experimental/Networking/SkSockets.cpp b/experimental/Networking/SkSockets.cpp
index 4304b6cfd6..7b7d6fcff7 100644
--- a/experimental/Networking/SkSockets.cpp
+++ b/experimental/Networking/SkSockets.cpp
@@ -179,8 +179,6 @@ int SkSocket::writePacket(void* data, size_t size, DataType type) {
if (!FD_ISSET (i, &fMasterSet))
continue;
- //Don't signal broken pipe
- setsockopt(i, SOL_SOCKET, SO_NOSIGPIPE, (void*)1, sizeof(int));
int bytesWrittenInTransfer = 0;
int bytesWrittenInPacket = 0;
int attempts = 0;
diff --git a/experimental/SimpleCocoaApp/English.lproj/InfoPlist.strings b/experimental/SimpleCocoaApp/English.lproj/InfoPlist.strings
deleted file mode 100644
index 477b28ff8f..0000000000
--- a/experimental/SimpleCocoaApp/English.lproj/InfoPlist.strings
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Localized versions of Info.plist keys */
-
diff --git a/experimental/SimpleCocoaApp/SampleWindow.mm b/experimental/SimpleCocoaApp/SampleWindow.mm
deleted file mode 100644
index 1239cff3aa..0000000000
--- a/experimental/SimpleCocoaApp/SampleWindow.mm
+++ /dev/null
@@ -1,30 +0,0 @@
-#import "SkCanvas.h"
-#import "SkPaint.h"
-#import "SkView.h"
-class SkSampleView : public SkView {
-public:
- SkSampleView() {};
-protected:
- virtual void onDraw(SkCanvas* canvas) {
- canvas->drawColor(0xFFFFFFFF);
- SkPaint p;
- p.setTextSize(20);
- p.setAntiAlias(true);
- canvas->drawText("Hello World!", 13, 50, 30, p);
- this->INHERITED::onDraw(canvas);
- }
-private:
- typedef SkView INHERITED;
-};
-////////////////////////////////////////////////////////////////////////////////
-#import "SampleWindow.h"
-@implementation SampleWindow
--(void) installSkViews {
- fSampleSkView = new SkSampleView;
- fSampleSkView->setVisibleP(true);
- fSampleSkView->setSize([self frame].size.width, [self frame].size.height);
- [fView addSkView:fSampleSkView];
- [fView setNeedsDisplay:YES];
- fSampleSkView->unref();
-}
-@end \ No newline at end of file
diff --git a/experimental/SimpleCocoaApp/SimpleCocoaApp-Info.plist b/experimental/SimpleCocoaApp/SimpleApp-Info.plist
index f696cb233e..dcb5a4544a 100644
--- a/experimental/SimpleCocoaApp/SimpleCocoaApp-Info.plist
+++ b/experimental/SimpleCocoaApp/SimpleApp-Info.plist
@@ -25,7 +25,7 @@
<key>LSMinimumSystemVersion</key>
<string>${MACOSX_DEPLOYMENT_TARGET}</string>
<key>NSMainNibFile</key>
- <string>MainMenu</string>
+ <string>SimpleApp</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
</dict>
diff --git a/experimental/SimpleCocoaApp/SampleWindow.h b/experimental/SimpleCocoaApp/SimpleApp.h
index 04b34e2f9e..da160ebef4 100644
--- a/experimental/SimpleCocoaApp/SampleWindow.h
+++ b/experimental/SimpleCocoaApp/SimpleApp.h
@@ -5,10 +5,12 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#import "SkNSWindow.h"
-@interface SampleWindow : SkNSWindow {
- IBOutlet SkNSView* fView;
- SkView* fSampleSkView;
-}
-@end
+/*
+ * Simple hello world app for skia on Mac OS (Cocoa)
+ */
+
+#import "SkNSView.h"
+@interface SimpleNSView : SkNSView
+- (id)initWithDefaults;
+@end \ No newline at end of file
diff --git a/experimental/SimpleCocoaApp/SimpleApp.mm b/experimental/SimpleCocoaApp/SimpleApp.mm
new file mode 100644
index 0000000000..922177e3aa
--- /dev/null
+++ b/experimental/SimpleCocoaApp/SimpleApp.mm
@@ -0,0 +1,62 @@
+#import "SkCanvas.h"
+#import "SkPaint.h"
+#import "SkWindow.h"
+#include "SkGraphics.h"
+#include "SkCGUtils.h"
+class SkSampleView : public SkView {
+public:
+ SkSampleView() {
+ this->setVisibleP(true);
+ this->setClipToBounds(false);
+ };
+protected:
+ virtual void onDraw(SkCanvas* canvas) {
+ canvas->drawColor(0xFFFFFFFF);
+ SkPaint p;
+ p.setTextSize(20);
+ p.setAntiAlias(true);
+ canvas->drawText("Hello World!", 13, 50, 30, p);
+ SkRect r = {50, 50, 80, 80};
+ p.setColor(0xAA11EEAA);
+ canvas->drawRect(r, p);
+ }
+private:
+ typedef SkView INHERITED;
+};
+
+void application_init() {
+ SkGraphics::Init();
+ SkEvent::Init();
+}
+
+void application_term() {
+ SkGraphics::Term();
+ SkEvent::Term();
+}
+
+class FillLayout : public SkView::Layout {
+protected:
+ virtual void onLayoutChildren(SkView* parent) {
+ SkView* view = SkView::F2BIter(parent).next();
+ view->setSize(parent->width(), parent->height());
+ }
+};
+
+#import "SimpleApp.h"
+@implementation SimpleNSView
+
+- (id)initWithDefaults {
+ if (self = [super initWithDefaults]) {
+ fWind = new SkOSWindow(self);
+ fWind->setLayout(new FillLayout, false);
+ fWind->attachChildToFront(new SkSampleView)->unref();
+ }
+ return self;
+}
+
+- (void)drawRect:(NSRect)dirtyRect {
+ CGContextRef ctx = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
+ SkCGDrawBitmap(ctx, fWind->getBitmap(), 0, 0);
+}
+
+@end \ No newline at end of file
diff --git a/experimental/SimpleCocoaApp/English.lproj/MainMenu.xib b/experimental/SimpleCocoaApp/SimpleApp.xib
index c62a286446..8ce9bc8066 100644
--- a/experimental/SimpleCocoaApp/English.lproj/MainMenu.xib
+++ b/experimental/SimpleCocoaApp/SimpleApp.xib
@@ -12,8 +12,7 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="632"/>
- <integer value="533"/>
+ <integer value="372"/>
<integer value="24"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
@@ -1316,250 +1315,19 @@
<int key="NSWindowBacking">2</int>
<string key="NSWindowRect">{{335, 390}, {480, 360}}</string>
<int key="NSWTFlags">1954021376</int>
- <string key="NSWindowTitle">SimpleCocoaApp</string>
- <string key="NSWindowClass">SampleWindow</string>
+ <string key="NSWindowTitle">SimpleApp</string>
+ <string key="NSWindowClass">NSWindow</string>
<nil key="NSViewClass"/>
<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
<object class="NSView" key="NSWindowView" id="439893737">
<reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSCustomView" id="322594744">
- <reference key="NSNextResponder" ref="439893737"/>
- <int key="NSvFlags">274</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSButton" id="215613538">
- <reference key="NSNextResponder" ref="322594744"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{362, 312}, {96, 32}}</string>
- <reference key="NSSuperview" ref="322594744"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="406327166">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">134217728</int>
- <string key="NSContents">Button</string>
- <object class="NSFont" key="NSSupport" id="109605427">
- <string key="NSName">LucidaGrande</string>
- <double key="NSSize">13</double>
- <int key="NSfFlags">1044</int>
- </object>
- <reference key="NSControlView" ref="215613538"/>
- <int key="NSButtonFlags">-2038284033</int>
- <int key="NSButtonFlags2">129</int>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- </object>
- </object>
- <string key="NSFrameSize">{480, 360}</string>
- <reference key="NSSuperview" ref="439893737"/>
- <string key="NSClassName">SkNSView</string>
- </object>
- </object>
<string key="NSFrameSize">{480, 360}</string>
<reference key="NSSuperview"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
</object>
- <object class="NSCustomObject" id="976324537">
- <string key="NSClassName">SimpleCocoaAppDelegate</string>
- </object>
- <object class="NSCustomObject" id="755631768">
- <string key="NSClassName">NSFontManager</string>
- </object>
- <object class="NSCustomView" id="758604943">
- <reference key="NSNextResponder"/>
- <int key="NSvFlags">256</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSScrollView" id="1038370525">
- <reference key="NSNextResponder" ref="758604943"/>
- <int key="NSvFlags">274</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSClipView" id="250930136">
- <reference key="NSNextResponder" ref="1038370525"/>
- <int key="NSvFlags">2304</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSTableView" id="429436769">
- <reference key="NSNextResponder" ref="250930136"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrameSize">{241, 301}</string>
- <reference key="NSSuperview" ref="250930136"/>
- <bool key="NSEnabled">YES</bool>
- <object class="_NSCornerView" key="NSCornerView">
- <nil key="NSNextResponder"/>
- <int key="NSvFlags">-2147483392</int>
- <string key="NSFrame">{{224, 0}, {16, 17}}</string>
- </object>
- <object class="NSMutableArray" key="NSTableColumns">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSTableColumn" id="691918008">
- <double key="NSWidth">100</double>
- <double key="NSMinWidth">40</double>
- <double key="NSMaxWidth">1000</double>
- <object class="NSTableHeaderCell" key="NSHeaderCell">
- <int key="NSCellFlags">75628096</int>
- <int key="NSCellFlags2">2048</int>
- <string key="NSContents"/>
- <object class="NSFont" key="NSSupport" id="26">
- <string key="NSName">LucidaGrande</string>
- <double key="NSSize">11</double>
- <int key="NSfFlags">3100</int>
- </object>
- <object class="NSColor" key="NSBackgroundColor" id="805714581">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
- </object>
- <object class="NSColor" key="NSTextColor" id="372600372">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">headerTextColor</string>
- <object class="NSColor" key="NSColor" id="1032326875">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MAA</bytes>
- </object>
- </object>
- </object>
- <object class="NSTextFieldCell" key="NSDataCell" id="241301801">
- <int key="NSCellFlags">337772096</int>
- <int key="NSCellFlags2">2048</int>
- <string key="NSContents">Text Cell</string>
- <reference key="NSSupport" ref="109605427"/>
- <reference key="NSControlView" ref="429436769"/>
- <object class="NSColor" key="NSBackgroundColor" id="598476436">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">controlBackgroundColor</string>
- <object class="NSColor" key="NSColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes>
- </object>
- </object>
- <object class="NSColor" key="NSTextColor" id="1018211721">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">controlTextColor</string>
- <reference key="NSColor" ref="1032326875"/>
- </object>
- </object>
- <int key="NSResizingMask">3</int>
- <bool key="NSIsResizeable">YES</bool>
- <bool key="NSIsEditable">YES</bool>
- <reference key="NSTableView" ref="429436769"/>
- </object>
- <object class="NSTableColumn" id="394988372">
- <double key="NSWidth">135</double>
- <double key="NSMinWidth">40</double>
- <double key="NSMaxWidth">1000</double>
- <object class="NSTableHeaderCell" key="NSHeaderCell">
- <int key="NSCellFlags">75628096</int>
- <int key="NSCellFlags2">2048</int>
- <string key="NSContents"/>
- <reference key="NSSupport" ref="26"/>
- <reference key="NSBackgroundColor" ref="805714581"/>
- <reference key="NSTextColor" ref="372600372"/>
- </object>
- <object class="NSTextFieldCell" key="NSDataCell" id="878937020">
- <int key="NSCellFlags">337772096</int>
- <int key="NSCellFlags2">2048</int>
- <string key="NSContents">Text Cell</string>
- <reference key="NSSupport" ref="109605427"/>
- <reference key="NSControlView" ref="429436769"/>
- <reference key="NSBackgroundColor" ref="598476436"/>
- <reference key="NSTextColor" ref="1018211721"/>
- </object>
- <int key="NSResizingMask">3</int>
- <bool key="NSIsResizeable">YES</bool>
- <bool key="NSIsEditable">YES</bool>
- <reference key="NSTableView" ref="429436769"/>
- </object>
- </object>
- <double key="NSIntercellSpacingWidth">3</double>
- <double key="NSIntercellSpacingHeight">2</double>
- <object class="NSColor" key="NSBackgroundColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MQA</bytes>
- </object>
- <object class="NSColor" key="NSGridColor">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">gridColor</string>
- <object class="NSColor" key="NSColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC41AA</bytes>
- </object>
- </object>
- <double key="NSRowHeight">17</double>
- <int key="NSTvFlags">-700448768</int>
- <reference key="NSDelegate"/>
- <reference key="NSDataSource"/>
- <int key="NSGridStyleMask">1</int>
- <int key="NSColumnAutoresizingStyle">4</int>
- <int key="NSDraggingSourceMaskForLocal">15</int>
- <int key="NSDraggingSourceMaskForNonLocal">0</int>
- <bool key="NSAllowsTypeSelect">YES</bool>
- <int key="NSTableViewDraggingDestinationStyle">0</int>
- </object>
- </object>
- <string key="NSFrame">{{1, 1}, {241, 301}}</string>
- <reference key="NSSuperview" ref="1038370525"/>
- <reference key="NSNextKeyView" ref="429436769"/>
- <reference key="NSDocView" ref="429436769"/>
- <reference key="NSBGColor" ref="598476436"/>
- <int key="NScvFlags">4</int>
- </object>
- <object class="NSScroller" id="617550661">
- <reference key="NSNextResponder" ref="1038370525"/>
- <int key="NSvFlags">-2147483392</int>
- <string key="NSFrame">{{317, 1}, {15, 574}}</string>
- <reference key="NSSuperview" ref="1038370525"/>
- <reference key="NSTarget" ref="1038370525"/>
- <string key="NSAction">_doScroller:</string>
- <double key="NSPercent">0.95370370149612427</double>
- </object>
- <object class="NSScroller" id="977018641">
- <reference key="NSNextResponder" ref="1038370525"/>
- <int key="NSvFlags">-2147483392</int>
- <string key="NSFrame">{{1, 263}, {157, 15}}</string>
- <reference key="NSSuperview" ref="1038370525"/>
- <int key="NSsFlags">1</int>
- <reference key="NSTarget" ref="1038370525"/>
- <string key="NSAction">_doScroller:</string>
- <double key="NSPercent">0.98996657133102417</double>
- </object>
- </object>
- <string key="NSFrameSize">{243, 303}</string>
- <reference key="NSSuperview" ref="758604943"/>
- <reference key="NSNextKeyView" ref="250930136"/>
- <int key="NSsFlags">562</int>
- <reference key="NSVScroller" ref="617550661"/>
- <reference key="NSHScroller" ref="977018641"/>
- <reference key="NSContentView" ref="250930136"/>
- <bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
- </object>
- </object>
- <string key="NSFrameSize">{243, 303}</string>
- <reference key="NSSuperview"/>
- <string key="NSClassName">NSView</string>
- </object>
- <object class="NSDrawer" id="764451088">
- <nil key="NSNextResponder"/>
- <string key="NSContentSize">{200, 100}</string>
- <string key="NSMinContentSize">{0, 0}</string>
- <string key="NSMaxContentSize">{10000, 10000}</string>
- <int key="NSPreferredEdge">2</int>
- <double key="NSLeadingOffset">0.0</double>
- <double key="NSTrailingOffset">15</double>
- <nil key="NSParentWindow"/>
- <nil key="NSDelegate"/>
- </object>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
<object class="NSMutableArray" key="connectionRecords">
@@ -1854,46 +1622,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
- <string key="label">addFontTrait:</string>
- <reference key="source" ref="755631768"/>
- <reference key="destination" ref="305399458"/>
- </object>
- <int key="connectionID">421</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">addFontTrait:</string>
- <reference key="source" ref="755631768"/>
- <reference key="destination" ref="814362025"/>
- </object>
- <int key="connectionID">422</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">modifyFont:</string>
- <reference key="source" ref="755631768"/>
- <reference key="destination" ref="885547335"/>
- </object>
- <int key="connectionID">423</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">orderFrontFontPanel:</string>
- <reference key="source" ref="755631768"/>
- <reference key="destination" ref="159677712"/>
- </object>
- <int key="connectionID">424</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">modifyFont:</string>
- <reference key="source" ref="755631768"/>
- <reference key="destination" ref="158063935"/>
- </object>
- <int key="connectionID">425</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
<string key="label">raiseBaseline:</string>
<reference key="source" ref="1014"/>
<reference key="destination" ref="941806246"/>
@@ -2228,30 +1956,6 @@
</object>
<int key="connectionID">530</int>
</object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">contentView</string>
- <reference key="source" ref="764451088"/>
- <reference key="destination" ref="758604943"/>
- </object>
- <int key="connectionID">542</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">toggle:</string>
- <reference key="source" ref="764451088"/>
- <reference key="destination" ref="215613538"/>
- </object>
- <int key="connectionID">649</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">parentWindow</string>
- <reference key="source" ref="764451088"/>
- <reference key="destination" ref="972006081"/>
- </object>
- <int key="connectionID">650</int>
- </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -2809,7 +2513,6 @@
<reference key="object" ref="439893737"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="322594744"/>
</object>
<reference key="parent" ref="972006081"/>
</object>
@@ -3054,11 +2757,6 @@
<reference key="parent" ref="175441468"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">420</int>
- <reference key="object" ref="755631768"/>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">450</int>
<reference key="object" ref="288088188"/>
<object class="NSMutableArray" key="children">
@@ -3152,11 +2850,6 @@
<reference key="parent" ref="992780483"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">494</int>
- <reference key="object" ref="976324537"/>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">496</int>
<reference key="object" ref="215659978"/>
<object class="NSMutableArray" key="children">
@@ -3299,103 +2992,6 @@
<reference key="object" ref="560145579"/>
<reference key="parent" ref="956096989"/>
</object>
- <object class="IBObjectRecord">
- <int key="objectID">533</int>
- <reference key="object" ref="322594744"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="215613538"/>
- </object>
- <reference key="parent" ref="439893737"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">538</int>
- <reference key="object" ref="758604943"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="1038370525"/>
- </object>
- <reference key="parent" ref="0"/>
- <string key="objectName">Drawer Content View</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">539</int>
- <reference key="object" ref="764451088"/>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">629</int>
- <reference key="object" ref="1038370525"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="617550661"/>
- <reference ref="977018641"/>
- <reference ref="429436769"/>
- </object>
- <reference key="parent" ref="758604943"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">630</int>
- <reference key="object" ref="617550661"/>
- <reference key="parent" ref="1038370525"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">631</int>
- <reference key="object" ref="977018641"/>
- <reference key="parent" ref="1038370525"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">632</int>
- <reference key="object" ref="429436769"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="691918008"/>
- <reference ref="394988372"/>
- </object>
- <reference key="parent" ref="1038370525"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">634</int>
- <reference key="object" ref="691918008"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="241301801"/>
- </object>
- <reference key="parent" ref="429436769"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">637</int>
- <reference key="object" ref="241301801"/>
- <reference key="parent" ref="691918008"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">635</int>
- <reference key="object" ref="394988372"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="878937020"/>
- </object>
- <reference key="parent" ref="429436769"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">636</int>
- <reference key="object" ref="878937020"/>
- <reference key="parent" ref="394988372"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">646</int>
- <reference key="object" ref="215613538"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="406327166"/>
- </object>
- <reference key="parent" ref="322594744"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">647</int>
- <reference key="object" ref="406327166"/>
- <reference key="parent" ref="215613538"/>
- </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -3538,6 +3134,7 @@
<string>371.editorWindowContentRectSynchronizationRect</string>
<string>371.windowTemplate.maxSize</string>
<string>371.windowTemplate.minSize</string>
+ <string>372.CustomClassName</string>
<string>372.IBPluginDependency</string>
<string>375.IBPluginDependency</string>
<string>376.IBEditorWindowLastContentRect</string>
@@ -3619,11 +3216,6 @@
<string>515.IBPluginDependency</string>
<string>516.IBPluginDependency</string>
<string>517.IBPluginDependency</string>
- <string>533.IBPluginDependency</string>
- <string>533.IBViewBoundsToFrameTransform</string>
- <string>538.IBEditorWindowLastContentRect</string>
- <string>538.IBPluginDependency</string>
- <string>539.IBPluginDependency</string>
<string>56.IBPluginDependency</string>
<string>56.ImportedFromIB2</string>
<string>57.IBEditorWindowLastContentRect</string>
@@ -3632,18 +3224,6 @@
<string>57.editorWindowContentRectSynchronizationRect</string>
<string>58.IBPluginDependency</string>
<string>58.ImportedFromIB2</string>
- <string>629.IBPluginDependency</string>
- <string>629.IBViewBoundsToFrameTransform</string>
- <string>630.IBPluginDependency</string>
- <string>631.IBPluginDependency</string>
- <string>632.IBPluginDependency</string>
- <string>634.IBPluginDependency</string>
- <string>635.IBPluginDependency</string>
- <string>636.IBPluginDependency</string>
- <string>637.IBPluginDependency</string>
- <string>646.IBPluginDependency</string>
- <string>646.IBViewBoundsToFrameTransform</string>
- <string>647.IBPluginDependency</string>
<string>72.IBPluginDependency</string>
<string>72.ImportedFromIB2</string>
<string>73.IBPluginDependency</string>
@@ -3802,13 +3382,14 @@
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
- <string>{{83, 418}, {480, 360}}</string>
+ <string>{{228, 569}, {480, 360}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{83, 418}, {480, 360}}</string>
+ <string>{{228, 569}, {480, 360}}</string>
<integer value="1"/>
<string>{{33, 99}, {480, 360}}</string>
<string>{3.40282e+38, 3.40282e+38}</string>
<string>{0, 0}</string>
+ <string>SimpleNSView</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{603, 614}, {83, 43}}</string>
@@ -3891,13 +3472,6 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">AULIAABDAgAAA</bytes>
- </object>
- <string>{{136, 964}, {243, 303}}</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>{{378, 474}, {250, 183}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3906,22 +3480,6 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAAAAAAAAxBNAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABDhgAAw6sAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
@@ -3971,553 +3529,181 @@
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
- <string key="className">SampleWindow</string>
- <string key="superclassName">SkNSWindow</string>
- <object class="NSMutableDictionary" key="outlets">
- <string key="NS.key.0">fView</string>
- <string key="NS.object.0">SkNSView</string>
- </object>
- <object class="NSMutableDictionary" key="toOneOutletInfosByName">
- <string key="NS.key.0">fView</string>
- <object class="IBToOneOutletInfo" key="NS.object.0">
- <string key="name">fView</string>
- <string key="candidateClassName">SkNSView</string>
- </object>
- </object>
+ <string key="className">SimpleNSView</string>
+ <string key="superclassName">SkNSView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">../../experimental/SimpleCocoaApp/SampleWindow.h</string>
+ <string key="minorKey">../../experimental/SimpleCocoaApp/SimpleApp.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">SimpleCocoaAppDelegate</string>
- <string key="superclassName">NSObject</string>
+ <string key="className">SkNSView</string>
+ <string key="superclassName">NSView</string>
<object class="NSMutableDictionary" key="outlets">
- <string key="NS.key.0">window</string>
- <string key="NS.object.0">SkNSWindow</string>
+ <string key="NS.key.0">fOptionsDelegate</string>
+ <string key="NS.object.0">id</string>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
- <string key="NS.key.0">window</string>
+ <string key="NS.key.0">fOptionsDelegate</string>
<object class="IBToOneOutletInfo" key="NS.object.0">
- <string key="name">window</string>
- <string key="candidateClassName">SkNSWindow</string>
+ <string key="name">fOptionsDelegate</string>
+ <string key="candidateClassName">id</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">../../experimental/SimpleCocoaApp/SimpleCocoaAppDelegate.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">SkNSView</string>
- <string key="superclassName">NSView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">../../experimental/SimpleCocoaApp/SkNSView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">SkNSWindow</string>
- <string key="superclassName">NSWindow</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">../../experimental/SimpleCocoaApp/SkNSWindow.h</string>
+ <string key="minorKey">../../src/utils/mac/SkNSView.h</string>
</object>
</object>
</object>
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
- <string key="className">NSActionCell</string>
- <string key="superclassName">NSCell</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSActionCell.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSApplication</string>
- <string key="superclassName">NSResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="822405504">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSApplication.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSApplication</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="850738725">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSApplicationScripting.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSApplication</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="624831158">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSColorPanel.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSApplication</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSHelpManager.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSApplication</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSPageLayout.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSApplication</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSUserInterfaceItemSearching.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSBrowser</string>
- <string key="superclassName">NSControl</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSBrowser.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSButton</string>
- <string key="superclassName">NSControl</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSButton.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSButtonCell</string>
- <string key="superclassName">NSActionCell</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSButtonCell.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSCell</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSCell.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSControl</string>
- <string key="superclassName">NSView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="310914472">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSControl.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSDocument</string>
- <string key="superclassName">NSObject</string>
- <object class="NSMutableDictionary" key="actions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>printDocument:</string>
- <string>revertDocumentToSaved:</string>
- <string>runPageLayout:</string>
- <string>saveDocument:</string>
- <string>saveDocumentAs:</string>
- <string>saveDocumentTo:</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- </object>
- </object>
- <object class="NSMutableDictionary" key="actionInfosByName">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>printDocument:</string>
- <string>revertDocumentToSaved:</string>
- <string>runPageLayout:</string>
- <string>saveDocument:</string>
- <string>saveDocumentAs:</string>
- <string>saveDocumentTo:</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBActionInfo">
- <string key="name">printDocument:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">revertDocumentToSaved:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">runPageLayout:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">saveDocument:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">saveDocumentAs:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">saveDocumentTo:</string>
- <string key="candidateClassName">id</string>
- </object>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSDocument.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSDocument</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSDocumentScripting.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSDocumentController</string>
- <string key="superclassName">NSObject</string>
- <object class="NSMutableDictionary" key="actions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>clearRecentDocuments:</string>
- <string>newDocument:</string>
- <string>openDocument:</string>
- <string>saveAllDocuments:</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- </object>
- </object>
- <object class="NSMutableDictionary" key="actionInfosByName">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>clearRecentDocuments:</string>
- <string>newDocument:</string>
- <string>openDocument:</string>
- <string>saveAllDocuments:</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBActionInfo">
- <string key="name">clearRecentDocuments:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">newDocument:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">openDocument:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">saveAllDocuments:</string>
- <string key="candidateClassName">id</string>
- </object>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSDocumentController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSDrawer</string>
- <string key="superclassName">NSResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="716270263">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSDrawer.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSFontManager</string>
+ <string key="className">NSFormatter</string>
<string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="946436764">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSFontManager.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSMatrix</string>
- <string key="superclassName">NSControl</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSMatrix.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSMenu</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="1056362899">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSMenu.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSMenuItem</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="472958451">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSMenuItem.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSMovieView</string>
- <string key="superclassName">NSView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSMovieView.h</string>
+ <string key="minorKey">Foundation.framework/Headers/NSFormatter.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">AppKit.framework/Headers/NSAccessibility.h</string>
+ <string key="minorKey">Foundation.framework/Headers/NSArchiver.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
- <reference key="sourceIdentifier" ref="822405504"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <reference key="sourceIdentifier" ref="850738725"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <reference key="sourceIdentifier" ref="624831158"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <reference key="sourceIdentifier" ref="310914472"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSDictionaryController.h</string>
+ <string key="minorKey">Foundation.framework/Headers/NSClassDescription.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">AppKit.framework/Headers/NSDragging.h</string>
+ <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
- <reference key="sourceIdentifier" ref="946436764"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSFontPanel.h</string>
+ <string key="minorKey">Foundation.framework/Headers/NSFileManager.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">AppKit.framework/Headers/NSKeyValueBinding.h</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
- <reference key="sourceIdentifier" ref="1056362899"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSNibLoading.h</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.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">AppKit.framework/Headers/NSOutlineView.h</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.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">AppKit.framework/Headers/NSPasteboard.h</string>
+ <string key="minorKey">Foundation.framework/Headers/NSObject.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">AppKit.framework/Headers/NSSavePanel.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="809545482">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSTableView.h</string>
+ <string key="minorKey">Foundation.framework/Headers/NSObjectScripting.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">AppKit.framework/Headers/NSToolbarItem.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="260078765">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSView.h</string>
+ <string key="minorKey">Foundation.framework/Headers/NSPortCoder.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">PrintCore.framework/Headers/PDEPluginInterface.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSInterfaceStyle.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSResponder</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSResponder.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSScrollView</string>
- <string key="superclassName">NSView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSScrollView.h</string>
+ <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">NSScroller</string>
- <string key="superclassName">NSControl</string>
+ <string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSScroller.h</string>
+ <string key="minorKey">Foundation.framework/Headers/NSScriptClassDescription.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">NSTableColumn</string>
- <string key="superclassName">NSObject</string>
+ <string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSTableColumn.h</string>
+ <string key="minorKey">Foundation.framework/Headers/NSScriptKeyValueCoding.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">NSTableView</string>
- <string key="superclassName">NSControl</string>
- <reference key="sourceIdentifier" ref="809545482"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSText</string>
- <string key="superclassName">NSView</string>
+ <string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSText.h</string>
+ <string key="minorKey">Foundation.framework/Headers/NSScriptObjectSpecifiers.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">NSTextFieldCell</string>
- <string key="superclassName">NSActionCell</string>
+ <string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSTextFieldCell.h</string>
+ <string key="minorKey">Foundation.framework/Headers/NSScriptWhoseTests.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">NSTextView</string>
- <string key="superclassName">NSText</string>
+ <string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSTextView.h</string>
+ <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">NSView</string>
+ <string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSClipView.h</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">NSView</string>
- <reference key="sourceIdentifier" ref="472958451"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSView</string>
+ <string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSRulerView.h</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">NSView</string>
- <string key="superclassName">NSResponder</string>
- <reference key="sourceIdentifier" ref="260078765"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSWindow</string>
- <reference key="sourceIdentifier" ref="716270263"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSWindow</string>
- <string key="superclassName">NSResponder</string>
+ <string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSWindow.h</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURLDownload.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">NSWindow</string>
+ <string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSWindowScripting.h</string>
+ <string key="minorKey">PrintCore.framework/Headers/PDEPluginInterface.h</string>
</object>
</object>
</object>
diff --git a/experimental/SimpleCocoaApp/SimpleCocoaAppDelegate.h b/experimental/SimpleCocoaApp/SimpleCocoaAppDelegate.h
deleted file mode 100644
index ad64a8773e..0000000000
--- a/experimental/SimpleCocoaApp/SimpleCocoaAppDelegate.h
+++ /dev/null
@@ -1,15 +0,0 @@
-
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-#import <Cocoa/Cocoa.h>
-#import "SkNSWindow.h"
-@interface SimpleCocoaAppDelegate : NSObject <NSApplicationDelegate> {
- SkNSWindow *window;
-}
-
-@property (assign) IBOutlet SkNSWindow *window;
-@end
diff --git a/experimental/SimpleCocoaApp/SimpleCocoaAppDelegate.mm b/experimental/SimpleCocoaApp/SimpleCocoaAppDelegate.mm
deleted file mode 100644
index 1c3725a05c..0000000000
--- a/experimental/SimpleCocoaApp/SimpleCocoaAppDelegate.mm
+++ /dev/null
@@ -1,10 +0,0 @@
-#import "SimpleCocoaAppDelegate.h"
-
-@implementation SimpleCocoaAppDelegate
-@synthesize window;
-
--(void) applicationDidFinishLaunching:(NSNotification *)aNotification {
- //Load specified skia views after launching
- [window installSkViews];
-}
-@end
diff --git a/experimental/SimpleCocoaApp/SimpleCocoaApp_Prefix.pch b/experimental/SimpleCocoaApp/SimpleCocoaApp_Prefix.pch
deleted file mode 100644
index 8d43caec0d..0000000000
--- a/experimental/SimpleCocoaApp/SimpleCocoaApp_Prefix.pch
+++ /dev/null
@@ -1,7 +0,0 @@
-//
-// Prefix header for all source files of the 'CocoaSampleApp' target in the 'CocoaSampleApp' project
-//
-
-#ifdef __OBJC__
- #import <Cocoa/Cocoa.h>
-#endif
diff --git a/experimental/SimpleCocoaApp/SkNSView.h b/experimental/SimpleCocoaApp/SkNSView.h
deleted file mode 100644
index a9a994a456..0000000000
--- a/experimental/SimpleCocoaApp/SkNSView.h
+++ /dev/null
@@ -1,26 +0,0 @@
-
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-#import <Cocoa/Cocoa.h>
-class SkNSContainerView;
-class SkView;
-
-@interface SkNSView : NSView {
- SkNSContainerView* fView;
-
- @private
- NSPoint fOffset, fCenter;
- CGFloat fScale, fRotation;
-}
- @property(readwrite) NSPoint fOffset, fCenter;
- @property(readwrite) CGFloat fScale, fRotation;
-
- -(void) addSkView:(SkView*)aView;
- -(void) resetTransformations;
-@end
-
-
diff --git a/experimental/SimpleCocoaApp/SkNSView.mm b/experimental/SimpleCocoaApp/SkNSView.mm
deleted file mode 100644
index fae142c4d8..0000000000
--- a/experimental/SimpleCocoaApp/SkNSView.mm
+++ /dev/null
@@ -1,125 +0,0 @@
-#import "SkView.h"
-#import "SkMatrix.h"
-#import "SkCanvas.h"
-#import <AppKit/AppKit.h>
-class SkNSContainerView : public SkView {
-public:
- SkNSContainerView(NSView* parent){
- fParent = parent;
- fMatrix.reset();
- }
- void setBeforeChildMatrix(const SkMatrix& m) {fMatrix = m;}
-
-protected:
- virtual bool handleInval(const SkRect*) {
- [fParent setNeedsDisplay:YES];
- return true;
- }
- virtual void beforeChild(SkView* child, SkCanvas* canvas) {
- canvas->concat(fMatrix);
- }
- virtual void onSizeChange() {
- this->INHERITED::onSizeChange();
- SkView::F2BIter iter(this);
- SkView* view = iter.next();
- while (view) {
- view->setSize(this->width(), this->height());
- view = iter.next();
- }
- }
-
-private:
- NSView* fParent;
- SkMatrix fMatrix;
-
- typedef SkView INHERITED;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-#import "SkCGUtils.h"
-#import "SkNSView.h"
-@implementation SkNSView
-@synthesize fOffset, fCenter, fScale, fRotation;
-
--(id) initWithFrame:(NSRect)frame {
- self = [super initWithFrame:frame];
- if (self) {
- fView = new SkNSContainerView(self);
- fView->setVisibleP(true);
- NSSize viewSize = [self bounds].size;
- fView->setSize(viewSize.width, viewSize.height);
-
- [self resetTransformations];
- }
- return self;
-}
-
--(void) dealloc {
- delete fView;
- [super dealloc];
-}
-
--(void) addSkView:(SkView*)aView {
- fView->attachChildToFront(aView);
-}
-
--(BOOL) isFlipped {
- return YES;
-}
-
--(BOOL) inLiveResize {
- if (fView != nil) {
- NSSize s = [self bounds].size;
- fView->setSize(s.width, s.height);
- [self setNeedsDisplay:YES];
- }
- return [super inLiveResize];
-}
-
--(void) resetTransformations {
- fOffset = NSMakePoint(0, 0);
- fCenter = NSMakePoint(fView->width() / 2.0, fView->height() / 2.0);
- fRotation = 0;
- fScale = 1.0;
-}
-
--(void) drawRect:(NSRect)dirtyRect {
- //TODO -- check if our NSView is backed by a CALayer, and possibly use
- //skia's gpu backend
- if (fView != nil) {
- SkBitmap bitmap;
- bitmap.setConfig(SkBitmap::kARGB_8888_Config, fView->width(),
- fView->height());
- bitmap.allocPixels();
- SkCanvas canvas(bitmap);
-
- //Apply view transformations so they can be applied to individual
- //child views without affecting the parent's clip/matrix
- SkMatrix matrix;
- matrix.setTranslate(fOffset.x + fCenter.x, fOffset.y + fCenter.y);
- matrix.preRotate(fRotation);
- matrix.preScale(fScale, fScale);
- matrix.preTranslate(-fCenter.x, -fCenter.y);
- fView->setBeforeChildMatrix(matrix);
-
- fView->draw(&canvas);
-
- //Draw bitmap
- NSImage * image = [[NSImage alloc] init];
- CGImageRef cgimage = SkCreateCGImageRef(bitmap);
- NSBitmapImageRep * bitmapRep =
- [[NSBitmapImageRep alloc] initWithCGImage:cgimage];
-
- [image addRepresentation:bitmapRep];
- [image setSize:NSMakeSize(fView->width(), fView->height())];
- [image setFlipped:TRUE];
- [image drawAtPoint:NSMakePoint(0, 0)
- fromRect: NSZeroRect
- operation: NSCompositeSourceOver
- fraction: 1.0];
- [image release];
- CGImageRelease(cgimage);
- [bitmapRep release];
- }
-}
-@end \ No newline at end of file
diff --git a/experimental/SimpleCocoaApp/SkNSWindow.h b/experimental/SimpleCocoaApp/SkNSWindow.h
deleted file mode 100644
index c15302701c..0000000000
--- a/experimental/SimpleCocoaApp/SkNSWindow.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-#import <Cocoa/Cocoa.h>
-#import "SkNSView.h"
-
-@interface SkNSWindow : NSWindow {
-}
-//Overwrite in subclass to load custom skia views
--(void) installSkViews;
-
--(void) receiveSkEvent:(NSNotification*)notification;
-+(void) postTimedEvent:(NSTimeInterval)ti;
-+(void) timerFireMethod:(NSTimer*)theTimer;
-@end \ No newline at end of file
diff --git a/experimental/SimpleCocoaApp/SkNSWindow.mm b/experimental/SimpleCocoaApp/SkNSWindow.mm
deleted file mode 100644
index 5f4d65e315..0000000000
--- a/experimental/SimpleCocoaApp/SkNSWindow.mm
+++ /dev/null
@@ -1,60 +0,0 @@
-#import "SkNSWindow.h"
-#import "SkEvent.h"
-#define SkEventClass @"SkEvent"
-@implementation SkNSWindow
-
--(id) initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)aStyle
- backing:(NSBackingStoreType)bufferingType defer:(BOOL)flag {
- self = [super initWithContentRect:contentRect styleMask:aStyle
- backing:bufferingType defer:flag];
- if (self) {
- //Register as an observer for SkEventClass events and call
- //receiveSkEvent: upon receiving the event
- [[NSNotificationCenter defaultCenter] addObserver:self
- selector:@selector(receiveSkEvent:) name:SkEventClass object:nil];
- }
- return self;
-}
-
--(void) dealloc {
- [[NSNotificationCenter defaultCenter] removeObserver:self];
- [super dealloc];
-}
-
--(void) installSkViews {
- //to be overwritten by subclass
-}
-
--(BOOL) acceptsFirstResponder {
- return YES;
-}
-
--(void) receiveSkEvent:(NSNotification *)notification {
- if(SkEvent::ProcessEvent())
- SkEvent::SignalNonEmptyQueue();
-}
-
-+(void) postTimedEvent:(NSTimeInterval)ti {
- [NSTimer scheduledTimerWithTimeInterval:ti target:self
- selector:@selector(timerFireMethod:)
- userInfo:nil repeats:NO];
-}
-
-+(void) timerFireMethod:(NSTimer*)theTimer {
- SkEvent::ServiceQueueTimer();
-}
-@end
-////////////////////////////////////////////////////////////////////////////////
-void SkEvent::SignalNonEmptyQueue() {
- //post a SkEventClass event to the default notification center
- [[NSNotificationCenter defaultCenter] postNotificationName:SkEventClass
- object:nil];
-}
-
-void SkEvent::SignalQueueTimer(SkMSec delay) {
- if (delay) {
- //Convert to seconds
- NSTimeInterval ti = delay/(float)SK_MSec1;
- [SkNSWindow postTimedEvent:ti];
- }
-} \ No newline at end of file
diff --git a/experimental/SimpleCocoaApp/main.m b/experimental/SimpleCocoaApp/main.m
deleted file mode 100644
index cd85c6d018..0000000000
--- a/experimental/SimpleCocoaApp/main.m
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-// main.m
-// CocoaSampleApp
-//
-// Created by Yang Su on 6/14/11.
-// Copyright 2011 Google Inc.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-//
-
-#import <Cocoa/Cocoa.h>
-
-int main(int argc, char *argv[])
-{
- return NSApplicationMain(argc, (const char **) argv);
-}
diff --git a/experimental/iOSSampleApp/Shared/SkUIView.mm b/experimental/iOSSampleApp/Shared/SkUIView.mm
index 05b6edd60f..9a9b07f6ae 100644
--- a/experimental/iOSSampleApp/Shared/SkUIView.mm
+++ b/experimental/iOSSampleApp/Shared/SkUIView.mm
@@ -36,7 +36,7 @@ public:
fGrContext = GrContext::Create(kOpenGL_Shaders_GrEngine, NULL);
#endif
}
- fGrRenderTarget = SkGpuDevice::Current3DApiRenderTarget();
+
if (NULL == fGrContext) {
SkDebugf("Failed to setup 3D");
win->detachGL();
@@ -81,8 +81,30 @@ public:
win->presentGL();
}
- virtual void windowSizeChanged(SampleWindow* win) {}
-
+ virtual void windowSizeChanged(SampleWindow* win) {
+ if (fGrContext) {
+ win->attachGL();
+
+ GrPlatformSurfaceDesc desc;
+ desc.reset();
+ desc.fSurfaceType = kRenderTarget_GrPlatformSurfaceType;
+ desc.fWidth = SkScalarRound(win->width());
+ desc.fHeight = SkScalarRound(win->height());
+ desc.fConfig = kRGBA_8888_GrPixelConfig;
+ const GrGLInterface* gl = GrGLGetDefaultGLInterface();
+ GrAssert(NULL != gl);
+ GR_GL_GetIntegerv(gl, GR_GL_STENCIL_BITS, &desc.fStencilBits);
+ GR_GL_GetIntegerv(gl, GR_GL_SAMPLES, &desc.fSampleCnt);
+ GrGLint buffer;
+ GR_GL_GetIntegerv(gl, GR_GL_FRAMEBUFFER_BINDING, &buffer);
+ desc.fPlatformRenderTarget = buffer;
+
+ SkSafeUnref(fGrRenderTarget);
+ fGrRenderTarget = static_cast<GrRenderTarget*>(
+ fGrContext->createPlatformSurface(desc));
+ }
+ }
+
bool isUsingGL() { return usingGL; }
virtual GrContext* getGrContext() { return fGrContext; }
diff --git a/experimental/iOSSampleApp/iOSSampleApp.xcodeproj/project.pbxproj b/experimental/iOSSampleApp/iOSSampleApp.xcodeproj/project.pbxproj
index e87667867b..275060081c 100755
--- a/experimental/iOSSampleApp/iOSSampleApp.xcodeproj/project.pbxproj
+++ b/experimental/iOSSampleApp/iOSSampleApp.xcodeproj/project.pbxproj
@@ -9,7 +9,7 @@
/* Begin PBXBuildFile section */
1D60589B0D05DD56006BFB54 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; };
1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
- 2605F44213F18B1B0044A072 /* DebuggerView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2605F43C13F18B1B0044A072 /* DebuggerView.cpp */; };
+ 2605F44213F18B1B0044A072 /* DebuggerContentView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2605F43C13F18B1B0044A072 /* DebuggerContentView.cpp */; };
2605F44313F18B1B0044A072 /* DebuggerCommandsView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2605F43E13F18B1B0044A072 /* DebuggerCommandsView.cpp */; };
2605F44413F18B1B0044A072 /* SkDebugDumper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2605F43F13F18B1B0044A072 /* SkDebugDumper.cpp */; };
2605F44513F18B1B0044A072 /* DebuggerStateView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2605F44113F18B1B0044A072 /* DebuggerStateView.cpp */; };
@@ -178,7 +178,6 @@
260E040D13B122D40064D447 /* GrAtlas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E03D213B122D40064D447 /* GrAtlas.cpp */; };
260E040E13B122D40064D447 /* GrBufferAllocPool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E03D413B122D40064D447 /* GrBufferAllocPool.cpp */; };
260E040F13B122D40064D447 /* GrClip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E03D613B122D40064D447 /* GrClip.cpp */; };
- 260E041113B122D40064D447 /* GrCreatePathRenderer_none.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E03D813B122D40064D447 /* GrCreatePathRenderer_none.cpp */; };
260E041213B122D40064D447 /* GrDrawTarget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E03D913B122D40064D447 /* GrDrawTarget.cpp */; };
260E041413B122D40064D447 /* GrGLIndexBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E03DB13B122D40064D447 /* GrGLIndexBuffer.cpp */; };
260E041513B122D40064D447 /* GrGLInterface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E03DC13B122D40064D447 /* GrGLInterface.cpp */; };
@@ -247,7 +246,6 @@
260E057A13B123DE0064D447 /* SkCubicInterval.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E055A13B123DE0064D447 /* SkCubicInterval.cpp */; };
260E057B13B123DE0064D447 /* SkCullPoints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E055B13B123DE0064D447 /* SkCullPoints.cpp */; };
260E057C13B123DE0064D447 /* SkDumpCanvas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E055C13B123DE0064D447 /* SkDumpCanvas.cpp */; };
- 260E057D13B123DE0064D447 /* SkEGLContext_none.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E055D13B123DE0064D447 /* SkEGLContext_none.cpp */; };
260E057E13B123DE0064D447 /* SkInterpolator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E055E13B123DE0064D447 /* SkInterpolator.cpp */; };
260E057F13B123DE0064D447 /* SkLayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E055F13B123DE0064D447 /* SkLayer.cpp */; };
260E058013B123DE0064D447 /* SkMatrix44.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E056013B123DE0064D447 /* SkMatrix44.cpp */; };
@@ -385,8 +383,61 @@
260EE9D513AFA7850064D447 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 260EE9D013AFA7850064D447 /* CoreFoundation.framework */; };
260EF18513AFD62E0064D447 /* CoreText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 260EF18413AFD62E0064D447 /* CoreText.framework */; };
260EF2B013AFDBD30064D447 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
+ 2612C0D1140D2F9B001B6925 /* ClockFaceView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E002413B11F5B0064D447 /* ClockFaceView.cpp */; };
+ 2612C0D2140D2F9C001B6925 /* SampleAARects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E002613B11F5B0064D447 /* SampleAARects.cpp */; };
+ 2612C0D3140D2F9C001B6925 /* SampleAnimator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E002813B11F5B0064D447 /* SampleAnimator.cpp */; };
+ 2612C0D4140D2F9D001B6925 /* SampleAll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E002713B11F5B0064D447 /* SampleAll.cpp */; };
+ 2612C0D5140D2F9F001B6925 /* SampleBigGradient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E002C13B11F5B0064D447 /* SampleBigGradient.cpp */; };
+ 2612C0D6140D2F9F001B6925 /* SampleBitmapRect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E002D13B11F5B0064D447 /* SampleBitmapRect.cpp */; };
+ 2612C0D7140D2FA1001B6925 /* SampleCamera.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E002F13B11F5B0064D447 /* SampleCamera.cpp */; };
+ 2612C0D8140D2FA2001B6925 /* SampleColorFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E003213B11F5B0064D447 /* SampleColorFilter.cpp */; };
+ 2612C0D9140D2FA3001B6925 /* SampleConcavePaths.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E003413B11F5B0064D447 /* SampleConcavePaths.cpp */; };
+ 2612C0DA140D2FA4001B6925 /* SampleDecode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E003613B11F5B0064D447 /* SampleDecode.cpp */; };
+ 2612C0DB140D2FA5001B6925 /* SampleDither.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E003713B11F5B0064D447 /* SampleDither.cpp */; };
+ 2612C0DC140D2FA8001B6925 /* SampleDitherBitmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E003813B11F5B0064D447 /* SampleDitherBitmap.cpp */; };
+ 2612C0DD140D2FAA001B6925 /* SampleDrawLooper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E003913B11F5B0064D447 /* SampleDrawLooper.cpp */; };
+ 2612C0DE140D2FAA001B6925 /* SampleEffects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E003A13B11F5B0064D447 /* SampleEffects.cpp */; };
+ 2612C0DF140D2FAB001B6925 /* SampleEmboss.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E003B13B11F5B0064D447 /* SampleEmboss.cpp */; };
+ 2612C0E0140D2FAB001B6925 /* SampleEncode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E003C13B11F5B0064D447 /* SampleEncode.cpp */; };
+ 2612C0E1140D2FAC001B6925 /* SampleExtractAlpha.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E003D13B11F5B0064D447 /* SampleExtractAlpha.cpp */; };
+ 2612C0E2140D2FAD001B6925 /* SampleFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E003F13B11F5B0064D447 /* SampleFilter.cpp */; };
+ 2612C0E3140D2FAE001B6925 /* SampleFilter2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E004013B11F5B0064D447 /* SampleFilter2.cpp */; };
+ 2612C0E4140D2FAE001B6925 /* SampleFontCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E004113B11F5B0064D447 /* SampleFontCache.cpp */; };
+ 2612C0E5140D2FAF001B6925 /* SampleFontScalerTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E004213B11F5B0064D447 /* SampleFontScalerTest.cpp */; };
+ 2612C0E6140D2FAF001B6925 /* SampleFuzz.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E004313B11F5B0064D447 /* SampleFuzz.cpp */; };
+ 2612C0E7140D2FB1001B6925 /* SampleGradients.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E004513B11F5B0064D447 /* SampleGradients.cpp */; };
+ 2612C0E8140D2FB1001B6925 /* SampleHairline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E004613B11F5B0064D447 /* SampleHairline.cpp */; };
+ 2612C0E9140D2FB2001B6925 /* SampleImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E004713B11F5B0064D447 /* SampleImage.cpp */; };
+ 2612C0EA140D2FB2001B6925 /* SampleImageDir.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E004813B11F5B0064D447 /* SampleImageDir.cpp */; };
+ 2612C0EB140D2FB3001B6925 /* SampleLayerMask.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E004A13B11F5B0064D447 /* SampleLayerMask.cpp */; };
+ 2612C0EC140D2FB4001B6925 /* SampleLayers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E004B13B11F5B0064D447 /* SampleLayers.cpp */; };
+ 2612C0ED140D2FB4001B6925 /* SampleLineClipper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E004C13B11F5B0064D447 /* SampleLineClipper.cpp */; };
+ 2612C0EE140D2FB5001B6925 /* SampleLines.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E004D13B11F5B0064D447 /* SampleLines.cpp */; };
+ 2612C0EF140D2FB7001B6925 /* SampleMeasure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E004E13B11F5B0064D447 /* SampleMeasure.cpp */; };
+ 2612C0F0140D2FB8001B6925 /* SampleMipMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E004F13B11F5B0064D447 /* SampleMipMap.cpp */; };
+ 2612C0F1140D2FB8001B6925 /* SampleMovie.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E005013B11F5B0064D447 /* SampleMovie.cpp */; };
+ 2612C0F2140D2FB9001B6925 /* SampleNinePatch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E005113B11F5B0064D447 /* SampleNinePatch.cpp */; };
+ 2612C0F3140D2FBA001B6925 /* SampleOvalTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E005213B11F5B0064D447 /* SampleOvalTest.cpp */; };
+ 2612C0F4140D2FBB001B6925 /* SampleOverflow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E005313B11F5B0064D447 /* SampleOverflow.cpp */; };
+ 2612C0F5140D2FBB001B6925 /* SamplePageFlip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E005413B11F5B0064D447 /* SamplePageFlip.cpp */; };
+ 2612C0F6140D2FBC001B6925 /* SamplePatch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E005513B11F5B0064D447 /* SamplePatch.cpp */; };
+ 2612C0F7140D2FBD001B6925 /* SampleRepeatTile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E005D13B11F5B0064D447 /* SampleRepeatTile.cpp */; };
+ 2612C0F8140D2FBE001B6925 /* SampleShaderText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E005E13B11F5B0064D447 /* SampleShaderText.cpp */; };
+ 2612C0F9140D2FBE001B6925 /* SampleShaders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E005F13B11F5B0064D447 /* SampleShaders.cpp */; };
+ 2612C0FA140D2FC0001B6925 /* SampleSkLayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E006113B11F5B0064D447 /* SampleSkLayer.cpp */; };
+ 2612C0FB140D2FC1001B6925 /* SampleStrokePath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E006313B11F5B0064D447 /* SampleStrokePath.cpp */; };
+ 2612C0FC140D2FC2001B6925 /* SampleStrokeText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E006413B11F5B0064D447 /* SampleStrokeText.cpp */; };
+ 2612C0FE140D2FC3001B6925 /* SampleTextureDomain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E006B13B11F5B0064D447 /* SampleTextureDomain.cpp */; };
+ 2612C0FF140D2FC4001B6925 /* SampleTiling.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E006C13B11F5B0064D447 /* SampleTiling.cpp */; };
+ 2612C100140D2FC5001B6925 /* SampleTinyBitmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E006D13B11F5B0064D447 /* SampleTinyBitmap.cpp */; };
+ 2612C101140D2FC6001B6925 /* SampleXfermodes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E007213B11F5B0064D447 /* SampleXfermodes.cpp */; };
+ 2612C102140D2FC7001B6925 /* SampleXfermodesBlur.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E007313B11F5B0064D447 /* SampleXfermodesBlur.cpp */; };
+ 2612C106140D2FE3001B6925 /* SkEventNotifier.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2612C105140D2FE3001B6925 /* SkEventNotifier.mm */; };
+ 2612C110140D300B001B6925 /* GrDefaultPathRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2612C109140D300B001B6925 /* GrDefaultPathRenderer.cpp */; };
+ 2612C111140D300B001B6925 /* GrGLStencilBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2612C10B140D300B001B6925 /* GrGLStencilBuffer.cpp */; };
+ 2612C112140D300B001B6925 /* GrPathRendererChain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2612C10E140D300B001B6925 /* GrPathRendererChain.cpp */; };
+ 2612C122140D30B0001B6925 /* GrAddPathRenderers_none.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2612C121140D30B0001B6925 /* GrAddPathRenderers_none.cpp */; };
263BE75813CCC7BF00CCE991 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 263BE75713CCC7BF00CCE991 /* QuartzCore.framework */; };
- 2645945F13F34FB100DCF534 /* test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2645945E13F34FB100DCF534 /* test.cpp */; };
26591EB913EB16EB000DA8A8 /* TransitionView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26591EB813EB16EB000DA8A8 /* TransitionView.cpp */; };
265C7DE313D75752008329F6 /* SkOptionListController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 265C7DE213D75752008329F6 /* SkOptionListController.mm */; };
2662AB7013BD067900CDE7E9 /* SkiOSSampleApp-Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 2662AB6F13BD067900CDE7E9 /* SkiOSSampleApp-Debug.xcconfig */; };
@@ -397,8 +448,6 @@
26811E7913DEFAE8001A1609 /* SkBitSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26811E7813DEFAE8001A1609 /* SkBitSet.cpp */; };
268C50D613F022820003FF9A /* SkColorPalette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 268C50D213F022820003FF9A /* SkColorPalette.cpp */; };
268C50D713F022820003FF9A /* SkNetPipeController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 268C50D413F022820003FF9A /* SkNetPipeController.cpp */; };
- 268C50DA13F022AF0003FF9A /* SampleDrawingClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 268C50D813F022AF0003FF9A /* SampleDrawingClient.cpp */; };
- 268C50DF13F0230C0003FF9A /* SampleNetPipeReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 268C50DC13F0230C0003FF9A /* SampleNetPipeReader.cpp */; };
268C50E013F0230C0003FF9A /* SkSockets.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 268C50DD13F0230C0003FF9A /* SkSockets.cpp */; };
26962B2313CDF6A00039B1FB /* SkOSFile_iOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 260EE8BB13AFA7790064D447 /* SkOSFile_iOS.mm */; };
26962C8013CE256E0039B1FB /* SkUIDetailViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 26962C7913CE256E0039B1FB /* SkUIDetailViewController.mm */; };
@@ -422,7 +471,6 @@
26F548E913B91980007CC564 /* SkBitmapProcState_opts_arm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F548E013B91980007CC564 /* SkBitmapProcState_opts_arm.cpp */; };
26F548EC13B91980007CC564 /* SkBlitRow_opts_none.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F548E413B91980007CC564 /* SkBlitRow_opts_none.cpp */; };
26F548ED13B91980007CC564 /* SkUtils_opts_none.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F548E613B91980007CC564 /* SkUtils_opts_none.cpp */; };
- 26FB125E13E70310001AFF6D /* SkEventNotifier.mm in Sources */ = {isa = PBXBuildFile; fileRef = 26FB125D13E70310001AFF6D /* SkEventNotifier.mm */; };
26FB129313E704AE001AFF6D /* GrGLTexture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E03DF13B122D40064D447 /* GrGLTexture.cpp */; };
26FB129413E704B0001AFF6D /* GrContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E03D713B122D40064D447 /* GrContext.cpp */; };
26FB12B013E70D3B001AFF6D /* GrGLRenderTarget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26FB12AD13E70D3B001AFF6D /* GrGLRenderTarget.cpp */; };
@@ -439,7 +487,7 @@
1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
1D6058910D05DD3D006BFB54 /* iOSSampleApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iOSSampleApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
- 2605F43C13F18B1B0044A072 /* DebuggerView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DebuggerView.cpp; sourceTree = "<group>"; };
+ 2605F43C13F18B1B0044A072 /* DebuggerContentView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DebuggerContentView.cpp; sourceTree = "<group>"; };
2605F43D13F18B1B0044A072 /* DebuggerViews.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DebuggerViews.h; sourceTree = "<group>"; };
2605F43E13F18B1B0044A072 /* DebuggerCommandsView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DebuggerCommandsView.cpp; sourceTree = "<group>"; };
2605F43F13F18B1B0044A072 /* SkDebugDumper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SkDebugDumper.cpp; sourceTree = "<group>"; };
@@ -524,7 +572,6 @@
260E006213B11F5B0064D447 /* SampleSlides.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SampleSlides.cpp; sourceTree = "<group>"; };
260E006313B11F5B0064D447 /* SampleStrokePath.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SampleStrokePath.cpp; sourceTree = "<group>"; };
260E006413B11F5B0064D447 /* SampleStrokeText.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SampleStrokeText.cpp; sourceTree = "<group>"; };
- 260E006513B11F5B0064D447 /* SampleTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SampleTests.cpp; sourceTree = "<group>"; };
260E006613B11F5B0064D447 /* SampleText.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SampleText.cpp; sourceTree = "<group>"; };
260E006713B11F5B0064D447 /* SampleTextAlpha.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SampleTextAlpha.cpp; sourceTree = "<group>"; };
260E006813B11F5B0064D447 /* SampleTextBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SampleTextBox.cpp; sourceTree = "<group>"; };
@@ -883,7 +930,6 @@
260E03D513B122D40064D447 /* GrBufferAllocPool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GrBufferAllocPool.h; sourceTree = "<group>"; };
260E03D613B122D40064D447 /* GrClip.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GrClip.cpp; sourceTree = "<group>"; };
260E03D713B122D40064D447 /* GrContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GrContext.cpp; sourceTree = "<group>"; };
- 260E03D813B122D40064D447 /* GrCreatePathRenderer_none.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GrCreatePathRenderer_none.cpp; sourceTree = "<group>"; };
260E03D913B122D40064D447 /* GrDrawTarget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GrDrawTarget.cpp; sourceTree = "<group>"; };
260E03DA13B122D40064D447 /* GrGLDefaultInterface_none.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GrGLDefaultInterface_none.cpp; sourceTree = "<group>"; };
260E03DB13B122D40064D447 /* GrGLIndexBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GrGLIndexBuffer.cpp; sourceTree = "<group>"; };
@@ -1022,7 +1068,6 @@
260E055A13B123DE0064D447 /* SkCubicInterval.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SkCubicInterval.cpp; sourceTree = "<group>"; };
260E055B13B123DE0064D447 /* SkCullPoints.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SkCullPoints.cpp; sourceTree = "<group>"; };
260E055C13B123DE0064D447 /* SkDumpCanvas.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SkDumpCanvas.cpp; sourceTree = "<group>"; };
- 260E055D13B123DE0064D447 /* SkEGLContext_none.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SkEGLContext_none.cpp; sourceTree = "<group>"; };
260E055E13B123DE0064D447 /* SkInterpolator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SkInterpolator.cpp; sourceTree = "<group>"; };
260E055F13B123DE0064D447 /* SkLayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SkLayer.cpp; sourceTree = "<group>"; };
260E056013B123DE0064D447 /* SkMatrix44.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SkMatrix44.cpp; sourceTree = "<group>"; };
@@ -1290,8 +1335,17 @@
260EE9D013AFA7850064D447 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
260EE9D113AFA7850064D447 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
260EF18413AFD62E0064D447 /* CoreText.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreText.framework; path = System/Library/Frameworks/CoreText.framework; sourceTree = SDKROOT; };
+ 2612C104140D2FE3001B6925 /* SkEventNotifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SkEventNotifier.h; path = ../../src/utils/mac/SkEventNotifier.h; sourceTree = SOURCE_ROOT; };
+ 2612C105140D2FE3001B6925 /* SkEventNotifier.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SkEventNotifier.mm; path = ../../src/utils/mac/SkEventNotifier.mm; sourceTree = SOURCE_ROOT; };
+ 2612C109140D300B001B6925 /* GrDefaultPathRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GrDefaultPathRenderer.cpp; sourceTree = "<group>"; };
+ 2612C10A140D300B001B6925 /* GrDefaultPathRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GrDefaultPathRenderer.h; sourceTree = "<group>"; };
+ 2612C10B140D300B001B6925 /* GrGLStencilBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GrGLStencilBuffer.cpp; sourceTree = "<group>"; };
+ 2612C10C140D300B001B6925 /* GrGLStencilBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GrGLStencilBuffer.h; sourceTree = "<group>"; };
+ 2612C10D140D300B001B6925 /* GrPathRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GrPathRenderer.h; sourceTree = "<group>"; };
+ 2612C10E140D300B001B6925 /* GrPathRendererChain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GrPathRendererChain.cpp; sourceTree = "<group>"; };
+ 2612C10F140D300B001B6925 /* GrPathRendererChain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GrPathRendererChain.h; sourceTree = "<group>"; };
+ 2612C121140D30B0001B6925 /* GrAddPathRenderers_none.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GrAddPathRenderers_none.cpp; sourceTree = "<group>"; };
263BE75713CCC7BF00CCE991 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
- 2645945E13F34FB100DCF534 /* test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test.cpp; sourceTree = SOURCE_ROOT; };
26591EB813EB16EB000DA8A8 /* TransitionView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TransitionView.cpp; sourceTree = "<group>"; };
265C7DE113D75752008329F6 /* SkOptionListController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SkOptionListController.h; path = Shared/SkOptionListController.h; sourceTree = "<group>"; };
265C7DE213D75752008329F6 /* SkOptionListController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SkOptionListController.mm; path = Shared/SkOptionListController.mm; sourceTree = "<group>"; };
@@ -1355,8 +1409,6 @@
26F5492313B91C51007CC564 /* GrGLDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GrGLDefines.h; sourceTree = "<group>"; };
26F5492413B91C51007CC564 /* GrTemplates.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GrTemplates.h; sourceTree = "<group>"; };
26F5492713B91CA1007CC564 /* SkTypeface_mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SkTypeface_mac.h; path = include/ports/SkTypeface_mac.h; sourceTree = "<group>"; };
- 26FB125C13E70310001AFF6D /* SkEventNotifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SkEventNotifier.h; path = ../SkEventNotifier.h; sourceTree = SOURCE_ROOT; };
- 26FB125D13E70310001AFF6D /* SkEventNotifier.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SkEventNotifier.mm; path = ../SkEventNotifier.mm; sourceTree = SOURCE_ROOT; };
26FB12AD13E70D3B001AFF6D /* GrGLRenderTarget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GrGLRenderTarget.cpp; sourceTree = "<group>"; };
26FB12AE13E70D3B001AFF6D /* GrGLRenderTarget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GrGLRenderTarget.h; sourceTree = "<group>"; };
26FB12AF13E70D3B001AFF6D /* GrGLTexture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GrGLTexture.h; sourceTree = "<group>"; };
@@ -1402,7 +1454,7 @@
2605F43B13F18B1B0044A072 /* Debugger */ = {
isa = PBXGroup;
children = (
- 2605F43C13F18B1B0044A072 /* DebuggerView.cpp */,
+ 2605F43C13F18B1B0044A072 /* DebuggerContentView.cpp */,
2605F43D13F18B1B0044A072 /* DebuggerViews.h */,
2605F43E13F18B1B0044A072 /* DebuggerCommandsView.cpp */,
2605F43F13F18B1B0044A072 /* SkDebugDumper.cpp */,
@@ -1438,7 +1490,6 @@
260E002313B11F5B0064D447 /* samplecode */ = {
isa = PBXGroup;
children = (
- 2645945E13F34FB100DCF534 /* test.cpp */,
26591EB813EB16EB000DA8A8 /* TransitionView.cpp */,
260E002413B11F5B0064D447 /* ClockFaceView.cpp */,
260E002513B11F5B0064D447 /* OverView.cpp */,
@@ -1504,7 +1555,6 @@
260E006213B11F5B0064D447 /* SampleSlides.cpp */,
260E006313B11F5B0064D447 /* SampleStrokePath.cpp */,
260E006413B11F5B0064D447 /* SampleStrokeText.cpp */,
- 260E006513B11F5B0064D447 /* SampleTests.cpp */,
260E006613B11F5B0064D447 /* SampleText.cpp */,
260E006713B11F5B0064D447 /* SampleTextAlpha.cpp */,
260E006813B11F5B0064D447 /* SampleTextBox.cpp */,
@@ -2008,6 +2058,14 @@
260E03C813B122D40064D447 /* src */ = {
isa = PBXGroup;
children = (
+ 2612C121140D30B0001B6925 /* GrAddPathRenderers_none.cpp */,
+ 2612C109140D300B001B6925 /* GrDefaultPathRenderer.cpp */,
+ 2612C10A140D300B001B6925 /* GrDefaultPathRenderer.h */,
+ 2612C10B140D300B001B6925 /* GrGLStencilBuffer.cpp */,
+ 2612C10C140D300B001B6925 /* GrGLStencilBuffer.h */,
+ 2612C10D140D300B001B6925 /* GrPathRenderer.h */,
+ 2612C10E140D300B001B6925 /* GrPathRendererChain.cpp */,
+ 2612C10F140D300B001B6925 /* GrPathRendererChain.h */,
2605F66413F19EB80044A072 /* GrStencilBuffer.cpp */,
26FB12B313E70D51001AFF6D /* GrRenderTarget.cpp */,
26FB12AD13E70D3B001AFF6D /* GrGLRenderTarget.cpp */,
@@ -2024,7 +2082,6 @@
260E03D513B122D40064D447 /* GrBufferAllocPool.h */,
260E03D613B122D40064D447 /* GrClip.cpp */,
260E03D713B122D40064D447 /* GrContext.cpp */,
- 260E03D813B122D40064D447 /* GrCreatePathRenderer_none.cpp */,
260E03D913B122D40064D447 /* GrDrawTarget.cpp */,
260E03DA13B122D40064D447 /* GrGLDefaultInterface_none.cpp */,
260E03DB13B122D40064D447 /* GrGLIndexBuffer.cpp */,
@@ -2312,7 +2369,6 @@
260E055A13B123DE0064D447 /* SkCubicInterval.cpp */,
260E055B13B123DE0064D447 /* SkCullPoints.cpp */,
260E055C13B123DE0064D447 /* SkDumpCanvas.cpp */,
- 260E055D13B123DE0064D447 /* SkEGLContext_none.cpp */,
260E055E13B123DE0064D447 /* SkInterpolator.cpp */,
260E055F13B123DE0064D447 /* SkLayer.cpp */,
260E056013B123DE0064D447 /* SkMatrix44.cpp */,
@@ -2769,8 +2825,8 @@
28EEBF621118D79A00187D67 /* Shared */ = {
isa = PBXGroup;
children = (
- 26FB125C13E70310001AFF6D /* SkEventNotifier.h */,
- 26FB125D13E70310001AFF6D /* SkEventNotifier.mm */,
+ 2612C104140D2FE3001B6925 /* SkEventNotifier.h */,
+ 2612C105140D2FE3001B6925 /* SkEventNotifier.mm */,
26962C7813CE256E0039B1FB /* SkUIDetailViewController.h */,
26962C7913CE256E0039B1FB /* SkUIDetailViewController.mm */,
26962C7A13CE256E0039B1FB /* SkUIRootViewController.h */,
@@ -3044,7 +3100,6 @@
260E040D13B122D40064D447 /* GrAtlas.cpp in Sources */,
260E040E13B122D40064D447 /* GrBufferAllocPool.cpp in Sources */,
260E040F13B122D40064D447 /* GrClip.cpp in Sources */,
- 260E041113B122D40064D447 /* GrCreatePathRenderer_none.cpp in Sources */,
260E041213B122D40064D447 /* GrDrawTarget.cpp in Sources */,
260E041413B122D40064D447 /* GrGLIndexBuffer.cpp in Sources */,
260E041513B122D40064D447 /* GrGLInterface.cpp in Sources */,
@@ -3113,7 +3168,6 @@
260E057A13B123DE0064D447 /* SkCubicInterval.cpp in Sources */,
260E057B13B123DE0064D447 /* SkCullPoints.cpp in Sources */,
260E057C13B123DE0064D447 /* SkDumpCanvas.cpp in Sources */,
- 260E057D13B123DE0064D447 /* SkEGLContext_none.cpp in Sources */,
260E057E13B123DE0064D447 /* SkInterpolator.cpp in Sources */,
260E057F13B123DE0064D447 /* SkLayer.cpp in Sources */,
260E058013B123DE0064D447 /* SkMatrix44.cpp in Sources */,
@@ -3274,7 +3328,6 @@
265C7DE313D75752008329F6 /* SkOptionListController.mm in Sources */,
26811E7913DEFAE8001A1609 /* SkBitSet.cpp in Sources */,
26A8AFF313E05D7000A3C111 /* GrResourceCache.cpp in Sources */,
- 26FB125E13E70310001AFF6D /* SkEventNotifier.mm in Sources */,
26FB129313E704AE001AFF6D /* GrGLTexture.cpp in Sources */,
26FB129413E704B0001AFF6D /* GrContext.cpp in Sources */,
26FB12B013E70D3B001AFF6D /* GrGLRenderTarget.cpp in Sources */,
@@ -3282,10 +3335,8 @@
26591EB913EB16EB000DA8A8 /* TransitionView.cpp in Sources */,
268C50D613F022820003FF9A /* SkColorPalette.cpp in Sources */,
268C50D713F022820003FF9A /* SkNetPipeController.cpp in Sources */,
- 268C50DA13F022AF0003FF9A /* SampleDrawingClient.cpp in Sources */,
- 268C50DF13F0230C0003FF9A /* SampleNetPipeReader.cpp in Sources */,
268C50E013F0230C0003FF9A /* SkSockets.cpp in Sources */,
- 2605F44213F18B1B0044A072 /* DebuggerView.cpp in Sources */,
+ 2605F44213F18B1B0044A072 /* DebuggerContentView.cpp in Sources */,
2605F44313F18B1B0044A072 /* DebuggerCommandsView.cpp in Sources */,
2605F44413F18B1B0044A072 /* SkDebugDumper.cpp in Sources */,
2605F44513F18B1B0044A072 /* DebuggerStateView.cpp in Sources */,
@@ -3304,7 +3355,60 @@
2605F83A13F1AE520044A072 /* complexclip.cpp in Sources */,
2605F83B13F1AE520044A072 /* blurs.cpp in Sources */,
2605F83C13F1AE530044A072 /* bitmapfilters.cpp in Sources */,
- 2645945F13F34FB100DCF534 /* test.cpp in Sources */,
+ 2612C0D1140D2F9B001B6925 /* ClockFaceView.cpp in Sources */,
+ 2612C0D2140D2F9C001B6925 /* SampleAARects.cpp in Sources */,
+ 2612C0D3140D2F9C001B6925 /* SampleAnimator.cpp in Sources */,
+ 2612C0D4140D2F9D001B6925 /* SampleAll.cpp in Sources */,
+ 2612C0D5140D2F9F001B6925 /* SampleBigGradient.cpp in Sources */,
+ 2612C0D6140D2F9F001B6925 /* SampleBitmapRect.cpp in Sources */,
+ 2612C0D7140D2FA1001B6925 /* SampleCamera.cpp in Sources */,
+ 2612C0D8140D2FA2001B6925 /* SampleColorFilter.cpp in Sources */,
+ 2612C0D9140D2FA3001B6925 /* SampleConcavePaths.cpp in Sources */,
+ 2612C0DA140D2FA4001B6925 /* SampleDecode.cpp in Sources */,
+ 2612C0DB140D2FA5001B6925 /* SampleDither.cpp in Sources */,
+ 2612C0DC140D2FA8001B6925 /* SampleDitherBitmap.cpp in Sources */,
+ 2612C0DD140D2FAA001B6925 /* SampleDrawLooper.cpp in Sources */,
+ 2612C0DE140D2FAA001B6925 /* SampleEffects.cpp in Sources */,
+ 2612C0DF140D2FAB001B6925 /* SampleEmboss.cpp in Sources */,
+ 2612C0E0140D2FAB001B6925 /* SampleEncode.cpp in Sources */,
+ 2612C0E1140D2FAC001B6925 /* SampleExtractAlpha.cpp in Sources */,
+ 2612C0E2140D2FAD001B6925 /* SampleFilter.cpp in Sources */,
+ 2612C0E3140D2FAE001B6925 /* SampleFilter2.cpp in Sources */,
+ 2612C0E4140D2FAE001B6925 /* SampleFontCache.cpp in Sources */,
+ 2612C0E5140D2FAF001B6925 /* SampleFontScalerTest.cpp in Sources */,
+ 2612C0E6140D2FAF001B6925 /* SampleFuzz.cpp in Sources */,
+ 2612C0E7140D2FB1001B6925 /* SampleGradients.cpp in Sources */,
+ 2612C0E8140D2FB1001B6925 /* SampleHairline.cpp in Sources */,
+ 2612C0E9140D2FB2001B6925 /* SampleImage.cpp in Sources */,
+ 2612C0EA140D2FB2001B6925 /* SampleImageDir.cpp in Sources */,
+ 2612C0EB140D2FB3001B6925 /* SampleLayerMask.cpp in Sources */,
+ 2612C0EC140D2FB4001B6925 /* SampleLayers.cpp in Sources */,
+ 2612C0ED140D2FB4001B6925 /* SampleLineClipper.cpp in Sources */,
+ 2612C0EE140D2FB5001B6925 /* SampleLines.cpp in Sources */,
+ 2612C0EF140D2FB7001B6925 /* SampleMeasure.cpp in Sources */,
+ 2612C0F0140D2FB8001B6925 /* SampleMipMap.cpp in Sources */,
+ 2612C0F1140D2FB8001B6925 /* SampleMovie.cpp in Sources */,
+ 2612C0F2140D2FB9001B6925 /* SampleNinePatch.cpp in Sources */,
+ 2612C0F3140D2FBA001B6925 /* SampleOvalTest.cpp in Sources */,
+ 2612C0F4140D2FBB001B6925 /* SampleOverflow.cpp in Sources */,
+ 2612C0F5140D2FBB001B6925 /* SamplePageFlip.cpp in Sources */,
+ 2612C0F6140D2FBC001B6925 /* SamplePatch.cpp in Sources */,
+ 2612C0F7140D2FBD001B6925 /* SampleRepeatTile.cpp in Sources */,
+ 2612C0F8140D2FBE001B6925 /* SampleShaderText.cpp in Sources */,
+ 2612C0F9140D2FBE001B6925 /* SampleShaders.cpp in Sources */,
+ 2612C0FA140D2FC0001B6925 /* SampleSkLayer.cpp in Sources */,
+ 2612C0FB140D2FC1001B6925 /* SampleStrokePath.cpp in Sources */,
+ 2612C0FC140D2FC2001B6925 /* SampleStrokeText.cpp in Sources */,
+ 2612C0FE140D2FC3001B6925 /* SampleTextureDomain.cpp in Sources */,
+ 2612C0FF140D2FC4001B6925 /* SampleTiling.cpp in Sources */,
+ 2612C100140D2FC5001B6925 /* SampleTinyBitmap.cpp in Sources */,
+ 2612C101140D2FC6001B6925 /* SampleXfermodes.cpp in Sources */,
+ 2612C102140D2FC7001B6925 /* SampleXfermodesBlur.cpp in Sources */,
+ 2612C106140D2FE3001B6925 /* SkEventNotifier.mm in Sources */,
+ 2612C110140D300B001B6925 /* GrDefaultPathRenderer.cpp in Sources */,
+ 2612C111140D300B001B6925 /* GrGLStencilBuffer.cpp in Sources */,
+ 2612C112140D300B001B6925 /* GrPathRendererChain.cpp in Sources */,
+ 2612C122140D30B0001B6925 /* GrAddPathRenderers_none.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/gpu/src/ios/GrGLDefaultInterface_iOS.cpp b/gpu/src/ios/GrGLDefaultInterface_iOS.cpp
index 6f5b28b463..8755299bbd 100644
--- a/gpu/src/ios/GrGLDefaultInterface_iOS.cpp
+++ b/gpu/src/ios/GrGLDefaultInterface_iOS.cpp
@@ -143,7 +143,7 @@ void GrGLInitializeDefaultGLInterface() {
#endif
defaultInterface->fBindFragDataLocationIndexed = NULL;
- defaultInterface->fBindingsExported = kES2_GrGLBinding | kES1_GrGLBinding;
+ defaultInterface->fBindingsExported = (GrGLBinding)(kES2_GrGLBinding | kES1_GrGLBinding);
- GrGLSetDefaultGLInterface(&defaultInterface)->unref();
+ GrGLSetDefaultGLInterface(defaultInterface)->unref();
} \ No newline at end of file
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-19 00:47:13 +0000