AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
14,078 Commits 1 Branch 0 Tags 544 MiB
c0eb9b9818
Commit Graph

93 Commits

Author SHA1 Message Date
reed
0397e9f341 use surface in SkView/SampleApp 
BUG=skia:
R=bsalomon@google.com, robertphillips@google.com

Author: reed@google.com

Review URL: https://codereview.chromium.org/580073003
 2014-09-18 11:29:01 -07:00
caryclark
a10742c69c update to accommodate latest clang in chrome toolchain 
remove asserts for null pointers to references
change var args signature to pointer instead of array

R=mtklein@google.com, reed@android.com, reed@google.com, mtklein, reed

Author: caryclark@google.com

Review URL: https://codereview.chromium.org/577243002
 2014-09-18 11:00:40 -07:00
bsalomon
49f085dddf "NULL !=" = NULL 
R=reed@google.com

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/544233002
 2014-09-05 13:34:00 -07:00
caryclark
17f0b6df72 share dm and command flags 
Share command flags between dm and unit tests.
Also, allow dm's core to be included by itself and iOSShell.

Command line flags that are the same (or nearly the same) in DM
and in skia_tests have been moved to common_flags. Authors,
please check to see that the shared common flag is correct for
the tool.

For iOS, the 'tool_main' entry point has a wrapper to allow multiple
tools to be statically linked in the iOSShell.
Since SkCommandLineFlags::Parse can only be called once, these calls
are disabled in the IOS build.

Since the iOS app directory is dynamically assigned a name, use '@' to
select it. (This is the same convention chosen by the Mobile Harness
iOS file system utilities.)

Move the heart of dm.gyp into dm.gypi so that it can be included by
itself and iOSShell.gyp.

Add tools/flags/SkCommonFlags.* to define and declare common
command line flags.

Add support for dm to iOSShell.

BUG=skia:
R=scroggo@google.com, mtklein@google.com, jvanverth@google.com, bsalomon@google.com

Author: caryclark@google.com

Review URL: https://codereview.chromium.org/389653004
 2014-07-22 10:15:35 -07:00
robertphillips@google.com
53ba425c91 Drop executable flag from headers so that they can be packaged 
https://codereview.chromium.org/194883004/



git-svn-id: http://skia.googlecode.com/svn/trunk@13746 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-11 19:55:51 +00:00
commit-bot@chromium.org
b45c56e4b7 fix iOS build -- pass colortype, not config 
BUG=skia:
R=scroggo@google.com

Author: reed@google.com

Review URL: https://codereview.chromium.org/170743002

git-svn-id: http://skia.googlecode.com/svn/trunk@13494 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-18 23:32:05 +00:00
reed@google.com
8cb741c9da add param name w/ default arg to work around clang bug on mac 10.7 
git-svn-id: http://skia.googlecode.com/svn/trunk@13486 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-18 16:40:42 +00:00
commit-bot@chromium.org
e24ad23ae6 use SkColorType instead of SkBitmap::Config in views/effects 
R=scroggo@google.com, reed@google.com
TBR=scroggo

Author: reed@chromium.org

Review URL: https://codereview.chromium.org/168843002

git-svn-id: http://skia.googlecode.com/svn/trunk@13469 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-16 22:03:38 +00:00
tfarina@chromium.org
658650c5b4 Remove unused methods from SkWindow. 
I came to this while grepping for deprecated SkBitmap's eraseRGB()
method.

BUG=None
TEST=SampleApp still links
R=reed@google.com, robertphillips@google.com

Review URL: https://codereview.chromium.org/147433002

git-svn-id: http://skia.googlecode.com/svn/trunk@13184 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-25 18:45:45 +00:00
commit-bot@chromium.org
a3b84d41ef Support MSAA4 and (non-ES) OpenGL in Android SampleApp 
Add a menu item to set the OpenGL context type that SampleApp uses on
Android. The submenu of the new item will present options to create
OpenGL ES or OpenGL, aliased or multisampled.

R=djsollen@google.com, bsalomon@google.com

Author: kkinnunen@nvidia.com

Review URL: https://codereview.chromium.org/60273006

git-svn-id: http://skia.googlecode.com/svn/trunk@12610 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-12-10 20:37:41 +00:00
reed@google.com
acb3d88cf8 use select() so we can wait for XEvents or our timer 
poll for xevents using XPending

BUG=

Review URL: https://codereview.chromium.org/17275003

git-svn-id: http://skia.googlecode.com/svn/trunk@9633 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-06-17 13:42:43 +00:00
reed@google.com
079813e2da speculative fix in TransitionView. don't validate after detachFromParent (we may have been deleted) 
git-svn-id: http://skia.googlecode.com/svn/trunk@9619 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-06-14 17:46:07 +00:00
reed@google.com
a25c94e50a add validate to SkView for debugging 
git-svn-id: http://skia.googlecode.com/svn/trunk@9596 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-06-13 20:20:17 +00:00
sugoi@google.com
9c55f801a3 Fixing some warnings on Linux 
There were only a few warnings left, so I fixed them and enabled the unused variable warning by removing the "-Wno-unused" flag. Only the -Wno-unused-parameter remains for now (could be removed later).
Review URL: https://codereview.chromium.org/12480002

git-svn-id: http://skia.googlecode.com/svn/trunk@8030 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-07 20:52:59 +00:00
bsalomon@google.com
64cc810ad1 Make SkOSWindow return the sample count and stencil bit count for its GL context. 
Review URL: https://codereview.chromium.org/12437010

git-svn-id: http://skia.googlecode.com/svn/trunk@7995 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-05 20:06:05 +00:00
skia.committer@gmail.com
e16efc1882 Sanitizing source files in Skia_Periodic_House_Keeping 
git-svn-id: http://skia.googlecode.com/svn/trunk@7406 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-01-26 07:06:02 +00:00
reed@google.com
b6c933cc9b fix iOS build after adding modifierKeys to click events 
git-svn-id: http://skia.googlecode.com/svn/trunk@7107 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-01-09 16:36:30 +00:00
reed@google.com
4d5c26de0a pass modifier keys to click events (e.g. control | shift etc.) 
Review URL: https://codereview.appspot.com/7062054

git-svn-id: http://skia.googlecode.com/svn/trunk@7082 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-01-08 16:17:50 +00:00
mike@reedtribe.org
e78dd4b529 add metadata to Click for views 
git-svn-id: http://skia.googlecode.com/svn/trunk@6963 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-01-02 04:10:33 +00:00
borenet@google.com
7158e6acca Improve NaCl support 
- Add nacl_make script to build Skia targets for NaCl using gyp
- Add nacl_interface for command-line apps
- Add nacl_sample as front-end for SampleApp
- Add freetype to DEPS
- Various gyp tweaks for NaCl

TODO:
- Implement GL interface
- Implement font host
- Fix plumbing so that SampleApp works properly
Review URL: https://codereview.appspot.com/6671044

git-svn-id: http://skia.googlecode.com/svn/trunk@6245 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-11-01 17:43:44 +00:00
tfarina@chromium.org
3fe1690834 Delete three class declarations that we don't provide implementations anymore. 
This can be removed now that https://codereview.appspot.com/6650055/ was landed
in r5942.

R=epoger@google.com,reed@google.com

Review URL: https://codereview.appspot.com/6677044

git-svn-id: http://skia.googlecode.com/svn/trunk@5967 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-16 17:30:07 +00:00
reed@google.com
5957f47e8d retool so we don't need to call SkCanvas::setDevice 
Review URL: https://codereview.appspot.com/6591054

git-svn-id: http://skia.googlecode.com/svn/trunk@5759 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-01 20:31:56 +00:00
tfarina@chromium.org
887760f60b views: Fix a typo in SkEvent.h 
WndProc is not implemented by unix/linux and does not even compile fixing the
typoe, so just remove these function declarations.

R=bsalomon@google.com

Review URL: https://codereview.appspot.com/6561062

git-svn-id: http://skia.googlecode.com/svn/trunk@5749 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-01 16:14:21 +00:00
reed@google.com
aa400ee34c doh, fix typo 
git-svn-id: http://skia.googlecode.com/svn/trunk@5717 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-27 21:03:49 +00:00
reed@google.com
4c9e2aa7c7 eliminate (unused) extra param to update(), and thereby remove (bad bad bad) setBitmapDevice call. 
git-svn-id: http://skia.googlecode.com/svn/trunk@5716 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-27 20:58:01 +00:00
tfarina@chromium.org
e229e92ea5 Remove deprecated SkOSWindow_wxwidgets.h 
It seems we never really supported WxWidgets.

R=bsalomon@google.com

Review URL: https://codereview.appspot.com/6569062

git-svn-id: http://skia.googlecode.com/svn/trunk@5708 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-27 13:44:57 +00:00
caryclark@google.com
867cbd8bc2 first cut at making iOS work 
Replace __arm__ with SK_CPU_ARM
add support for iOS simulator and device
fix const warning in iOSSampleApp
update gyp files

https://code.google.com/p/skia/issues/detail?id=900
tracks fixing missing arm assembly
Review URL: https://codereview.appspot.com/6552045

git-svn-id: http://skia.googlecode.com/svn/trunk@5606 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-20 15:45:41 +00:00
rmistry@google.com
fbfcd56021 Result of running tools/sanitize_source_files.py (which was added in https://codereview.appspot.com/6465078/) 
This CL is part I of IV (I broke down the 1280 files into 4 CLs).
Review URL: https://codereview.appspot.com/6485054

git-svn-id: http://skia.googlecode.com/svn/trunk@5262 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-08-23 18:09:54 +00:00
robertphillips@google.com
a22e2117e4 Extended Inst counting to find "unknown" leaked object (SkTMaskGamma) 
http://codereview.appspot.com/6453127/



git-svn-id: http://skia.googlecode.com/svn/trunk@5123 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-08-16 14:58:06 +00:00
bsalomon@google.com
cf8fb1f6f0 Create GPU-less build of Skia. 
git-svn-id: http://skia.googlecode.com/svn/trunk@4912 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-08-02 14:03:32 +00:00
bungeman@google.com
37946b5b2e Move animated view headers to correct directory. 
git-svn-id: http://skia.googlecode.com/svn/trunk@4524 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-10 21:54:31 +00:00
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