- 48be9a2 Merge "Move LightingShader to effects" into master-skia by Skia_Android Canary Bot · 9 years ago
- 0a81207 Merge "make tests portable by using 565 compatible colors" into master-skia by Skia_Android Canary Bot · 9 years ago
- 32bda21 Merge "add -Iinclude/private anywhere we have -Isrc/core" into master-skia by Skia_Android Canary Bot · 9 years ago
- c1dbe9d Merge "Fix Ganesh drawAtlas bug with quad colors" into master-skia by Skia_Android Canary Bot · 9 years ago
- 160b083 Merge "Fix Android framework build" into master-skia by Skia_Android Canary Bot · 9 years ago
- a8aec03 Merge "adding unit test for textblob cache / GrBatchAtlas" into master-skia by Skia_Android Canary Bot · 9 years ago
- 55db982 Merge "Replace buggy_blend_modes GM with an exhaustive test." into master-skia by Skia_Android Canary Bot · 9 years ago
- 8d1bac5 Merge "Allow Android font manager on *nix." into master-skia by Skia_Android Canary Bot · 9 years ago
- 4ad6749 Merge "Remove GrRedBlackTree" into master-skia by Skia_Android Canary Bot · 9 years ago
- 958ca3f Merge "Add new SkPoint3 class" into master-skia by Skia_Android Canary Bot · 9 years ago
- dc2396e Merge "Add a GM that reproduces layout test failures with my new xfermode code." into master-skia by Skia_Android Canary Bot · 9 years ago
- d3958da Merge "remove some unused stuff" into master-skia by Skia_Android Canary Bot · 9 years ago
- cb4e4c2 Merge "Make sp- via support SkDrawables; add a GM to test it." into master-skia by Skia_Android Canary Bot · 9 years ago
- 84573d2 Merge "Add libjpeg-turbo library (depends on yasm) Mangle external function names to avoid conflict with libjpeg Take advantage of direct color conversion (RGBA, BGRA, 565) Prepare to use jpeg_skip_scanlines (when it is upstreamed)" into master-skia by Skia_Android Canary Bot · 9 years ago
- f478108 Merge "Revert of Revert of Revert of Fix SkTileImageFilter clipping/cropRect interaction issue (patchset #1 id:1 of https://codereview.chromium.org/1207353004/)" into master-skia by Skia_Android Canary Bot · 9 years ago
- 67be8a3 Merge "Revert of Revert of Fix SkTileImageFilter clipping/cropRect interaction issue (patchset #1 id:1 of https://codereview.chromium.org/1219193002/)" into master-skia by Skia_Android Canary Bot · 9 years ago
- 46b5c58 Merge "Revert of Switch SkJpegCode to libjpeg-turbo (patchset #29 id:750001 of https://codereview.chromium.org/1180983002/)" into master-skia by Skia_Android Canary Bot · 9 years ago
- 36301ec Merge "Add libjpeg-turbo library (depends on yasm) Mangle external function names to avoid conflict with libjpeg Take advantage of direct color conversion (RGBA, BGRA, 565) Prepare to use jpeg_skip_scanlines (when it is upstreamed)" into master-skia by Skia_Android Canary Bot · 9 years ago
- e764694 Merge "Revert "Move headers used by headers in include/ to include/private."" into master-skia by Skia_Android Canary Bot · 9 years ago
- ac5dbfc Merge "Revert of Switch SkJpegCode to libjpeg-turbo (patchset #28 id:710001 of https://codereview.chromium.org/1180983002/)" into master-skia by Skia_Android Canary Bot · 9 years ago
- d554ad8 Merge "Add libjpeg-turbo library (depends on yasm) Mangle external function names to avoid conflict with libjpeg Take advantage of direct color conversion (RGBA, BGRA, 565) Prepare to use jpeg_skip_scanlines (when it is upstreamed)" into master-skia by Skia_Android Canary Bot · 9 years ago
- 9c507c8 Merge "Move headers used by headers in include/ to include/private." into master-skia by Skia_Android Canary Bot · 9 years ago
- fec09d7 Merge "Revert of Fix SkTileImageFilter clipping/cropRect interaction issue (patchset #2 id:30001 of https://codereview.chromium.org/1210053003/)" into master-skia by Skia_Android Canary Bot · 9 years ago
- 697bb6e Merge "Revert "Move headers used by headers in include/ to include/private."" into master-skia by Skia_Android Canary Bot · 9 years ago
- bf07b9d Merge "Move headers used by headers in include/ to include/private." into master-skia by Skia_Android Canary Bot · 9 years ago
- 4b003d1 Merge "Implement shared locks in the style of pthread's rwlock." into master-skia by Skia_Android Canary Bot · 9 years ago
- 88837da Merge "Revert of Switch SkJpegCode to libjpeg-turbo (patchset #25 id:680001 of https://codereview.chromium.org/1180983002/)" into master-skia by Skia_Android Canary Bot · 9 years ago
- db5c224 Merge "Add libjpeg-turbo library (depends on yasm) Mangle external function names to avoid conflict with libjpeg Take advantage of direct color conversion (RGBA, BGRA, 565) Prepare to use jpeg_skip_scanlines (when it is upstreamed)" into master-skia by Skia_Android Canary Bot · 9 years ago
- a5c5984 Merge "Kill mixedxfermodes" into master-skia by Skia_Android Canary Bot · 9 years ago
- 6b07c1c Merge "Fix SkTileImageFilter clipping/cropRect interaction issue" into master-skia by Skia_Android Canary Bot · 9 years ago
- 5c85727 Merge "Revert of Switch SkJpegCode to libjpeg-turbo (patchset #11 id:540001 of https://codereview.chromium.org/1180983002/)" into master-skia by Skia_Android Canary Bot · 9 years ago
- 7ca0098 Merge "Add libjpeg-turbo library (depends on yasm) Mangle external function names to avoid conflict with libjpeg Take advantage of direct color conversion (RGBA, BGRA, 565) Prepare to use jpeg_skip_scanlines (when it is upstreamed)" into master-skia by Skia_Android Canary Bot · 9 years ago
- 1f9d4a1 Merge "add SkCanvas::drawAtlas" into master-skia by Skia_Android Canary Bot · 9 years ago
- 03415d3 Merge "Rename SkFontConfigParser_android SkFontMgr_android_parser." into master-skia by Skia_Android Canary Bot · 9 years ago
- 89bbb5c Merge "change old picture serialization to really handle images" into master-skia by Skia_Android Canary Bot · 9 years ago
- 0d16417 Merge "Invalidate GrTexture mipmap on content change notification" into master-skia by Skia_Android Canary Bot · 9 years ago
- 5ad274f Merge "Add bigtileimagefilter GM & improvements to toString" into master-skia by Skia_Android Canary Bot · 9 years ago
- b16325c Merge "Add ColorMatrix filter tests from Android CTS." into master-skia by Skia_Android Canary Bot · 9 years ago
- 1192a25 Merge "Update how we package skia resource for android testing" into master-skia by Skia_Android Canary Bot · 9 years ago
- 2734b2f Merge "Revert of Fix dst bound reported by SkTileImageFilter (patchset #3 id:40001 of https://codereview.chromium.org/1152553006/)" into master-skia by Skia_Android Canary Bot · 9 years ago
- 139d781 Merge "Add GM that tests clipping annotations" into master-skia by Skia_Android Canary Bot · 9 years ago
- ff3eb4a Merge "Fix dst bound reported by SkTileImageFilter" into master-skia by Skia_Android Canary Bot · 9 years ago
- 5131021 Merge "Revert of Fix dst bound reported by SkTileImageFilter (patchset #3 id:40001 of https://codereview.chromium.org/1152553006/)" into master-skia by Skia_Android Canary Bot · 9 years ago
- a5f2fb1 Merge "Fix dst bound reported by SkTileImageFilter" into master-skia by Skia_Android Canary Bot · 9 years ago
- c959658 Merge "SkImage::NewFromYUVTexturesCopy" into master-skia by Skia_Android Canary Bot · 9 years ago
- 2946336 Merge "Implement Porter Duff XP with a blend table" into master-skia by Skia_Android Canary Bot · 9 years ago
- 2109e59 Merge "SkPDF: with opaque draws, treat SRC mode as SRC_OVER" into master-skia by Skia_Android Canary Bot · 9 years ago
- 87352ff Merge "real fix for textblob use after gpu free" into master-skia by Skia_Android Canary Bot · 9 years ago
- b425a41 Merge "Revert of Implement Porter Duff XP with a blend table (patchset #12 id:220001 of https://codereview.chromium.org/1124373002/)" into master-skia by Skia_Android Canary Bot · 9 years ago
- f3b242e Merge "Implement Porter Duff XP with a blend table" into master-skia by Skia_Android Canary Bot · 9 years ago
- 3aa496e Merge "remove unused SkBitmap::scrollRect API" into master-skia by Skia_Android Canary Bot · 9 years ago
- 72e8aa8 Merge "Add PlusMergesAA GM" into master-skia by Skia_Android Canary Bot · 9 years ago
- 30f37cc Merge "Sort build files for consistent link order." into master-skia by Skia_Android Canary Bot · 9 years ago
- 596f342 Merge "Font variations." into master-skia by Skia_Android Canary Bot · 9 years ago
- 44e6ccc Merge "Gyp: Sanity Part II (GM+Tests)" into master-skia by Skia_Android Canary Bot · 9 years ago
- b546168 Merge "Revert of Font variations. (patchset #26 id:500001 of https://codereview.chromium.org/1027373002/)" into master-skia by Skia_Android Canary Bot · 9 years ago
- 634676d Merge "Font variations." into master-skia by Skia_Android Canary Bot · 9 years ago
- b0220eb Merge "Revert of Font variations. (patchset #21 id:400001 of https://codereview.chromium.org/1027373002/)" into master-skia by Skia_Android Canary Bot · 9 years ago
- fc2ae32 Merge "Font variations." into master-skia by Skia_Android Canary Bot · 9 years ago
- 911bf3e Merge "Fix blur on large glyphs in runs < SkGlyphCache::max" into master-skia by Skia_Android Canary Bot · 9 years ago
- c183bf4 Merge "fix for cached textblobs look garbled" into master-skia by Skia_Android Canary Bot · 9 years ago
- c6e7fdb Merge "remove redundant/deprecated TwoPointRadial gradiet -- use TwoPointConical" into master-skia by Skia_Android Canary Bot · 10 years ago
- 6854789 Merge "Add new GM/bench for line-only convex paths" into master-skia by Skia_Android Canary Bot · 10 years ago
- 2d78022 Merge "Add GM to test non-AA pixel snapping for points, lines, rects." into master-skia by Skia_Android Canary Bot · 10 years ago
- 924e6bc Merge "Now, path ops natively intersect conics, quads, and cubics in any combination. There are still a class of cubic tests that fail and a handful of undiagnosed failures from skps and fuzz tests, but things are much better overall." into master-skia by Skia_Android Canary Bot · 10 years ago
- 07cbd48 Merge "add GM to test imagefilters + xfermodes" into master-skia by Skia_Android Canary Bot · 10 years ago
- 5212dd2 Merge "adding new gm to rotate, translate, and scale textblobs" into master-skia by Skia_Android Canary Bot · 10 years ago
- 6b44bb4 Merge "add a GM to demo the blend bug" into master-skia by Skia_Android Canary Bot · 10 years ago
- 320e53c Merge "Revert of Revert of remove unused (by clients) SkPathUtils (patchset #1 id:1 of https://codereview.chromium.org/1060703003/)" into master-skia by Skia_Android Canary Bot · 10 years ago
- 359c5f6 Merge "Revert of remove unused (by clients) SkPathUtils (patchset #1 id:1 of https://codereview.chromium.org/1088383003/)" into master-skia by Skia_Android Canary Bot · 10 years ago
- 74c5d3e Merge "Add GM that tests bmp filter qualities with repeat mode" into master-skia by Skia_Android Canary Bot · 10 years ago
- 3f01ba2 Merge "remove unused (by clients) SkPathUtils" into master-skia by Skia_Android Canary Bot · 10 years ago
- 3a19319 Merge "Don't draw if SkShader::asNewFragmentProcessor fails." into master-skia by Skia_Android Canary Bot · 10 years ago
- 60484d0 Merge "Start canonicalizing color for all A8 textblobs" into master-skia by Skia_Android Canary Bot · 10 years ago
- 9c19386 Merge "Add GM to exercise high quality anisotropic scaling" into master-skia by Skia_Android Canary Bot · 10 years ago
- b038658 Merge "GM: add fadefilter gm" into master-skia by Skia_Android Canary Bot · 10 years ago
- 6553e71 Merge "setDrawFilter needs to trigger any deferred saves" into master-skia by Skia_Android Canary Bot · 10 years ago
- 5a1f90d Merge "Adding draw looper gm for textblobs" into master-skia by Skia_Android Canary Bot · 10 years ago
- f19da77 Merge "***Disables swizzles to 565. We may want to enable swizzles to 565 for images that are encoded in a format similar to 565, however, we do not want to take images that decode naturally to kN32 and then convert them to 565." into master-skia by Skia_Android Canary Bot · 10 years ago
- 6e1f9ac Merge "Add GM to repro crbug.com/472795" into master-skia by Skia_Android Canary Bot · 10 years ago
- 5c773cf Merge "add realloc method to SkAutoSTMalloc" into master-skia by Skia_Android Canary Bot · 10 years ago
- baeb7aa Merge "BUG=skia:" into master-skia by Skia_Android Canary Bot · 10 years ago
- b3de689 Merge "Add constant color GrFP." into master-skia by Skia_Android Canary Bot · 10 years ago
- 2a9d271 Merge "Revert of Add constant color GrFP. (patchset #10 id:180001 of https://codereview.chromium.org/978713002/)" into master-skia by Skia_Android Canary Bot · 10 years ago
- 5cceebf Merge "Add constant color GrFP." into master-skia by Skia_Android Canary Bot · 10 years ago
- ceae21d Merge "Sketch SkFunction" into master-skia by Skia_Android Canary Bot · 10 years ago
- 9fee0e1 Merge "Refactor Sk2x<T> + Sk4x<T> into SkNf<N,T> and SkNi<N,T>" into master-skia by Skia_Android Canary Bot · 10 years ago
- d9704c9 Merge "Move HWUI boilerplate into utils/android" into master-skia by Skia_Android Canary Bot · 10 years ago
- edcb7aa Merge "SkCodec: add wbmp class" into master-skia by Skia_Android Canary Bot · 10 years ago
- 3e12935 Merge "Revert of Make the canvas draw looper setup update the canvas save count (patchset #1 id:1 of https://codereview.chromium.org/1034033004/)" into master-skia by Skia_Android Canary Bot · 10 years ago
- a9bbe66 Merge "Make the canvas draw looper setup update the canvas save count" into master-skia by Skia_Android Canary Bot · 10 years ago
- 241bb37 Merge "cumulative pathops patch" into master-skia by Skia_Android Canary Bot · 10 years ago
- 36c8c52 Merge "SkPDF SkPDFObject::addResources signature simplified" into master-skia by Skia_Android Canary Bot · 10 years ago
- 13eb131 Merge "Revert of pathops version two (patchset #16 id:150001 of https://codereview.chromium.org/1002693002/)" into master-skia by Skia_Android Canary Bot · 10 years ago
- 209c02c Merge "Switch DM to use utils/android/SkAndroidSDKCanvas" into master-skia by Skia_Android Canary Bot · 10 years ago
- 3e22c74 Merge "pathops version two" into master-skia by Skia_Android Canary Bot · 10 years ago
- a4e9d80 Merge "PDF: remove last use of SkPDFImage" into master-skia by Skia_Android Canary Bot · 10 years ago
- 56cc199 Merge "Revert of PDF: remove last use of SkPDFImage (patchset #5 id:120001 of https://codereview.chromium.org/950633003/)" into master-skia by Skia_Android Canary Bot · 10 years ago
- 9cd52d8 Merge "PDF: remove last use of SkPDFImage" into master-skia by Skia_Android Canary Bot · 10 years ago
- ad93cad Merge "Add a new GM to show problems with shear/rotate CTM w/ image filters." into master-skia by Skia_Android Canary Bot · 10 years ago