Commit Graph

62 Commits

Author SHA1 Message Date
robertphillips@google.com
07ef911f18 Fixed Linux compiler complaints
http://codereview.appspot.com/6269045/



git-svn-id: http://skia.googlecode.com/svn/trunk@4135 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-04 13:22:14 +00:00
bsalomon@google.com
1195925b05 Add MSAA option to SampleApp
Review URL: http://codereview.appspot.com/5969049


git-svn-id: http://skia.googlecode.com/svn/trunk@3627 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-06 20:13:38 +00:00
bsalomon@google.com
3286989f97 Remove old D3D9 stuff
Review URL: http://codereview.appspot.com/5966071/


git-svn-id: http://skia.googlecode.com/svn/trunk@3601 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-04 19:05:31 +00:00
bsalomon@google.com
8108c47b50 Unix SampleApp attach/detach fixup and style fixup
Review URL: http://codereview.appspot.com/5972062/




git-svn-id: http://skia.googlecode.com/svn/trunk@3590 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-03 19:33:08 +00:00
bsalomon@google.com
3c4d032aeb Revert 3857 (which was committed from wrong tree)
git-svn-id: http://skia.googlecode.com/svn/trunk@3588 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-03 18:04:51 +00:00
bsalomon@google.com
5f017a4ab0 Fix GL attach/detach in Mac SampleApp
Review URL: http://codereview.appspot.com/5984043/


git-svn-id: http://skia.googlecode.com/svn/trunk@3587 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-03 18:03:03 +00:00
robertphillips@google.com
b442a6d572 Redelivering r3555 to re-add run-time switching between ANGLE and native opengl
http://codereview.appspot.com/5969044/



git-svn-id: http://skia.googlecode.com/svn/trunk@3578 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-02 19:24:21 +00:00
robertphillips@google.com
d5c8fe6f34 Removed ANGLE namespace requirement
http://codereview.appspot.com/5969065/



git-svn-id: http://skia.googlecode.com/svn/trunk@3571 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-02 15:04:16 +00:00
robertphillips@google.com
bd8d7adb0a Reverting r3555
git-svn-id: http://skia.googlecode.com/svn/trunk@3556 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-30 15:18:14 +00:00
robertphillips@google.com
53e96a14ca Added run-time switching between OpenGL & ANGLE in SampleApp
http://codereview.appspot.com/5969044/



git-svn-id: http://skia.googlecode.com/svn/trunk@3555 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-30 14:47:53 +00:00
bungeman@google.com
802eee956c Move SkTextBox.h from utils to views.
git-svn-id: http://skia.googlecode.com/svn/trunk@3531 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 20:01:06 +00:00
robertphillips@google.com
d3b9fbbc48 Code changes for ANGLE GL interface. .gyp file changes will be delivered later.
http://codereview.appspot.com/5940046/



git-svn-id: http://skia.googlecode.com/svn/trunk@3519 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 16:19:11 +00:00
bungeman@google.com
5e41b37b23 Remove circular dependency of views and animator.
http://codereview.appspot.com/5874056/


git-svn-id: http://skia.googlecode.com/svn/trunk@3473 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-23 14:11:43 +00:00
bungeman@google.com
cbd76ae138 Utils must not depend on Views.
http://codereview.appspot.com/5867051/


git-svn-id: http://skia.googlecode.com/svn/trunk@3459 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-21 20:59:49 +00:00
tomhudson@google.com
178b8e0b8c Add SK_OVERRIDE where appropriate.
http://codereview.appspot.com/5734044/



git-svn-id: http://skia.googlecode.com/svn/trunk@3318 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-05 18:29:23 +00:00
caryclark@google.com
4ee8aea2a7 fix mac warnings
http://codereview.appspot.com/5431053/

M    include/views/SkOSWindow_Mac.h
M    src/utils/mac/SkNSView.mm
M    src/utils/mac/SkNSView.h
M    src/utils/mac/SkOSWindow_Mac.mm
M    src/utils/mac/SkSampleNSView.h



git-svn-id: http://skia.googlecode.com/svn/trunk@2740 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-23 14:54:19 +00:00
reed@google.com
f03bb566e2 land http://codereview.appspot.com/5244058/ - add matrix to SkView
git-svn-id: http://skia.googlecode.com/svn/trunk@2670 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-11 21:42:12 +00:00
djsollen@google.com
56c69773ae Update files to use SK_BUILD_FOR_ANDROID.
This CL also removes any unecessary references to
the ANDROID definition.
Review URL: http://codereview.appspot.com/5354049

git-svn-id: http://skia.googlecode.com/svn/trunk@2629 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-08 19:00:26 +00:00
yangsu@google.com
a8540416f6 Switched Mac SampleApp to use Cocoa, removed the seperate CocoaSampleApp, moved dependencies out of experimental
git-svn-id: http://skia.googlecode.com/svn/trunk@2190 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-30 14:40:49 +00:00
yangsu@google.com
ef7bdfac61 Added Debugger to Sample App, off by default
Removed CocoaDebugger from experimental
Slight changes to SkOSMenu
Bug fixes for NetPipeReader and DrawingBoard


git-svn-id: http://skia.googlecode.com/svn/trunk@2102 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-12 14:27:47 +00:00
yangsu@google.com
42fd1e94bb CocoaSampleApp no longer depends on SkOSWindow_Mac.h
./gyp_skia now builds CocoaSampleApp on Mac
http://codereview.appspot.com/4810084/


git-svn-id: http://skia.googlecode.com/svn/trunk@2063 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-08 18:38:58 +00:00
yangsu@google.com
e55f533f4c Updated SkOSMenu to use the updated SkEvents
http://codereview.appspot.com/4809075/


git-svn-id: http://skia.googlecode.com/svn/trunk@2055 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-05 22:11:41 +00:00
reed@google.com
87fac4abd7 retool SkEvent to own its target ID or target proc
git-svn-id: http://skia.googlecode.com/svn/trunk@2041 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-04 13:50:17 +00:00
reed@google.com
c514dde99e allow events to store their target sink ID
git-svn-id: http://skia.googlecode.com/svn/trunk@2036 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-03 19:41:24 +00:00
yangsu@google.com
e938b19445 iOS SampleApp menu related changes
git-svn-id: http://skia.googlecode.com/svn/trunk@2023 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-02 13:23:15 +00:00
yangsu@google.com
654d72f94c Revised SkOSMenu
http://codereview.appspot.com/4827042/


git-svn-id: http://skia.googlecode.com/svn/trunk@2013 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-01 17:27:33 +00:00
epoger@google.com
ec3ed6a5eb Automatic update of all copyright notices to reflect new license terms.
I have manually examined all of these diffs and restored a few files that
seem to require manual adjustment.

The following files still need to be modified manually, in a separate CL:

android_sample/SampleApp/AndroidManifest.xml
android_sample/SampleApp/res/layout/layout.xml
android_sample/SampleApp/res/menu/sample.xml
android_sample/SampleApp/res/values/strings.xml
android_sample/SampleApp/src/com/skia/sampleapp/SampleApp.java
android_sample/SampleApp/src/com/skia/sampleapp/SampleView.java
experimental/CiCarbonSampleMain.c
experimental/CocoaDebugger/main.m
experimental/FileReaderApp/main.m
experimental/SimpleCocoaApp/main.m
experimental/iOSSampleApp/Shared/SkAlertPrompt.h
experimental/iOSSampleApp/Shared/SkAlertPrompt.m
experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig
experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig
experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig
gpu/src/android/GrGLDefaultInterface_android.cpp
gyp/common.gypi
gyp_skia
include/ports/SkHarfBuzzFont.h
include/views/SkOSWindow_wxwidgets.h
make.bat
make.py
src/opts/memset.arm.S
src/opts/memset16_neon.S
src/opts/memset32_neon.S
src/opts/opts_check_arm.cpp
src/ports/SkDebug_brew.cpp
src/ports/SkMemory_brew.cpp
src/ports/SkOSFile_brew.cpp
src/ports/SkXMLParser_empty.cpp
src/utils/ios/SkImageDecoder_iOS.mm
src/utils/ios/SkOSFile_iOS.mm
src/utils/ios/SkStream_NSData.mm
tests/FillPathTest.cpp
Review URL: http://codereview.appspot.com/4816058

git-svn-id: http://skia.googlecode.com/svn/trunk@1982 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-28 14:26:00 +00:00
yangsu@google.com
6eece45cf3 Fixed iOSSampleApp dependencies
git-svn-id: http://skia.googlecode.com/svn/trunk@1822 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-07 19:45:39 +00:00
senorblanco@chromium.org
78b8253c0a Parse SampleApp command line for a test name. If an argument is passed to
SampleApp on the command line, interpret it as a test name.  If it's a valid
test, open that test at startup.

Review URL:  http://codereview.appspot.com/4661054/



git-svn-id: http://skia.googlecode.com/svn/trunk@1742 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-28 19:44:03 +00:00
yangsu@google.com
1a2b4c1586 Added utility functions and iOS ports of SkWindow, SkOSFile, SkFontHost, and SkImageDecoder
the iOSSampleApp in experimental currently includes all the following files but only uses SkOSWindow_iOS and SkOSFile_iOS
http://codereview.appspot.com/4657047/


git-svn-id: http://skia.googlecode.com/svn/trunk@1706 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-24 17:20:50 +00:00
Scroggo
d3aed39ab1 Unify handleTouch and handleClick in SampleApp.
Allow each sample to handle clicks in Android SampleApp.

Remove SampleWindow::handleTouch.

Allow an SkWindow to have multiple clicks.

Add an owner pointer to SkView::Click.

Reviewed at http://codereview.appspot.com/4643052/


git-svn-id: http://skia.googlecode.com/svn/trunk@1673 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-22 13:26:56 +00:00
Scroggo
8ac0d542b0 Add a way to save to PDF in SampleApp on Android and elsewhere.
In Android, add the PDF file to downloads, so it can be opened.

Reviewed at http://codereview.appspot.com/4638052/


git-svn-id: http://skia.googlecode.com/svn/trunk@1659 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-21 14:44:57 +00:00
Scroggo
2c8208f3a4 Improvements to the SampleApp (primarily Android).
Reviewed at http://codereview.appspot.com/4587042/

Android
- Added buttons for interaction without a keyboard.
- Added the ability to zoom in to a specific point (roughly).
- Added event handling (for showing a slideshow, for example).
- Allow changing screen orientation
- Updated README file, explaining how to build

Multiplatform changes
- Added SampleApp header file
- Remove FPS when turning off measure FPS mode


git-svn-id: http://skia.googlecode.com/svn/trunk@1596 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-15 16:49:08 +00:00
djsollen@google.com
e32b5837c3 Updates to the Android SampleApp
http://codereview.appspot.com/4602049/


git-svn-id: http://skia.googlecode.com/svn/trunk@1567 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-13 16:58:40 +00:00
Scroggo
aed68d999b Make linux sample app work on my laptop. Reviewed at http://codereview.appspot.com/4568050/
git-svn-id: http://skia.googlecode.com/svn/trunk@1539 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-08 14:26:00 +00:00
Scroggo
f33d153732 Port the SampleApp (raster) to Android.
git-svn-id: http://skia.googlecode.com/svn/trunk@1452 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-31 17:10:21 +00:00
Scroggo
9df214e836 http://codereview.appspot.com/4373057/
git-svn-id: http://skia.googlecode.com/svn/trunk@1135 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-04-15 14:48:08 +00:00
reed@google.com
5e3496e555 move SkMetaData into core
git-svn-id: http://skia.googlecode.com/svn/trunk@1018 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-30 17:10:42 +00:00
Scroggo
0f185c2709 Move zoomer into SampleApp
git-svn-id: http://skia.googlecode.com/svn/trunk@1002 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-24 18:35:50 +00:00
scroggo
08526c07f4 Add a 'fatbits' mode to unix sample app.
git-svn-id: http://skia.googlecode.com/svn/trunk@978 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-22 14:03:21 +00:00
mike@reedtribe.org
dd0cd34067 allow window-subclass to handle dispatching click events (for resize)
add drag tracking to Draw



git-svn-id: http://skia.googlecode.com/svn/trunk@967 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-21 00:53:39 +00:00
bsalomon@google.com
c8ad63e5e4 Initial GYP file for skia / gr. Builds SampleApp on Mac, Windows, Linux.
Review URL: http://codereview.appspot.com/4282056/

git-svn-id: http://skia.googlecode.com/svn/trunk@955 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-18 14:29:44 +00:00
reed@google.com
52f57e1d11 add fling
git-svn-id: http://skia.googlecode.com/svn/trunk@946 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-16 12:10:02 +00:00
scroggo
b7e9aee1ac Add a sample application that runs on unix.
git-svn-id: http://skia.googlecode.com/svn/trunk@938 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-15 15:15:15 +00:00
bsalomon@google.com
498a623e2e Remove offscreen GL support from SampleApp and SkOSWindow. This never worked anywhere but Mac and it doesn't work there anymore.
git-svn-id: http://skia.googlecode.com/svn/trunk@918 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-10 18:24:15 +00:00
reed@android.com
48cf8ac144 change forward decl of SkMatrix from struct (wrong) to class (correct)
fixes issue http://code.google.com/p/skia/issues/detail?id=139



git-svn-id: http://skia.googlecode.com/svn/trunk@755 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-02-03 15:51:56 +00:00
reed@google.com
232a660169 remove obsolete, unsupported sound files
git-svn-id: http://skia.googlecode.com/svn/trunk@679 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-01-07 15:34:36 +00:00
reed@android.com
f2b98d67dc merge with changes for GPU backend
git-svn-id: http://skia.googlecode.com/svn/trunk@637 2bbb7eff-a529-9590-31e7-b0007b416f81
2010-12-20 18:26:13 +00:00
reed@android.com
e191b16fda update windows port
git-svn-id: http://skia.googlecode.com/svn/trunk@461 2bbb7eff-a529-9590-31e7-b0007b416f81
2009-12-18 21:33:39 +00:00
reed@android.com
e522ca5d5f fix winding bug in lineclipper
expose path.dump() all the time
UP arrow now toggles a grid of clip rects in sample app



git-svn-id: http://skia.googlecode.com/svn/trunk@443 2bbb7eff-a529-9590-31e7-b0007b416f81
2009-11-23 20:10:41 +00:00