Commit Graph

3419 Commits

Author SHA1 Message Date
djsollen@google.com
54924243c1 Cleanup code related to SkFlattenable::flatten()
The following changes were made by this CL:

1. Make flatten() a protected method as callers should use
   SkFlattenableWriteBuffer to flatten an object
2. Make flatten a const method (including subclasses)
3. Mark subclass implementation of flatten with SK_OVERRIDE
4. Ensure overridden flatten impls call their parent
5. Remove no-op implementations of flatten from subclasses

Additionally, if necessary the unflattening constructor was
also moved to the protected section of the subclasses
header if it was not already there.

git-svn-id: http://skia.googlecode.com/svn/trunk@3540 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-29 15:18:04 +00:00
bungeman@google.com
5a64e58ebb Revert 3538.
git-svn-id: http://skia.googlecode.com/svn/trunk@3539 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-29 14:51:56 +00:00
bungeman@google.com
29b63dc863 Correct dependencies in gyp files.
http://codereview.appspot.com/5934044/


git-svn-id: http://skia.googlecode.com/svn/trunk@3538 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-29 14:28:59 +00:00
bsalomon@google.com
5b819c1f6d Revert 3507
git-svn-id: http://skia.googlecode.com/svn/trunk@3537 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 21:34:22 +00:00
vandebo@chromium.org
9af25f3d98 Fix coverity defects in FontHost_FreeType
Reviewed in https://codereview.appspot.com/5940049/

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

git-svn-id: http://skia.googlecode.com/svn/trunk@3536 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 21:24:27 +00:00
bungeman@google.com
998547641c Move SkColorMatrix to effects.
git-svn-id: http://skia.googlecode.com/svn/trunk@3535 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 21:14:17 +00:00
vandebo@chromium.org
6390c72cfb Fix Coverity reports. (Mostly use of uninitialised values.)
CID=537,103419,103631,103632,103633

Initial review: https://codereview.appspot.com/5936047/

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

git-svn-id: http://skia.googlecode.com/svn/trunk@3534 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 21:03:22 +00:00
djsollen@google.com
5370cd969d Consolidate PixelRef flattables with the standard impl
The flatten method on these functions can no longer be
const as SkFlattenables declaration is not const and 
would result in the const methods only being called when
the reference to the object was const.
Review URL: https://codereview.appspot.com/5941043

git-svn-id: http://skia.googlecode.com/svn/trunk@3533 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 20:47:01 +00:00
vandebo@chromium.org
a728e35edc Fix a bunch of Coverity defects - class members not initialized in the constructor.
CID=14533,14036,9275,9271,4156,4153,4151,1666,1665,1618,1617,1616,1615

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

git-svn-id: http://skia.googlecode.com/svn/trunk@3532 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 20:29:38 +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
78ff6b4ab6 Moved mac, unix, win and mesa directories under src/gpu/gl
http://codereview.appspot.com/5937052/



git-svn-id: http://skia.googlecode.com/svn/trunk@3530 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 19:37:51 +00:00
djsollen@google.com
3d29b6330d Remove unused classes from the build.
Review URL: https://codereview.appspot.com/5938053

git-svn-id: http://skia.googlecode.com/svn/trunk@3529 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 19:36:39 +00:00
reed@google.com
954f56c77e rebaseline
git-svn-id: http://skia.googlecode.com/svn/trunk@3528 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 19:34:27 +00:00
bsalomon@google.com
4fd99ea449 Fix comparison of GrPaint::fCoverage (which is a byte not a uint32_t)
git-svn-id: http://skia.googlecode.com/svn/trunk@3527 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 18:45:58 +00:00
robertphillips@google.com
d91f370835 Moved Debug GL interface to src/gpu/gl/debug in preparation for splitting it up.
http://codereview.appspot.com/5938054/



git-svn-id: http://skia.googlecode.com/svn/trunk@3526 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 18:22:01 +00:00
bungeman@google.com
2227306aea Update skia's gyp to 1284 (was 1139).
http://codereview.appspot.com/5935050/


git-svn-id: http://skia.googlecode.com/svn/trunk@3525 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 18:18:26 +00:00
vandebo@chromium.org
fa1dd11f0e Revert r3523 and r2522
Review URL: https://codereview.appspot.com/5939051

git-svn-id: http://skia.googlecode.com/svn/trunk@3524 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 17:33:26 +00:00
vandebo@chromium.org
f0f562af5b Fix build break.
Review URL: https://codereview.appspot.com/5934055

git-svn-id: http://skia.googlecode.com/svn/trunk@3523 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 17:30:12 +00:00
vandebo@chromium.org
354fd0e2b1 Fix Coverity reports. (Mostly use of uninitialised values.)
CID=537,103419,103631,103632,103633

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

git-svn-id: http://skia.googlecode.com/svn/trunk@3522 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 17:25:21 +00:00
caryclark@google.com
988ad539ec shape ops builders; fix typo
git-svn-id: http://skia.googlecode.com/svn/trunk@3521 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 17:04:08 +00:00
caryclark@google.com
a5764233aa first support at shape ops support for quads
git-svn-id: http://skia.googlecode.com/svn/trunk@3520 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 16:20:21 +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
reed@google.com
42aea289cb handle null-device correctly in setDevice
git-svn-id: http://skia.googlecode.com/svn/trunk@3518 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 16:19:15 +00:00
tomhudson@google.com
19224c3d79 Fix a memory leak in SkAAClip::translate().
Originally proposed by Jochen Eisinger.

http://codereview.appspot.com/5934053/



git-svn-id: http://skia.googlecode.com/svn/trunk@3517 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 15:46:37 +00:00
bsalomon@google.com
95cd7bdf2b Make printf in GrContext about partial pixel coverage be debug-only
git-svn-id: http://skia.googlecode.com/svn/trunk@3516 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 15:35:05 +00:00
bsalomon@google.com
d4df21793d shadows GPU GM rebaseline from r3514
git-svn-id: http://skia.googlecode.com/svn/trunk@3515 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 15:33:55 +00:00
bsalomon@google.com
8500322537 disable GPU blur on small paths
Change originally by Guanqun.Lu@gmail.com with minor edits and sample added by me

COULD POSSIBLY CHANGE GPU RESULTS OF GM SLIDES WITH BLUR, WILL REBASILINE IF SO.

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



git-svn-id: http://skia.googlecode.com/svn/trunk@3514 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 14:44:37 +00:00
robertphillips@google.com
3672b580a5 Removed redundant typedef from GrDebugGL class
Comitted on behalf of Guanqun.Lu@gmail.com

http://codereview.appspot.com/5924049/



git-svn-id: http://skia.googlecode.com/svn/trunk@3513 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 12:50:24 +00:00
epoger@google.com
f86574dd68 whitespace change to trigger Skia buildbot
git-svn-id: http://skia.googlecode.com/svn/trunk@3512 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-27 20:14:55 +00:00
bsalomon@google.com
a5d2203f58 Use a single GrDrawState in GrContext for direct and buffered drawing
Review URL: http://codereview.appspot.com/5933043/


git-svn-id: http://skia.googlecode.com/svn/trunk@3507 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-27 17:40:15 +00:00
bsalomon@google.com
a5d056ae0b Reland 3503 with fix
git-svn-id: http://skia.googlecode.com/svn/trunk@3506 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-27 15:59:58 +00:00
reed@google.com
9fe287bd07 add debuggin matrix-proc to validate its output before calling the samplers
Review URL: https://codereview.appspot.com/5901063

git-svn-id: http://skia.googlecode.com/svn/trunk@3505 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-27 15:54:28 +00:00
bsalomon@google.com
290e5363bb Revert 3503
git-svn-id: http://skia.googlecode.com/svn/trunk@3504 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-27 14:34:08 +00:00
bsalomon@google.com
67bddc497e Make GrDrawState object used by GrDrawTarget be settable; set in GrInOrderDrawBuffer playback
Review URL: http://codereview.appspot.com/5908062/



git-svn-id: http://skia.googlecode.com/svn/trunk@3503 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-27 14:27:27 +00:00
caryclark@google.com
f47c217cc8 overzealously deleted files
git-svn-id: http://skia.googlecode.com/svn/trunk@3502 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-27 13:45:24 +00:00
caryclark@google.com
11fa4a7095 Files to build Cary's Shape Ops test projects.
These will be moved to experimental/Intersection
later.

git-svn-id: http://skia.googlecode.com/svn/trunk@3501 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-27 13:27:36 +00:00
caryclark@google.com
d88e0894d0 work in progress
nearly coincident mostly work
support files for creating projects from gyp

git-svn-id: http://skia.googlecode.com/svn/trunk@3500 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-27 13:23:51 +00:00
vandebo@chromium.org
6e08bfeca9 [PDF] Really fix font metric array initialization.
Review URL: https://codereview.appspot.com/5919043

git-svn-id: http://skia.googlecode.com/svn/trunk@3499 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-26 23:58:04 +00:00
bsalomon@google.com
2e3d144dfd Make GrDrawState ref counted. (Small step towards a perf improvement.)
Review URL: http://codereview.appspot.com/5905069/




git-svn-id: http://skia.googlecode.com/svn/trunk@3498 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-26 20:33:54 +00:00
epoger@google.com
4db4adc0e1 Build libjpeg from source for all platforms
(We were already doing so on Mac and Windows.)
Review URL: https://codereview.appspot.com/5909067

git-svn-id: http://skia.googlecode.com/svn/trunk@3497 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-26 20:04:54 +00:00
epoger@google.com
9fee7ad449 Copy libjpeg.gyp from third_party/externals/libjpeg/ to gyp/
This should get our use of libjpeg-from-source unblocked; see http://code.google.com/p/skia/issues/detail?id=543 ('wrap libjpeg.gyp from Chrome's libjpeg port, rather than making our own copy') for a better long-term solution.
Review URL: https://codereview.appspot.com/5908058

git-svn-id: http://skia.googlecode.com/svn/trunk@3496 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-26 18:29:26 +00:00
robertphillips@google.com
ba0cc3ef11 Extended debug GL interface to include textures.
http://codereview.appspot.com/5903043/



git-svn-id: http://skia.googlecode.com/svn/trunk@3495 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-26 17:58:35 +00:00
djsollen@google.com
ba28d03e94 Create macro for registering classes for deserialization
Review URL: https://codereview.appspot.com/5909063

git-svn-id: http://skia.googlecode.com/svn/trunk@3494 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-26 17:57:35 +00:00
djsollen@google.com
d43b0a87f8 Make use of the functions in the flattenable reader/writer
Review URL: https://codereview.appspot.com/5905066

git-svn-id: http://skia.googlecode.com/svn/trunk@3493 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-26 17:34:39 +00:00
bsalomon@google.com
39d4f3a02c restore line accidentally deleted in MatrixTest.cpp in r3491
git-svn-id: http://skia.googlecode.com/svn/trunk@3492 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-26 17:25:45 +00:00
bsalomon@google.com
9ed2ecd3ac Another fix for fixed point (nan == nan in fixed pt)
git-svn-id: http://skia.googlecode.com/svn/trunk@3491 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-26 15:57:37 +00:00
djsollen@google.com
cefc865090 Fix test to use the flattenable writer class instead of
flattening the object directly.
Review URL: https://codereview.appspot.com/5901059

git-svn-id: http://skia.googlecode.com/svn/trunk@3490 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-26 15:52:10 +00:00
bsalomon@google.com
fdf6eb75ab fix compilation bug in fixed pt
git-svn-id: http://skia.googlecode.com/svn/trunk@3489 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-26 15:33:05 +00:00
bsalomon@google.com
8fe84b53a6 Add SkMatrix::cheapEqualTo, use in Gr code
Review URL: http://codereview.appspot.com/5865057/



git-svn-id: http://skia.googlecode.com/svn/trunk@3488 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-26 15:24:27 +00:00
bsalomon@google.com
22f42b71fc [GPU] when paint has patheffect, it should fallback to path render
Comitted on behalf of Guanqun.Lu@gmail.com

THIS MAY CAUSE GM TO GO RED, WILL REBASELINE.

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



git-svn-id: http://skia.googlecode.com/svn/trunk@3487 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-26 14:36:55 +00:00