summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-01-09Merge from Chromium at DEPS revision 33.0.1750.22android-4.4w_r1android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1kitkat-wearkitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-devTorne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: If3ffc5db2f0f726ea2d300ec9d8403dc37068efe
2014-01-09Merge third_party/skia/src from ↵Torne (Richard Coles)
https://chromium.googlesource.com/a/external/skia/src.git at eb8698b339a00a3c1ed94f70d163e9d201b331d9 This commit was generated by merge_from_chromium.py. Change-Id: If7f25687daab6821deb92dc1c5a765dc5d9ec35a
2014-01-08Cherrypick r12846 into m33_1750 for http://crbug.com/330293fmalita@google.com
git-svn-id: http://skia.googlecode.com/svn/branches/chrome/m33_1750/src@12963 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-07cherrypick changes into branch m33_1750 to fix http://crbug.com/329254sugoi@google.com
git-svn-id: http://skia.googlecode.com/svn/branches/chrome/m33_1750/src@12945 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-07Merge from Chromium at DEPS revision 33.0.1750.16Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Ic2c2f7b040db93139c4321c5a0f0666792156c15
2014-01-07Merge third_party/skia/src from ↵Torne (Richard Coles)
https://chromium.googlesource.com/a/external/skia/src.git at ccee6133be215c521bc15c5d834f1e18e883ebd9 This commit was generated by merge_from_chromium.py. Change-Id: I136358b5cfa2079285e5a2d60400148df5e3d88b
2014-01-06Merge 12729 "[PDF] Fix clipping in xfermode improvement."vandebo@chromium.org
> [PDF] Fix clipping in xfermode improvement. > > In some cases, the wrong clip (src clip instead of initial clip) was used. > Switch almost exclusively to initial clip because it is safe and generates a smaller result. > > BUG=chromium:328009 > R=reed@google.com, bungeman@google.com > > Author: vandebo@chromium.org > > Review URL: https://codereview.chromium.org/116423004 TBR=vandebo@chromium.org Review URL: https://codereview.chromium.org/125293004 git-svn-id: http://skia.googlecode.com/svn/branches/chrome/m33_1750/src@12934 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-06Branch at r12682 for Chrome M33vandebo@chromium.org
git-svn-id: http://skia.googlecode.com/svn/branches/chrome/m33_1750/src@12932 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-02Merge from Chromium at DEPS revision 241094Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Icc908c7651656b3a9f4a072d952354962e4113f9
2013-12-18branch Skia at r12678 for Chrome M33 (branch 1750)bungeman@google.com
git-svn-id: http://skia.googlecode.com/svn/branches/chrome/m33_1750/src@12753 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-18Merge from Chromium at DEPS revision 240154Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I46e962d43e6d822150c4556f33ed018d9f4225e3
2013-12-16Merge third_party/skia/src from ↵Android Chromium Automerger
https://chromium.googlesource.com/external/skia/src.git at c2062d0e1bd6b258229669463ab5ce7020780c8a This commit was generated by merge_from_chromium.py. Change-Id: I8ed55c7efa600f30df090e824e3770368eb28e72
2013-12-13Use SkScalar when aligning glyphs in user space.bungeman@google.com
Drawing text from paths is done in user space and not in device space. All operations in user space should be performed with SkScalars. BUG=327031 R=reed@google.com Review URL: https://codereview.chromium.org/113123005 git-svn-id: http://skia.googlecode.com/svn/trunk/src@12682 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-13remove SkScalarCompare type and headerreed@google.com
BUG= R=fmalita@chromium.org Review URL: https://codereview.chromium.org/113193004 git-svn-id: http://skia.googlecode.com/svn/trunk/src@12681 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-13Update all callsites to use info for pixelrefsreed@google.com
#define SK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR in chrome to keep old API signature (for now) BUG= R=scroggo@google.com Review URL: https://codereview.chromium.org/100723005 git-svn-id: http://skia.googlecode.com/svn/trunk/src@12677 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-13Improved SkPathRef interface securityrobertphillips@google.com
https://codereview.chromium.org/115323004/ git-svn-id: http://skia.googlecode.com/svn/trunk/src@12676 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-13Allow 0-width SkBitmap in setConfig.halcanary@google.com
Previously, SkBitmap::setConfig would allow zero height, but not zero width. This is changed for consistancy. A unit test was added. BUG= R=reed@google.com, scroggo@google.com Review URL: https://codereview.chromium.org/111953004 git-svn-id: http://skia.googlecode.com/svn/trunk/src@12673 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-13Merge third_party/skia/src from ↵Android Chromium Automerger
https://chromium.googlesource.com/external/skia/src.git at 6f0382ecf74fd0b4921f52404b4d1a7a10229216 This commit was generated by merge_from_chromium.py. Change-Id: Iba7856da13fdc5faed41728f1eba7633ba32eb61
2013-12-13Reverting r12665 & r12666 (Remove duplicate impl for SkImageInfo flattening) ↵robertphillips@google.com
due to Chromium/Blink compilation errors https://codereview.chromium.org/112603003/ git-svn-id: http://skia.googlecode.com/svn/trunk/src@12667 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-13Mac 10.6 compiler fix for r12665 (Remove duplicate impl for SkImageInfo ↵robertphillips@google.com
flattening) https://codereview.chromium.org/101913006/ git-svn-id: http://skia.googlecode.com/svn/trunk/src@12666 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-13Remvoe duplicate impl for SkImageInfo flatteningreed@google.com
Add onNewLockPixels This reverts commit bb8eff6a70c52b7644391cfd4f4d21bf7294a6bf. BUG= Review URL: https://codereview.chromium.org/111323005 git-svn-id: http://skia.googlecode.com/svn/trunk/src@12665 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-13Revert "Revert of https://codereview.chromium.org/112783004/"reed@google.com
This reverts commit 3293fe57a7507541e9040eab880dcd82c43881f4. Conflicts: src/core/SkScaledImageCache.cpp BUG= Review URL: https://codereview.chromium.org/108613005 git-svn-id: http://skia.googlecode.com/svn/trunk/src@12663 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-12Implement an SkPicture image filter source. This is required for the ↵senorblanco@chromium.org
external-SVG reference feature of feImage. It simply plays back an SkPicture to a given destination rect. R=reed@google.com Review URL: https://codereview.chromium.org/114263002 git-svn-id: http://skia.googlecode.com/svn/trunk/src@12661 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-12Move segment mask from SkPath to SkPathRefrobertphillips@google.com
https://codereview.chromium.org/105083003/ git-svn-id: http://skia.googlecode.com/svn/trunk/src@12660 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-12be sure to unlock the discardablememory before deleting itreed@google.com
BUG= Review URL: https://codereview.chromium.org/114673002 git-svn-id: http://skia.googlecode.com/svn/trunk/src@12658 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-12Revert "Implement an SkPicture image filter source. This is required for the ↵senorblanco@chromium.org
external-SVG reference feature of feImage. It simply plays back an SkPicture to a given destination rect." This reverts commit a620349a24471546ad2e8f0679774c1f5b4de0a4 (r12656). git-svn-id: http://skia.googlecode.com/svn/trunk/src@12657 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-12Implement an SkPicture image filter source. This is required for the ↵senorblanco@chromium.org
external-SVG reference feature of feImage. It simply plays back an SkPicture to a given destination rect. R=reed@google.com Review URL: https://codereview.chromium.org/114263002 git-svn-id: http://skia.googlecode.com/svn/trunk/src@12656 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-12Fixed a displacement issuecommit-bot@chromium.org
The displacement filter was assuming that both inputs were of the same size, which is true in blink, but not necessarily in a compromised stream. BUG=327372 R=senorblanco@chromium.org, senorblanco@google.com, reed@google.com, fmalita@chromium.org, fmalita@google.com, sugoi@google.com Author: sugoi@chromium.org Review URL: https://codereview.chromium.org/101623007 git-svn-id: http://skia.googlecode.com/svn/trunk/src@12655 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-12detect if the scaledimagecache returns a purged bitmapreed@google.com
BUG= R=scroggo@google.com Review URL: https://codereview.chromium.org/110383005 git-svn-id: http://skia.googlecode.com/svn/trunk/src@12654 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-12Bounds fixes for SkXfermodeImageFilter:senorblanco@chromium.org
1) Change the default bounds to the union of the foreground and background bounds. 2) Use a canvas translate instead of manually offsetting the foreground and background bounds by the union. 3) Apply the transfer mode to all pixels, including those outside the foreground rect by using a difference clip. Covered by the offset test cases in the xfermodeimagefilter GM (will need rebaselines). R=reed@google.com Review URL: https://codereview.chromium.org/112683004 git-svn-id: http://skia.googlecode.com/svn/trunk/src@12652 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-12Preventing division by 0commit-bot@chromium.org
I did bench tests and I can't compute the denom before the if condition without taking a hit. After a few quick tests on my linux desktop, computing the 1st denom costs 6ms, the 2nd one 5ms and both together cost 9ms. The reason for this is that both if conditions here are exceptions and are expected to be false, so the denom computation should be skipped, if possible. The bench test I ran was : out/Release/bench --match Xfermode_Hue --config 8888 --minMs 1000 BUG= R=senorblanco@chromium.org, senorblanco@google.com, reed@google.com, sugoi@google.com Author: sugoi@chromium.org Review URL: https://codereview.chromium.org/114173002 git-svn-id: http://skia.googlecode.com/svn/trunk/src@12649 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-12Revert of https://codereview.chromium.org/112783004/commit-bot@chromium.org
Reason for revert: Failing assert on Android R=scroggo@google.com, halcanary@google.com, reed@google.com, rmistry@google.com TBR=halcanary@google.com, reed@google.com, scroggo@google.com NOTREECHECKS=true NOTRY=true Author: robertphillips@google.com Review URL: https://codereview.chromium.org/93673005 git-svn-id: http://skia.googlecode.com/svn/trunk/src@12646 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-12ensure that we call onUnlock only when we onLock succeededreed@google.com
BUG= R=halcanary@google.com, scroggo@google.com Review URL: https://codereview.chromium.org/112783004 git-svn-id: http://skia.googlecode.com/svn/trunk/src@12642 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-12Initialize SkPixelRef::fInfo.scroggo@google.com
Still will need to make subclasses call the version of the constructor that initializes fInfo properly. R=reed@google.com Review URL: https://codereview.chromium.org/110843006 git-svn-id: http://skia.googlecode.com/svn/trunk/src@12639 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-12Reverting r12635 (Make leak counters thread-safe - ↵robertphillips@google.com
https://codereview.chromium.org/99483003) due to compile errors on Mac 10.6 & in Chrome git-svn-id: http://skia.googlecode.com/svn/trunk/src@12637 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-12Make leak counters thread-safe and turn them on by default for Debugcommit-bot@chromium.org
Make leak counters implemented with SK_DECLARE_INST_COUNT thread-safe. Enable the leak counting for Debug builds. Protect the instance counter initialization step (initStep) by using SkOnce. Makes SkOnce.h part of the public API, since SkInstCnt is public. Protect the per-class child list shared variable with a per-class mutex. Changes the behavior in the way that if the child list has been "cleaned up", it will still try to create subsequent child lists. BUG=skia:1219 R=robertphillips@google.com, mtklein@google.com, bungeman@gmail.com, bsalomon@google.com, bungeman@google.com Author: kkinnunen@nvidia.com Review URL: https://codereview.chromium.org/99483003 git-svn-id: http://skia.googlecode.com/svn/trunk/src@12635 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-12Merge third_party/skia/src from ↵Android Chromium Automerger
https://chromium.googlesource.com/external/skia/src.git at a040d0e00417f765cd9d25b9c70694e4b818d77c This commit was generated by merge_from_chromium.py. Change-Id: I76c06b9e74405376804c3b9e2936fcccc264fe49
2013-12-11[PDF] Fix font width generation when glyph 0 is used.commit-bot@chromium.org
Using glyph 0 caused gid 0 to be in the subset list twice, which violated an assumption in the code. Added an assert for the assumption and updated the code to not insert gid 0 into the subset list twice. BUG=skia:1889 R=bungeman@google.com Author: vandebo@chromium.org Review URL: https://codereview.chromium.org/113093004 git-svn-id: http://skia.googlecode.com/svn/trunk/src@12632 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-11Revert "remvoe duplicate impl for SkImageInfo flattening"reed@google.com
Reason: breaks chrome_mac_tests which still have non-imageinfo constructors This reverts commit a06b8cf60b39bda93e9ef1a73579007b2b930d29. BUG= Review URL: https://codereview.chromium.org/103033005 git-svn-id: http://skia.googlecode.com/svn/trunk/src@12631 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-11Revert "Revert of https://codereview.chromium.org/108773003/"reed@google.com
This reverts commit 947e6a3142af66b750f1247ef933b11ed8455dd4. BUG= Review URL: https://codereview.chromium.org/112963003 git-svn-id: http://skia.googlecode.com/svn/trunk/src@12630 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-11Revert of https://codereview.chromium.org/108773003/commit-bot@chromium.org
Reason for revert: breaks chrome-mac-tests TBR= NOTREECHECKS=true NOTRY=true Author: reed@google.com Review URL: https://codereview.chromium.org/113193003 git-svn-id: http://skia.googlecode.com/svn/trunk/src@12629 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-11[PDF] Fix bug in ToUnicode table generation for Type 3 fonts.commit-bot@chromium.org
True glyphIDs where being using in the Type3 ToUnicode table instead of IDs of 1-255. This causes poppler to complain about each entry. BUG:skia:1565 R=bungeman@google.com Author: vandebo@chromium.org Review URL: https://codereview.chromium.org/112053005 git-svn-id: http://skia.googlecode.com/svn/trunk/src@12625 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-11remvoe duplicate impl for SkImageInfo flatteningreed@google.com
Revert "Revert "PixelRef now returns (nearly) everything that is currently in SkBitmap. The goal is to refactor bitmap later to remove redundancy, and more interestingly, remove the chance for a disconnect between the actual (pixelref) rowbytes and config, and the one claimed by the bitmap."""""" This reverts commit eabd6b2ed4e494b323c08f32358f45950a0368c3. BUG= Review URL: https://codereview.chromium.org/108773003 git-svn-id: http://skia.googlecode.com/svn/trunk/src@12624 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-11Revert "PixelRef now returns (nearly) everything that is currently in ↵reed@google.com
SkBitmap. The goal is to refactor bitmap later to remove redundancy, and more interestingly, remove the chance for a disconnect between the actual (pixelref) rowbytes and config, and the one claimed by the bitmap.""""" This reverts commit d08eca87a0bef10112a211de540f89656a80b86a. BUG= Review URL: https://codereview.chromium.org/108303003 git-svn-id: http://skia.googlecode.com/svn/trunk/src@12623 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-11PixelRef now returns (nearly) everything that is currently in SkBitmap. The ↵reed@google.com
goal is to refactor bitmap later to remove redundancy, and more interestingly, remove the chance for a disconnect between the actual (pixelref) rowbytes and config, and the one claimed by the bitmap."""" BUG= Review URL: https://codereview.chromium.org/110503003 git-svn-id: http://skia.googlecode.com/svn/trunk/src@12622 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-11be more careful about OOB source pixels in the scanline rescaler, andcommit-bot@chromium.org
less certain about why the standalone scaler might have faileds BUG= R=reed@google.com Author: humper@google.com Review URL: https://codereview.chromium.org/100473011 git-svn-id: http://skia.googlecode.com/svn/trunk/src@12619 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-11add more tests for discardable cachesreed@google.com
BUG= R=halcanary@google.com Review URL: https://codereview.chromium.org/112833003 git-svn-id: http://skia.googlecode.com/svn/trunk/src@12618 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-11Merge third_party/skia/src from ↵Android Chromium Automerger
https://chromium.googlesource.com/external/skia/src.git at 6168ea7d412448c88169a565f40bf86379d4bf9a This commit was generated by merge_from_chromium.py. Change-Id: I9caf28ca55c574145162509dd4edc7bca30f8774
2013-12-11Merge third_party/skia/src from ↵Android Chromium Automerger
https://chromium.googlesource.com/external/skia/src.git at dadedcc6a46d2a424f1d64c35e58bc0e0d4339d1 This commit was generated by merge_from_chromium.py. Change-Id: Ia39a3f3bcd101440dafab6d80e7cc037f08bb718
2013-12-11Sanitizing source files in Housekeeper-Nightlyskia.committer@gmail.com
git-svn-id: http://skia.googlecode.com/svn/trunk/src@12617 2bbb7eff-a529-9590-31e7-b0007b416f81
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 12:45:42 +0000