AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
10,237 Commits 1 Branch 0 Tags 544 MiB
da0f7616e9
Commit Graph

10237 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
bsalomon@google.com
da0f7616e9 Rebaseline mandrill GMs 
BUG=skia:1879

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12924 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-06 20:18:15 +00:00
commit-bot@chromium.org
9ee0e32886 Turn on GL drawing, allow switching via --gpu flag. 
This CL comes after https://codereview.chromium.org/121303004/.

BUG=
R=robertphillips@google.com

Author: jcgregorio@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12923 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-06 20:03:55 +00:00
halcanary@google.com
31fdb92995 DEPS roll script 
This script:
    -  searches through the last N commits to find out the hash that is
       associated with the revision number.
    -  creates a new branch in the chromium tree, modifies the DEPS
       file, commits, and uploads to Rietveld.
    -  create a whitespace-only commit and uploads that to to Rietveld.

BUG=
R=borenet@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12921 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-06 19:50:22 +00:00
robertphillips@google.com
11e10e340b Patch for Windows compilation errors from r12916 
git-svn-id: http://skia.googlecode.com/svn/trunk@12919 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-06 19:09:29 +00:00
reed@google.com
614cbeef47 remove SK_SUPPORTED_DEPRECATED_FIXEDROUND, no longer needed 
git-svn-id: http://skia.googlecode.com/svn/trunk@12918 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-06 18:49:32 +00:00
rmistry@google.com
6ab96733b8 Support mesa config in render_pictures. 
R=epoger@google.com, robertphillips@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12916 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-06 18:37:24 +00:00
commit-bot@chromium.org
2a78e82f5e create gm/rebaseline_server/test_all.py 
Uses proper Python unittest framework to launch all unittests within the directory.

NOTRY=True
R=rmistry@google.com

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12915 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-06 18:33:19 +00:00
commit-bot@chromium.org
91e3ffded5 These strings are unused. 
R=reed@google.com, halcanary@google.com
BUG=

Author: mtklein@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12914 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-06 18:29:14 +00:00
commit-bot@chromium.org
c8d732800e Renamed JsCanvas to JsContext and moved into it's own file. 
Fleshed out a lot of the Path interface.

BUG=
R=robertphillips@google.com, tfarina@chromium.org, reed@google.com

Author: jcgregorio@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12913 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-06 18:17:24 +00:00
reed@google.com
d0419b1fe7 Revert "Revert "Revert "Revert of https://codereview.chromium.org/110593003/""" 
This reverts commit aaa89649590323fe40f52439d9a9a3376bb3b8ae.

BUG=

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12910 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-06 17:08:27 +00:00
commit-bot@chromium.org
86b39f311e Avoid some work on SkClipStack equality when the topmost genids match 
Two clip stacks are defined being equal if the topmost genids match.

R=bsalomon@google.com

Author: kkinnunen@nvidia.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12909 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-06 16:54:20 +00:00
reed@google.com
7627c657b0 add rowBytes param to setPreLock, in prep for onNewLockPixels change 
need _win.cc change from https://codereview.chromium.org/124503002/ when this lands in chrome

R=robertphillips@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12907 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-06 15:01:48 +00:00
reed@google.com
ba82bd11e2 Revert "Revert "Revert of https://codereview.chromium.org/110593003/"" 
This reverts commit 0fef787f33aa38109a0c8427e0098d997efdd5ff.

failed in chrome: https://codereview.chromium.org/124503002/

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12906 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-06 13:34:39 +00:00
tfarina@chromium.org
452eecb443 Convert two more tests to DEF_TEST() macro. 
Out of three, two were converted.

These tests were found with the following command line:

$ g grep "public Test"

BUG=None
TEST=ran tests executable fine.
R=mtklein@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12905 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-06 12:43:53 +00:00
mike@reedtribe.org
9fb00413ec SK_SUPPORTED_DEPRECATED_FIXEDROUND around deprecated fixed[round,ceil,floor] 
git-svn-id: http://skia.googlecode.com/svn/trunk@12903 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-06 03:02:37 +00:00
senorblanco@chromium.org
4e4b09a44e Rebaselines for more straggling bots. 
TBR=

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12902 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-04 17:22:04 +00:00
skia.committer@gmail.com
98272d9142 Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@12901 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-04 07:01:40 +00:00
senorblanco@chromium.org
7b6d4d6783 Yet more rebaselines from straggling bots. 
BUG=
TBR=

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12900 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-04 04:19:38 +00:00
senorblanco@chromium.org
4e13914e3c Stragglers. 
TBR=

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12899 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-04 02:36:24 +00:00
senorblanco@chromium.org
323cc26308 New baselines for tileimagefilter, imagefiltersgraph, and everything Nexus4. 
TBR=

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12898 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-04 00:14:54 +00:00
senorblanco@chromium.org
c8c599269d Widen suppression to tileimagefilter-pdf. 
TBR=

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12897 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-03 22:27:05 +00:00
senorblanco@chromium.org
a502d60b93 Ignore failures on tileimagefilter-pdf_poppler. 
TBR=

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12896 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-03 22:18:12 +00:00
senorblanco@chromium.org
6776b82d46 Make SkImageFilter crop rects relative to the primitive origin, instead of relative to their parent's crop rect. This is required by SVG semantics, and is more sane anyway. 
To do this, this patch changes the "offset/loc" parameter in filterImage() / onFilterImage() from an inout-param to an out-param only, so that the calling filter can know how much the input filter wants its result offset (and doesn't include the original primitive position). This offset can then be applied to the current filter's crop rect. (I've renamed the parameter "offset" in all cases to make this clear.) This makes the call sites in SkCanvas/SkGpuDevice responsible for applying the resulting offset to the primitive's position, which is actually a fairly small change.

This change also fixes SkTileImageFilter and SkOffsetImageFilter to correctly handle an input offset, which they weren't before. This required modifying the GM's, since they assumed the broken behaviour.

NOTE: this will require rebaselining the imagefiltersgraph test, since it has a new test case.

NOTE: this will "break" the Blink layout tests css3/filters/effect-reference-subregion-chained-hw.html and css3/filters/effect-reference-subregion-hw.html, but it actually makes them give correct results. It should be suppressed on the skia roll, and I'll rebaseline it.

R=reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12895 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-03 21:48:22 +00:00
reed@google.com
927138977f Revert "Revert of https://codereview.chromium.org/110593003/" 
This reverts commit c7abb25b25ba8b97948371d2bf0a2e3e78468f73.

and fixes the ashmem break

BUG=

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12887 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-03 17:58:57 +00:00
commit-bot@chromium.org
d4bda508c9 Add SkPreConfig.h to core.gypi 
BUG=
R=reed@google.com

Author: borenet@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12886 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-03 17:25:52 +00:00
commit-bot@chromium.org
758b7a4c89 rebaseline gm self-tests after https://code.google.com/p/skia/source/detail?r=12850 
The GM self-test's fragility is already noted in https://code.google.com/p/skia/issues/detail?id=1068 ('make gm self-test more robust')

NOTRY=True
NOTREECHECKS=True
R=mtklein@google.com
TBR=mtklein

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12885 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-03 16:37:16 +00:00
commit-bot@chromium.org
27f890219b Revert of https://codereview.chromium.org/110593003/ 
Reason for revert: SkImageRef_ashmem doesn't compile

R=halcanary@google.com, scroggo@google.com
TBR=halcanary@google.com, scroggo@google.com
NOTREECHECKS=true
NOTRY=true
BUG=

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12884 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-03 16:32:45 +00:00
reed@google.com
f1ce05288a Add onNewLockPixels, that returns rowbytes and relies on info in pixelref 
This reverts commit 890a6ec633c1f54891104a072a8964b4c2c81af9.

BUG=
R=scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12883 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-03 16:22:48 +00:00
commit-bot@chromium.org
0bf919c89a make results_test.py work better within python unittest framework 
BUG=
R=rmistry@google.com

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12882 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-03 16:04:11 +00:00
reed@google.com
dcea5300dc assert in setPixelRef that the pr matches the bitmap's config 
BUG=
R=halcanary@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12880 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-03 13:43:01 +00:00
skia.committer@gmail.com
862020763d Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@12875 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-03 07:01:45 +00:00
commit-bot@chromium.org
04018f37af An SkOSWindow for Unix may experience stuttering, with missed events or long delays before events are processed when using SkEvent.postDelay(). 
The issue is with the use of a select loop to watch for events coming into the x11 file descriptor for the display. It turns out there may be XEvents queued in memory but not yet processed that need to be handled before entering the select loop. See: http://developerweb.net/viewtopic.php?id=3184

BUG=1960
R=reed@google.com

Author: jcgregorio@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12874 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-02 22:21:47 +00:00
commit-bot@chromium.org
07adb6359f Function pointers -> templates in SkPictureFlat. 
These flatten/unflatten function pointers were driving me nuts when reading the
generated assembly for this code.  We don't need the flexibility of function
pointers here, so let's use templates to make it more manageable.  You'll
notice we get much better typing now on flatten/unflatten.

BUG=
R=reed@google.com

Author: mtklein@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12873 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-02 22:20:49 +00:00
tfarina@chromium.org
78e7b4e1b9 Get rid of DEFINE_TESTCLASS_SHORT() macro. 
Instead tests should be written using DEF_TEST() macro, which is much
nicer and simplifies the process of setting up an unit test.

BUG=None
TEST=skpskgr_test, pathops_unittest
R=mtklein@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12870 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-02 21:45:03 +00:00
halcanary@google.com
dab032a4ba Update 4 skimage expectations. 
Grab expectations missed in codereview:102213009, sicne the bots were slow:
-  Test-ChromeOS-Daisy-MaliT604-Arm7-Debug
-  Test-ChromeOS-Daisy-MaliT604-Arm7-Release
-  Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release-Valgrind
-  Test-Ubuntu13-ShuttleA-HD2000-x86_64-Debug-ASAN

BUG=
R=epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12869 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-02 20:43:26 +00:00
commit-bot@chromium.org
c735598ce5 take 2: create simple 'skpmaker' tool to generate SKP files for testing 
(re-landing https://codereview.chromium.org/108343006 without the build breakages)

BUG=skia:1943
R=rmistry@google.com

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12866 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-02 19:42:15 +00:00
commit-bot@chromium.org
5ccdf01fff Revert of https://codereview.chromium.org/108343006/ 
Reason for revert: broke some builds

R=rmistry@google.com, mtklein@google.com
TBR=mtklein@google.com, rmistry@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:1943

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12865 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-02 18:51:38 +00:00
commit-bot@chromium.org
dbd8379e5f create simple 'skpmaker' tool to generate SKP files for testing 
(needed to create self-test for render_pictures)

BUG=skia:1943
R=rmistry@google.com, mtklein@google.com

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12864 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-02 18:10:34 +00:00
reed@google.com
33cc989f23 remove SK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR and make fInfo const 
BUG=
R=halcanary@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12863 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-02 18:07:46 +00:00
halcanary@google.com
1bed687f6b Add a release procedure to SkMallocPixelRef; remove SkDataPixelRef 
This works in a way that is similar to SkData.

SkMallocPixelRef::NewWithProc

    Motivation: Chrome has a ETC1PixelRef which calls delete[] on the
    pixles on destruction.  There is no reason for them to almost
    duplicate our class, when we can provide them a more flexible
    class.  Example use:

      static void delete_uint8_proc(void* ptr, void*) {
        delete[] static_cast<uint8_t>(ptr);
      }
      SkPixelRef* new_delete_pixref(const SkImageInfo& info,
                                    SkColorTable* ctable) {
        size_t rb = info.minRowBytes();
        return SkMallocPixelRef::NewWithProc(
          info, rb, ctable,
          new uint8_t[info.getSafeSize(rb)],
          delete_uint8_proc, NULL);
      }

SkMallocPixelRef::NewWithData

	Motivation:  This allows up to eliminate SkDataPixelRef.  We
    modified SkImage_Raster to use MallocPixelRef rather than
    SkDataPixlRef.

Also:  Unit tests in tests/MallocPixelRefTest.

BUG=
R=reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12861 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-02 17:29:28 +00:00
commit-bot@chromium.org
261c666682 Make tests output spin on the same line by default. 
-v now gives a cleaned-up version of the existing output (every test timed, useless information removed)

Example output, default:
  [ 36/193] PathOpsCubicIntersectionOneOffTest
then later when finished...
  [193/193] BlurMaskFilter

Example output, -v:  (note, codereview is messing up my pretty spacing)
Skia UnitTests: --resourcePath resources SK_RELEASE SK_SCALAR_IS_FLOAT skia_arch_width=32
[  1/193]     0ms PathOpsSimplifyDontFailOneTest
[  2/193]     0ms PathOpsSimplifyFailOneTest
[  3/193]    30ms PathOpsSkpTest
[  4/193]    21ms PathOpsSimplifyFailTest
....
[182/193]  1026ms BlitRow
[183/193]   808ms AAClip
[184/193]  4333ms Math
[185/193]  5068ms PackBits
[186/193]  2265ms DrawText_DrawPosText
[187/193]  9163ms PathOpsRectsThreadedTest
[188/193]  5540ms GLPrograms
[189/193]     0ms GLInterfaceValidation
[190/193]     2ms DeferredCanvas
[191/193]     1ms ClipCache
[192/193]    30ms BlurMaskFilter
[193/193] 10396ms PathOpsOpCubicsThreadedTest
Finished 193 tests, 0 failures, 0 skipped.  (622610 internal tests)

BUG=
R=halcanary@google.com, mtklein@google.com, bungeman@google.com

Author: mtklein@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12860 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-02 16:19:53 +00:00
commit-bot@chromium.org
8625fdbb04 Remove unused function. 
BUG=
R=reed@google.com

Author: mtklein@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12859 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-02 16:15:32 +00:00
halcanary@google.com
3d50ea1b87 Add Options to SkDecodingImageGenerator, simplify API. 
Motivation: We want to remove redundant classes from Skia.  To
that end we want to remove SkImageRef and its subclasses and
replace their uses with SkDiscardablePixelRef +
SkDecodingImageGenerator.  Since Android uses SkImageRef, we need
to make sure that SkDecodingImageGenerator allows all of the
settings that Android exposes in BitmapFactory.Options.

To that end, we have created an Options struct for the
SkDecodingImageGenerator which lets the client of the generator set
sample size, dithering, and bitmap config.

We have made the SkDecodingImageGenerator constructor private
and replaced the SkDecodingImageGenerator::Install functions
with a SkDecodingImageGenerator::Create functions (one for
SkData and one for SkStream) which now take a
SkDecodingImageGenerator::Options struct.

Also added a ImageDecoderOptions test which loops through a list
of sets of options and tries them on a set of 5 small encoded
images.

Also updated several users of SkDecodingImageGenerator::Install to
follow new call signature - gm/factory.cpp, LazyDecodeBitmap.cpp,
and PictureTest.cpp, CachedDecodingPixelRefTest.cpp.

We also added a new ImprovedBitmapFactory Test which simulates the
exact function that Android will need to modify to use this,
installPixelRef() in BitmapFactory.

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

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

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12855 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-02 13:15:13 +00:00
skia.committer@gmail.com
f8affa2e5c Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@12853 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-02 07:01:35 +00:00
mike@reedtribe.org
ae8f9528fd speedup SkRect::intersect 
git-svn-id: http://skia.googlecode.com/svn/trunk@12851 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-01 20:32:45 +00:00
tfarina@chromium.org
725a64cf89 Add default resource path for skia test cases in gm and bench tools. 
BUG=skia:1765
TEST=./out/Release/gm --match downsamplebitmap_image
R=mtklein@google.com, scroggo@google.com, yunchao.he@intel.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12850 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-12-31 14:29:52 +00:00
skia.committer@gmail.com
f5e1f63461 Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@12849 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-12-31 07:01:36 +00:00
reed@google.com
4856964eae ComputeRowBytes must not overflow width when it shifts 
BUG=
R=halcanary@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12848 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-12-30 19:21:22 +00:00
reed@google.com
51c2a83bda fix drawVertices when we have both colors and textures 
fix: don't re-call setContext on the composshader (i.e. on the tricolor shader) for each triangle,
since the trishader handles that explicitly. Just call setContext on the original shader.

BUG=

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12847 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-12-30 16:52:00 +00:00
commit-bot@chromium.org
73be1fc2b0 Possibly uninitialized SkRgnBuilder fStorage. 
fStorage needs to be initialized regardless of SkRgnBuilder::init()'s
outcome - otherwise the destructor can end up freeing garbage.

BUG=330293
R=reed@google.com, fmalita@google.com

Author: fmalita@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12846 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-12-30 16:21:06 +00:00