AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,037 Commits 1 Branch 0 Tags 544 MiB
887760f60b
Commit Graph

605 Commits

Author SHA1 Message Date
bsalomon@google.com
89dec58122 Disable thumb on IOS. This removes one of XCodes complaints about the generated projects. 
R=caryclark@google.com
Review URL: https://codereview.appspot.com/6561072

git-svn-id: http://skia.googlecode.com/svn/trunk@5726 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-28 18:33:11 +00:00
bsalomon@google.com
cca3c8f21b Make gpu work in iOS SampleApp. 
This includes updates to the GrGLInterface and changes to the DeviceManager subclass used on iOS.
Review URL: https://codereview.appspot.com/6582043

git-svn-id: http://skia.googlecode.com/svn/trunk@5722 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-28 16:56:28 +00:00
bsalomon@google.com
230504d6b5 Make SampleApp work on iPhone/iOS simulator. 
Several parts to this:

1) The DeviceManager subclass for iOS was rewritten because the base class
changed.

2) Two old samples that rely on hardcoded paths to images are deleted. They hit
assertions in SkImageRef. No one has the required images to run these anyway.

3) argv must be non-NULL.

4) The UI delegate must not be loaded from the NIB for viewDidLoad ordering
reasons. So I removed an IBOutlet link from the window to the splitview
controller in the iPad's NIB file. The split view is attached by the AppDelegate
programmatically.

This doesn't make GPU work. That will come in a later change.

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



git-svn-id: http://skia.googlecode.com/svn/trunk@5712 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-27 16:04:54 +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
fmalita@google.com
bacfcfb11c Generate debugger MOCs on the fly 
Added gyp rules to generate Qt MOC files at build time, and removed the pre-packaged versions.

Tested on Mac with Qt 4.6.4 & 4.8.3, and on Linux with Qt 4.8.1.

R=caryclark@google.com,robertphillips@google.com,djsollen@google.com
BUG=

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

git-svn-id: http://skia.googlecode.com/svn/trunk@5707 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-27 13:34:34 +00:00
fmalita@google.com
36631b99f9 Fix Xcode 4.x debugger build 
Adding a mac_framework_dirs entry to help Xcode find the Qt frameworks.

R=djsollen@google.com

BUG=

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

git-svn-id: http://skia.googlecode.com/svn/trunk@5702 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-26 18:32:58 +00:00
caryclark@google.com
4588ce85cd move the xcode setup for SYMROOT to the outermost level 
Review URL: https://codereview.appspot.com/6576050

git-svn-id: http://skia.googlecode.com/svn/trunk@5693 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-26 15:48:43 +00:00
caryclark@google.com
5c83dcc371 add simple ios app 
update ios flavor of sample app
fix utils.gyp for ios

git-svn-id: http://skia.googlecode.com/svn/trunk@5686 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-26 13:02:37 +00:00
caryclark@google.com
d312804b21 shape ops -- update gyp projects 
goodbye cruel world (updating to OS X 10.8)

git-svn-id: http://skia.googlecode.com/svn/trunk@5685 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-26 13:00:03 +00:00
mike@reedtribe.org
9dd78c7821 re-land 5681, but just the gyp file I wanted 
git-svn-id: http://skia.googlecode.com/svn/trunk@5683 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-26 03:10:09 +00:00
mike@reedtribe.org
9a520eb745 revert 5681 
git-svn-id: http://skia.googlecode.com/svn/trunk@5682 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-26 03:08:16 +00:00
mike@reedtribe.org
4269631bdf remove SampleXfermodes.cpp (obsolete, as we have it as a GM) 
git-svn-id: http://skia.googlecode.com/svn/trunk@5681 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-26 03:06:55 +00:00
bsalomon@google.com
2e91d7adb7 Disable warning emitted in libjpg build 
Review URL: https://codereview.appspot.com/6573047

git-svn-id: http://skia.googlecode.com/svn/trunk@5673 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-25 19:14:14 +00:00
robertphillips@google.com
f585c45173 Remove GrTLList.h 
https://codereview.appspot.com/6577043/



git-svn-id: http://skia.googlecode.com/svn/trunk@5670 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-25 18:53:17 +00:00
epoger@google.com
ddd8fa8f45 Remove SkListWidget.cpp, which has not been compiled for 18 months 
(Our very first gyp file from https://code.google.com/p/skia/source/detail?spec=svn955&r=955 already had it turned off)
Review URL: https://codereview.appspot.com/6566049

git-svn-id: http://skia.googlecode.com/svn/trunk@5668 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-25 18:24:41 +00:00
epoger@google.com
4e2d4ff99d Delete SkListView.cpp, which has been #ifdef'ed out for 4+ years 
Review URL: https://codereview.appspot.com/6550062

git-svn-id: http://skia.googlecode.com/svn/trunk@5667 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-25 17:48:30 +00:00
caryclark@google.com
129dee8014 fix mac builds 
comment out 64 bit / mac error check

git-svn-id: http://skia.googlecode.com/svn/trunk@5654 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-24 21:38:38 +00:00
senorblanco@chromium.org
b8d212fe95 Build fix. Unreviewed. 
git-svn-id: http://skia.googlecode.com/svn/trunk@5653 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-24 21:27:14 +00:00
caryclark@google.com
18b3823d29 unbreak the build part ii 
allow android in debugger.gyp

git-svn-id: http://skia.googlecode.com/svn/trunk@5651 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-24 20:08:43 +00:00
caryclark@google.com
976298edd7 unbreak the build 
move define of skia_arch_type to front

git-svn-id: http://skia.googlecode.com/svn/trunk@5650 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-24 19:41:43 +00:00
caryclark@google.com
594dd3cd78 iOS support work in progress 
include/core/SkTypes.h
- address unsigned warning

include/core/SkInstCnt.h
src/core/SkInstCnt.cpp
gyp/common.gypi
- always define SK_ENABLE_INST_COUNT for debug builds

src/views/mac/SkNSView.mm
- only call glClear if there is a GL context

src/ports/SkImageDecoder_CG.cpp
- fix iOS hack by using proper include

gyp/opts.gyp
- exclude more ARM files from iOS for now (see issue 900)

gyp/common_conditions.gypi
- add release, more ios specific common settings

gyp/bench.gyp
- add iOS condition

gyp/SampleApp.gyp
- remove precompiled header, hardcoded SDK path
- add more frameworks

gyp/debugger.gyp
- fix syntax error
- add iOS/Android condition

gyp/core.gyp
- remove hardcoded SDK path, add more frameworks

gyp/common_variables.gypi
- add ios SDK path
- add ios SDK version

gyp/iOSSampleApp.gyp
- remove obsolete project

gyp/zlib.gyp
- add ios library path
Review URL: https://codereview.appspot.com/6551070

git-svn-id: http://skia.googlecode.com/svn/trunk@5649 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-24 19:33:57 +00:00
senorblanco@chromium.org
cc9471c36d Fix premul alpha problems w/matrix convolution filter, and re-enable the bench. 
http://codereview.appspot.com/6541043/



git-svn-id: http://skia.googlecode.com/svn/trunk@5610 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-20 17:59:49 +00:00
senorblanco@chromium.org
bc5cbfe4ed Pull SDKROOT into a gyp variable, so it can be locally overridden. This 
allows building on Lion or Mountain Lion using XCode 4.4.

http://codereview.appspot.com/6553044/



git-svn-id: http://skia.googlecode.com/svn/trunk@5607 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-20 16:10:02 +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
senorblanco@chromium.org
79723f9826 Unreviewed; build fix. 
Disable matrixconvolution bench until I can figure out the
premul issues.



git-svn-id: http://skia.googlecode.com/svn/trunk@5593 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-18 20:44:01 +00:00
senorblanco@chromium.org
5faa2dc266 Implements a matrix convolution filter (raster path only). The filtering loop 
is templated on the tiling mode for speed:  interior pixels are unconditionally
fetched; border pixels apply the appropriate tiling mode before fetching.  It
handles target, bias, divisor (as gain), and edge modes (named to be more
skia-like).  It does not handle the "preserveAlpha" semantics of
feConvolveMatrix, nor "kernelUnitLength".



git-svn-id: http://skia.googlecode.com/svn/trunk@5592 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-18 20:32:34 +00:00
robertphillips@google.com
3b57dedc4b Added functor to GrTHashCache to allow discovery of un-reffed resources 
http://codereview.appspot.com/6503126/



git-svn-id: http://skia.googlecode.com/svn/trunk@5587 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-18 17:16:33 +00:00
caryclark@google.com
35f5ac9738 update gyp files to build on iOS 
Note that there's a hack in SkImageDecoder_CG.cpp --
the necessary defines are included directly. This
is temporary until I can figure out how to include
them properly.
Review URL: https://codereview.appspot.com/6523044

git-svn-id: http://skia.googlecode.com/svn/trunk@5586 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-18 15:41:18 +00:00
reed@google.com
7112173c3c re-re-land 5578 
will follow w/ new .skp files to keep the waterfall green (I hope)



git-svn-id: http://skia.googlecode.com/svn/trunk@5584 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-18 15:14:33 +00:00
reed@google.com
10f9f4a844 revert 5580 
git-svn-id: http://skia.googlecode.com/svn/trunk@5581 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-18 14:04:54 +00:00
reed@google.com
eab16dea1c re-land 5578 w/ pipe fix 
git-svn-id: http://skia.googlecode.com/svn/trunk@5580 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-18 13:47:20 +00:00
reed@google.com
c75c36a14b revert 5578 -- broke pipe 
git-svn-id: http://skia.googlecode.com/svn/trunk@5579 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-18 13:20:52 +00:00
reed@google.com
f1ab723033 Change drawBitmapRect to take a float-src-rect instead of integer-src-rect. This 
allows the client more control over the scaling. Because of virtual overrides
and wanting to keep the old call-sites up and running, this CL renames the
virtual entry-point to drawBitmapRectToRect, and downgrades drawBitmapRect to
a non-virtual helper function.

The implementation is to use the float-rect for computing the matrix, but still
cons-up an integer rect for the purposes of subsetting the original bitmap. We
do this by calling float_src->roundOut(&int_src) so that we include all
(partially) covered src pixels.

No change needed on SkDevice, since that signature is explicitly passed the
computed matrix.
Review URL: https://codereview.appspot.com/6501140

git-svn-id: http://skia.googlecode.com/svn/trunk@5578 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-18 12:59:44 +00:00
tfarina@chromium.org
b1b7f70790 Add a header for OverView.cpp as well. 
This fixes another FIXMEs.

Signed-off-by: Thiago Farina <tfarina@chromium.org>

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

git-svn-id: http://skia.googlecode.com/svn/trunk@5576 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-18 01:52:20 +00:00
bsalomon@google.com
6c5418e6c2 Temporarily revert r5433 due to http://www.crbug.com/148637 until after M23 branch. 
git-svn-id: http://skia.googlecode.com/svn/trunk@5557 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-14 20:30:37 +00:00
epoger@google.com
6a12178fb3 Add a header file for TransitionView.cpp 
committed from https://codereview.appspot.com/6492119/ for Thiago Farina <tfarina@chromium.org>

git-svn-id: http://skia.googlecode.com/svn/trunk@5552 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-14 18:42:01 +00:00
scroggo@google.com
d614c6a4e0 For a picture playback with nothing written, use an empty SkData. 
This prevents crashing when attempting to access fOpData.

BUG=https://code.google.com/p/skia/issues/detail?id=870

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

git-svn-id: http://skia.googlecode.com/svn/trunk@5550 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-14 17:26:37 +00:00
borenet@google.com
e21795e277 Enable automatic rescaling in bench_pictures 
bench_pictures with "--device gpu" is failing because we're trying to allocate
too much GPU memory.  Move the recently-added scaling code into picture_utils
and share it between render_pictures and bench_pictures.
Review URL: https://codereview.appspot.com/6495125

git-svn-id: http://skia.googlecode.com/svn/trunk@5543 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-14 14:34:28 +00:00
rileya@google.com
ffadfb5d43 Add gm to test SkRegion/clipPath bug. 
Review URL: https://codereview.appspot.com/6501131

git-svn-id: http://skia.googlecode.com/svn/trunk@5540 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-14 13:53:36 +00:00
reed@google.com
1f1543f012 re-apply 5508, but with the new compile-flag disabled for now 
git-svn-id: http://skia.googlecode.com/svn/trunk@5516 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-12 21:08:33 +00:00
reed@google.com
bfe1572f24 revert 5508 -- it broke most of the builds 
Use http://skia.googlecode.com/svn/buildbot/buildbots.html to see the state of the build.



git-svn-id: http://skia.googlecode.com/svn/trunk@5511 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-12 18:34:49 +00:00
wjmaclean@chromium.org
1f8787a99f Using the device scale factor for glyph positioning 
The master bug is http://code.google.com/p/chromium/issues/detail?id=138101 .
The corresponding WebKit changes for this CL are here:
https://bugs.webkit.org/show_bug.cgi?id=96137

BUG=

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

git-svn-id: http://skia.googlecode.com/svn/trunk@5508 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-12 15:53:20 +00:00
borenet@google.com
c2dd3d4109 Fix noisy Android build 
Review URL: https://codereview.appspot.com/6488107

git-svn-id: http://skia.googlecode.com/svn/trunk@5503 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-11 21:37:28 +00:00
rileya@google.com
9f5898d31b Add SkBBoxRecord subclass that builds up a BBoxHierarchy and PictureStateTree. 
Review URL: https://codereview.appspot.com/6490104

git-svn-id: http://skia.googlecode.com/svn/trunk@5500 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-11 20:21:44 +00:00
reed@google.com
9135939581 rm temp slides 
git-svn-id: http://skia.googlecode.com/svn/trunk@5488 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-11 17:46:42 +00:00
rileya@google.com
4813458d89 Make BBoxHierarchy ref-counted, fix leak in RTreeTest. 
Review URL: https://codereview.appspot.com/6489108

git-svn-id: http://skia.googlecode.com/svn/trunk@5484 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-11 15:41:50 +00:00
rileya@google.com
9fd7f8d290 Add helper for maintaining clip/matrix state in non-contiguous picture playback. 
Review URL: https://codereview.appspot.com/6509043

git-svn-id: http://skia.googlecode.com/svn/trunk@5483 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-11 14:57:33 +00:00
bsalomon@google.com
047696c1c6 Move GrTextureAccess decl/defn to separate files 
Review URL: https://codereview.appspot.com/6500104/



git-svn-id: http://skia.googlecode.com/svn/trunk@5482 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-11 13:29:29 +00:00
robertphillips@google.com
7fa18762e0 Extended instance counting to all GrResource-derived classes 
http://codereview.appspot.com/6489109/



git-svn-id: http://skia.googlecode.com/svn/trunk@5480 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-11 13:02:31 +00:00
borenet@google.com
bc7661161e Fix Android build of render_pictures (Again) 
picture_renderer was somehow picking up effects as a dependency, but effects
was not present in the shared library on Android at load time.
Review URL: https://codereview.appspot.com/6498113

git-svn-id: http://skia.googlecode.com/svn/trunk@5464 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-10 16:20:47 +00:00