AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,610 Commits 1 Branch 0 Tags 544 MiB
7063c2f701
Commit Graph

82 Commits

Author SHA1 Message Date
borenet@google.com
05d550ed36 GYP Changes and Scripts for Compiling Skia for ChromeOS 
For now, this requires having a complete ChromeOS checkout.

R=djsollen@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@9505 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-06-11 15:52:19 +00:00
bsalomon@google.com
bbba784dfb Fix ninja/angle build with new gyp rev. 
git-svn-id: http://skia.googlecode.com/svn/trunk@9463 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-06-06 18:34:13 +00:00
bungeman@google.com
f51e125b94 Update gyp from 1563 to 1643 (take two). 
Re-land 9445 (reverted 9448), but add back the libs no longer provided by gyp.


git-svn-id: http://skia.googlecode.com/svn/trunk@9450 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-06-05 18:35:22 +00:00
djsollen@google.com
52f0297aaf Prepare skia for shared library build on android 
This reapplies revision 9378 after the buildbot has been updated.

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

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

git-svn-id: http://skia.googlecode.com/svn/trunk@9395 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-06-03 12:10:19 +00:00
djsollen@google.com
a96627fd24 prepare skia for shared library build on android 
R=borenet@google.com, djsollen@google.com

Committed: https://code.google.com/p/skia/source/detail?r=9378

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

git-svn-id: http://skia.googlecode.com/svn/trunk@9379 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-31 20:09:47 +00:00
djsollen@google.com
cf5348f5aa prepare skia for shared library build on android 
R=borenet@google.com, djsollen@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@9378 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-31 20:02:56 +00:00
reed@google.com
e52d2911a1 add direct_dependencies for picture_utils, and add cflags_cc for android's gypi 
Review URL: https://codereview.chromium.org/14620020

git-svn-id: http://skia.googlecode.com/svn/trunk@9152 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-15 20:01:07 +00:00
commit-bot@chromium.org
5d7ca957ed Fix gyp files to allow ninja to build 64 bit on Mac. 
Fix warnings that cropped up building as 64-bit.

BUG=
R=bsalomon@google.com, bungeman@google.com

Author: mtklein@google.com

Review URL: https://chromiumcodereview.appspot.com/13852013

git-svn-id: http://skia.googlecode.com/svn/trunk@8814 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-04-22 20:26:44 +00:00
bsalomon@google.com
d971869b3a Revert accidentally changed msvs settings in r8764. 
git-svn-id: http://skia.googlecode.com/svn/trunk@8800 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-04-22 14:56:50 +00:00
bsalomon@google.com
72993ab542 silence && || parens clang warning. 
git-svn-id: http://skia.googlecode.com/svn/trunk@8764 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-04-19 13:25:28 +00:00
djsollen@google.com
bde506cf99 Revert Skia to use -02. 
There was no clear speed improvement and the
increase in binary size was substantial.

Committed: http://code.google.com/p/skia/source/detail?r=8492

Committed: https://code.google.com/p/skia/source/detail?r=8494

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

git-svn-id: http://skia.googlecode.com/svn/trunk@8539 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-04-04 19:42:51 +00:00
djsollen@google.com
534cb63cb5 Revert Skia to use -02. 
There was no clear speed improvement and the
increase in binary size was substantial.

Committed: http://code.google.com/p/skia/source/detail?r=8492

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

git-svn-id: http://skia.googlecode.com/svn/trunk@8494 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-04-02 18:14:21 +00:00
commit-bot@chromium.org
af3b510432 Revert Skia to use -02. 
There was no clear speed improvement and the
increase in binary size was substantial.


Author: djsollen@google.com

Reviewed By: borenet@google.com

Review URL: https://chromiumcodereview.appspot.com/13468010

git-svn-id: http://skia.googlecode.com/svn/trunk@8492 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-04-02 17:36:30 +00:00
borenet@google.com
a72aef8a21 Refactor skia_warnings_as_errors 
Review URL: https://codereview.chromium.org/12963002

git-svn-id: http://skia.googlecode.com/svn/trunk@8330 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-22 13:16:06 +00:00
bsalomon@google.com
b58a639b2f Enable init'ed but unused var warning on windows for closer parity with mac/linux warnings. 
Review URL: https://codereview.chromium.org/12536008

git-svn-id: http://skia.googlecode.com/svn/trunk@8307 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-21 20:29:05 +00:00
commit-bot@chromium.org
c8e011c208 Update Android Release build to use -O3. 
Author: djsollen@google.com

Reviewed By: borenet@google.com

Review URL: https://chromiumcodereview.appspot.com/12784006

git-svn-id: http://skia.googlecode.com/svn/trunk@8153 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-14 13:58:40 +00:00
commit-bot@chromium.org
059a4c70d7 refactor android defines to implicitly assume NDK compliance unless it is explicitly marked as being specific to the android framework. 
Author: djsollen@google.com

Reviewed By: reed@google.com,borenet@google.com

Review URL: https://chromiumcodereview.appspot.com/12739007

git-svn-id: http://skia.googlecode.com/svn/trunk@8124 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-13 12:48:26 +00:00
sugoi@google.com
dfc867bab2 Turning on warning as error on Linux 
Fixed the few remaining warnings and turned on warning as error on Linux.

Explicitly turned off warning as error in libjpeg, cityhash and json.
Review URL: https://codereview.chromium.org/12521010

git-svn-id: http://skia.googlecode.com/svn/trunk@8067 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-11 18:45:12 +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
humper@google.com
522dbd2e62 match chromium's approach for locating the most appropriate macos SDK to use 
By doing this, the ninja generator for gyp works great on macos, resulting in faster (I think) and much, much terser builds.

BUG=

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

git-svn-id: http://skia.googlecode.com/svn/trunk@7684 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-02-08 21:45:33 +00:00
djsollen@google.com
efbe8e9bed Fix errors when compiling with -Wall -Werror on Android. 
This CL also turns those features on by default on Android

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

git-svn-id: http://skia.googlecode.com/svn/trunk@7645 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-02-07 18:58:35 +00:00
robertphillips@google.com
194bf824f0 Reverse sense of convex-quad-fix compiler flag 
https://codereview.appspot.com/7206045/



git-svn-id: http://skia.googlecode.com/svn/trunk@7349 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-01-23 20:45:26 +00:00
djsollen@google.com
4dcc624ee0 Update Android toolchain to NDK r8d with GCC 4.7 
Review URL: https://codereview.appspot.com/7201045

git-svn-id: http://skia.googlecode.com/svn/trunk@7343 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-01-23 18:56:38 +00:00
bsalomon@google.com
57585fa2c4 Turn off WarnAsError when building ANGLE projects on windows. 
git-svn-id: http://skia.googlecode.com/svn/trunk@7096 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-01-08 21:46:05 +00:00
bsalomon@google.com
1d03ba98d3 Turn off warnings-as-error on 64bit windows build due to many size_t-related warnings. 
git-svn-id: http://skia.googlecode.com/svn/trunk@7095 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-01-08 20:40:22 +00:00
bsalomon@google.com
50c79d886b Enable warnings-as-errors on Windows. 
Review URL: https://codereview.appspot.com/7066054

git-svn-id: http://skia.googlecode.com/svn/trunk@7094 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-01-08 20:31:53 +00:00
humper@google.com
fe0d680bcc disable werror on 64 bit 
BUG=

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

git-svn-id: http://skia.googlecode.com/svn/trunk@7066 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-01-07 20:28:16 +00:00
humper@google.com
05af1afd42 eliminate all warnings in non-thirdparty code on mac 
Most of these issues were due to functions whose definitions appear in header files; I changed those functions to be 'static inline' instead of just 'static' or 'inline', which kills the warning for such functions.

Other functions that were static or anonymous-namespaced but were unused in cpp files were probably called at some point but are no longer; someone who knows more than I do should probably scrub all the functions I either deleted or #if 0'ed out and make sure that the right thing is happening here.

Lots of unused variables removed, and one nasty const issue handled.

There remains a single warning in thirdparty/externals/cityhash/src/city.cc on line 146 related to a signed/unsigned mismatch.  I don't know if we have control over this library so I didn't fix this one, but perhaps someone could do something about that one.

BUG=

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

git-svn-id: http://skia.googlecode.com/svn/trunk@7051 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-01-07 16:47:43 +00:00
rmistry@google.com
7cdea64233 The goal is to make the ClangCompile buildstep in the Housekeeping bot turn red if there is a warning. 
Review URL: https://codereview.appspot.com/6868055

git-svn-id: http://skia.googlecode.com/svn/trunk@6674 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-12-05 14:56:08 +00:00
djsollen@google.com
5afbbc47df Enable profiling options to be selectively enabled for a given build 
Review URL: https://codereview.appspot.com/6858089

git-svn-id: http://skia.googlecode.com/svn/trunk@6598 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-11-29 15:09:58 +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
robertphillips@google.com
c7a37c7bb2 Place r5997 (make arcto's convex) behind a compiler flag to delay day of reckoning with Webkit baselines 
git-svn-id: http://skia.googlecode.com/svn/trunk@6012 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-19 01:26:18 +00:00
scroggo@google.com
f94dd182e6 Remove an obsolete comment. 
This comment is no longer true as of r5869.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@5957 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-15 18:27:25 +00:00
borenet@google.com
efb1d77ad2 Build Skia as a static library 
- Roll GYP so that we get non-thin archives on Linux
- Add merge_static_libs.py
- Add skia_core_lib target which builds core, ports, opts*, and utils
- Replace dependencies on core/ports/opts/utils with skia_core_libs
- Rename exportable libraries with "skia_"
Review URL: https://codereview.appspot.com/6619049

git-svn-id: http://skia.googlecode.com/svn/trunk@5889 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-10 19:45:51 +00:00
bungeman@google.com
43b4ed5b0c xcode_settings OTHER_CPLUSPLUSFLAGS is a list. 
https://codereview.appspot.com/6588062/


git-svn-id: http://skia.googlecode.com/svn/trunk@5769 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-02 15:42:21 +00:00
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
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
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
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
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
borenet@google.com
b7961193a3 Enable 64-bit builds on Windows 
Encountered compile errors passing 64-bit size_t to
SkIntToScalar and needed to make adjustments to
gm/gradients.cpp and bench/PicturePlaybackBench.cpp.

Verified on my local Linux, Mac, and Windows machines.

As of this change, the skia_arch_width gyp define
actually forces a 32/64-bit build on Linux, Mac, and
Windows.
Review URL: https://codereview.appspot.com/6460112

git-svn-id: http://skia.googlecode.com/svn/trunk@5195 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-08-20 18:58:26 +00:00
chudy@google.com
bbad34de3b Effects Bug Fix 
Certain compilers in an effort to optimize code chop off files that are never
used. By adding a flag to common conditions and variables we can force skia to
recompile with global static initializers off. By making a call to
SkGraphics::Init we now register all those functions that had been previously
automatically excluded by the compiler.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@5057 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-08-13 14:26:36 +00:00
borenet@google.com
a37a517b54 Enable 32/64-bit gyp switch on Linux 
Linux defaults to 64, other platforms 32.  As of this change, only Mac and
Linux are affected by the skia_arch_width flag.  Next step is to make Win
work as well.
Review URL: https://codereview.appspot.com/6460066

git-svn-id: http://skia.googlecode.com/svn/trunk@5041 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-08-09 20:44:32 +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
97efada074 Gamma correcting masks. 
https://codereview.appspot.com/6244068/


git-svn-id: http://skia.googlecode.com/svn/trunk@4841 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-30 20:40:50 +00:00
borenet@google.com
de9ac1446c Fix Android build for new toolchain 
The new toolchain (r8b) does not automatically include
the necessary directories
(http://code.google.com/p/android/issues/detail?id=35279).
Add them manually until this is fixed.
Review URL: https://codereview.appspot.com/6419076

git-svn-id: http://skia.googlecode.com/svn/trunk@4749 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-25 15:17:03 +00:00