aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2013-08-02Merge "tweaks for forward compatibility"tools_r22.2Jean-Baptiste Queru
2013-08-02tweaks for forward compatibilityDerek Sollenberger
2013-06-05Better tweaks for forward compatibilityJean-Baptiste Queru
2013-06-05Revert "Skia changes needed to support gpl build for external/webkit"Jean-Baptiste Queru
2013-05-31Skia changes needed to support gpl build for external/webkitDerek Sollenberger
2013-04-30resolved conflicts for merge of 52454e14 to jb-mr2-dev-plus-aospNick Kralevich
2013-04-30Merge "skia: Don't use -D_FORTIFY_SOURCE=2"tools_r22jb-mr1.1-dev-plus-aospNick Kralevich
2013-04-30skia: Don't use -D_FORTIFY_SOURCE=2Nick Kralevich
2013-04-18Merge "Add support for CMYK jpeg images." into jb-mr2-devandroid-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1jb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devDerek Sollenberger
2013-04-12Fix skia generation counting in getFontMetricsChris Craik
2013-04-11Merge "Add additional scripts in font mapping" into jb-mr2-devRaph Levien
2013-04-09Add liblogYing Wang
2013-04-08Add additional scripts in font mappingRaph Levien
2013-03-27Ignore c719731eJean-Baptiste Queru
2013-03-27Merge "Tweak for forward compatibility"Jean-Baptiste Queru
2013-03-27Tweak for forward compatibilityJean-Baptiste Queru
2013-03-26Ignore f490d8c1Jean-Baptiste Queru
2013-03-26Merge "Tweaks for forward compatibility"Jean-Baptiste Queru
2013-03-20Make WebP decoding independent of stream length.Vikas Arora
2013-03-06Tweaks for forward compatibilityJean-Baptiste Queru
2013-03-04Add support for CMYK jpeg images.Derek Sollenberger
2013-02-27Don't increment the paint's generation ID when measuring textRomain Guy
2013-02-22Android now has the new glShaderSource signatureJesse Hall
2013-02-22Merge "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'"Derek Sollenberger
2013-02-22Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'Derek Sollenberger
2013-02-20Merge remote-tracking branch 'goog/jb-mr2-release'Ed Heyl
2013-02-13Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master...Chris Craik
2013-02-13am 07d1532b: (-s ours) Revert "Merge remote-tracking branch \'goog/master-chr...Chris Craik
2013-02-13Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master...Chris Craik
2013-02-05Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'Derek Sollenberger
2013-02-04Merge Skia @7527Derek Sollenberger
2013-02-04Snapshot from http://skia.googlecode.com/svn/trunk@7527Derek Sollenberger
2013-01-29am 2dad6229: This fixes the immediate setjmp crash.Ruben Brunk
2013-01-28This fixes the immediate setjmp crash.Ruben Brunk
2013-01-22am 0203c47d: Introduces new shared library that will be used to playback SkPi...Derek Sollenberger
2013-01-22am f8cacf6b: Make a copy of the Skia sources to isolate them from updates.Derek Sollenberger
2013-01-22resolved conflicts for merge of e1ac2e84 to master-chromiumDerek Sollenberger
2013-01-22Introduces new shared library that will be used to playback SkPictures.Derek Sollenberger
2013-01-22Make a copy of the Skia sources to isolate them from updates.Derek Sollenberger
2013-01-22Fixes needed to run Skia in debug modeDerek Sollenberger
2013-01-15am cfceaa81: Merge "Changes to Skia to support Harfbuzz NG"Raph Levien
2013-01-15Merge "Changes to Skia to support Harfbuzz NG"Raph Levien
2013-01-08am 460abbfb: Expose extra matrix parameter in glyph cache APIsRomain Guy
2013-01-08Fixes to the Skia merge at revision 6890.Derek Sollenberger
2013-01-08Merge Skia @6890Derek Sollenberger
2013-01-07Expose extra matrix parameter in glyph cache APIsRomain Guy
2012-12-19Snapshot from http://skia.googlecode.com/svn/trunk@6890Derek Sollenberger
2012-12-05Merge skia @5967Jean-Baptiste Queru
2012-12-05Snapshot from http://skia.googlecode.com/svn/trunk@5967Jean-Baptiste Queru
2012-12-05initial snapshot, trunk@5966Jean-Baptiste Queru