AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,387 Commits 1 Branch 0 Tags 544 MiB
9c9d4a7002
Commit Graph

2239 Commits

Author SHA1 Message Date
mtklein@google.com
9c9d4a7002 Restore SkPath(const SkPath&) to copy the generation ID on Android. 
BUG=
R=bsalomon@google.com, bungeman@google.com, reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10622 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-07 19:17:53 +00:00
bungeman@google.com
839702b619 Add getFamilyNames to SkTypeface. 
Committed: https://code.google.com/p/skia/source/detail?r=10589

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

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

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10615 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-07 17:09:22 +00:00
commit-bot@chromium.org
2515242ee0 Add SkCanvas::drawPosTextBounded. 
This allows subclasses which need bounding box information to get it
from the caller if it has already been computed.

BUG=chromium:269080
R=reed@google.com, tomhudson@chromium.org, tomhudson@google.com

Author: jbroman@chromium.org

Review URL: https://chromiumcodereview.appspot.com/22585002

git-svn-id: http://skia.googlecode.com/svn/trunk@10612 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-07 16:22:47 +00:00
robertphillips@google.com
f7af91bd79 Reverting r10608 (Add getFamilyNames to SkTypeface) due to compilation failures 
git-svn-id: http://skia.googlecode.com/svn/trunk@10609 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-07 15:56:51 +00:00
bungeman@google.com
246b1c266f Add getFamilyNames to SkTypeface. 
Committed: https://code.google.com/p/skia/source/detail?r=10589

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

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10608 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-07 15:46:29 +00:00
commit-bot@chromium.org
37ffe8a5a3 Remove operator== from SkPaint 
R=mtklein@google.com, reed@google.com

Author: sglez@google.com

Review URL: https://chromiumcodereview.appspot.com/21949007

git-svn-id: http://skia.googlecode.com/svn/trunk@10603 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-07 15:22:05 +00:00
bsalomon@google.com
75796db3b3 Revert "Add blend optimization helpers and use to convert rect draws to clears." 
This reverts commit r10537.

git-svn-id: http://skia.googlecode.com/svn/trunk@10601 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-07 13:34:14 +00:00
bungeman@google.com
a980269c24 Add getFamilyNames to SkTypeface. 
Committed: https://code.google.com/p/skia/source/detail?r=10589

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10592 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-07 02:45:25 +00:00
commit-bot@chromium.org
1c4c9ef437 Move SkComposeImageFilter into its own {.h, .cpp} files 
In http://crrev.com/21154002, SkComposeImageFilter will be used
outside of tests. Consequently, this moves SkComposeImageFilter from
SkTestImageFilters.{h, cpp} into its own {.h, .cpp} files.

BUG=181613
R=senorblanco@chromium.org

Author: ajuma@chromium.org

Review URL: https://chromiumcodereview.appspot.com/22438003

git-svn-id: http://skia.googlecode.com/svn/trunk@10591 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-07 00:07:51 +00:00
jvanverth@google.com
7ca6d2f070 Reverting r10589: Add getFamilyNames to SkTypeface 
git-svn-id: http://skia.googlecode.com/svn/trunk@10590 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-06 23:31:44 +00:00
bungeman@google.com
990d85f02b Add getFamilyNames to SkTypeface. 
Review URL: https://codereview.chromium.org/21716005

git-svn-id: http://skia.googlecode.com/svn/trunk@10589 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-06 22:53:04 +00:00
jvanverth@google.com
9c8b4eaf28 Reverting r10583: Upstreaming DropShadowImageFilter into skia, from Blink 
git-svn-id: http://skia.googlecode.com/svn/trunk@10587 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-06 21:12:59 +00:00
george@mozilla.com
aa2d35144b Change SkPreConfig.h to recognise uppercase PPC/PPC64. 
git-svn-id: http://skia.googlecode.com/svn/trunk@10584 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-06 20:16:34 +00:00
junov@chromium.org
d8e4024719 Upstreaming DropShadowImageFilter into skia, from Blink 
GM imagefiltersbase will need rebaselining after this change

R=senorblanco@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10583 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-06 20:01:40 +00:00
george@mozilla.com
2d9526715e Add a default value for SK_OVERRIDE in SkPostConfig.h 
Review URL: https://chromiumcodereview.appspot.com/22288002

git-svn-id: http://skia.googlecode.com/svn/trunk@10576 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-06 18:35:00 +00:00
bungeman@google.com
5ebbbe5377 Annotate SK_COMPILE_ASSERT's typedef as permissibly unused, to fix GCC 4.8 build warning. Patch originally by dholbert. 
R=bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10575 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-06 18:32:29 +00:00
commit-bot@chromium.org
c1cdf21ab8 Add blend optimization helpers and use to convert rect draws to clears. 
Committed: http://code.google.com/p/skia/source/detail?r=10537

R=robertphillips@google.com, jvanverth@google.com, reed@google.com

Author: bsalomon@google.com

Review URL: https://chromiumcodereview.appspot.com/21877006

git-svn-id: http://skia.googlecode.com/svn/trunk@10562 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-06 15:07:23 +00:00
senorblanco@chromium.org
97333f2da9 Remove warning comment from SkImageFilter. 
R=reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10546 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-05 20:29:59 +00:00
bsalomon@google.com
9b6a185e36 Revert "Add blend optimization helpers and use to convert rect draws to clears." 
This reverts commit r10537.

git-svn-id: http://skia.googlecode.com/svn/trunk@10542 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-05 18:27:23 +00:00
commit-bot@chromium.org
66017f6cc5 Add blend optimization helpers and use to convert rect draws to clears. 
R=robertphillips@google.com, jvanverth@google.com, reed@google.com

Author: bsalomon@google.com

Review URL: https://chromiumcodereview.appspot.com/21877006

git-svn-id: http://skia.googlecode.com/svn/trunk@10537 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-05 16:55:55 +00:00
commit-bot@chromium.org
1aa54bf669 Added ctm matrix to GPU path 
There should be no changes in behavior caused by this cl, it just adds the ctm matrix to filterImageGPU so that it may be used for scaling on all platforms when it is implemented on the blink side.

BUG=
R=senorblanco@google.com, senorblanco@chromium.org

Author: sugoi@chromium.org

Review URL: https://chromiumcodereview.appspot.com/22209002

git-svn-id: http://skia.googlecode.com/svn/trunk@10536 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-05 16:53:50 +00:00
sugoi@google.com
89066e5cd5 Removed duplicate file 
BUG=

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10514 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-02 15:45:41 +00:00
bungeman@google.com
ddc218e508 Implement onGetTableTags and onGetTableData on Windows. 
Implements these and removes default implementation, making the
declaration in SkTypeface pure virtual.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10500 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-01 22:29:43 +00:00
bungeman@google.com
397a9546e4 Reintroduce default impls removed in 10495. 
Due to poor placement of overrides in the hierarchy, nacl is failing.


git-svn-id: http://skia.googlecode.com/svn/trunk@10497 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-01 21:01:28 +00:00
bungeman@google.com
b10b51f64d Implement onGetTableTags and onGetTableData on Windows. 
Implements these and removes default implementation, making the
declaration in SkTypeface pure virtual.

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


git-svn-id: http://skia.googlecode.com/svn/trunk@10495 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-01 20:18:41 +00:00
scroggo@google.com
d4c3565aac Fixes for JPEG subset decoding. 
Ensure that the stream passed to JPEG for subset decoding is
neither deleted before it is no longer needed nor deleted an
extra time.

src/images/SkJpegUtility.h:
src/images/SkJpegUtility.cpp:
Always ref and unref the stream provided to skjpeg_source_mgr.
Add some comments explaining how skjpeg_source_mgr's members
handle ownership.
Fix a warning comparing signed and unsigned numbers, converting
to size_t which is more appropriate for measuring bytes.
Remove dead code referring to fMemoryBase and fMemoryBaseSize,
which are never used.

src/images/SkImageDecoder_libjpeg.cpp:
Call the new constructor for skjpeg_source_mgr, which no longer
takes a boolean to determine ownership.

include/images/SkBitmapRegionDecoder.h
src/images/SkBitmapRegionDecoder.cpp:
This small shim has been removed, since it is not needed to use
Skia's image decoders. Its functionality will be folded into
Android.

Required for the merge to Android.

R=djsollen@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10483 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-01 15:03:42 +00:00
senorblanco@chromium.org
350b4d50ea Remove SkBlendImageFilter, and all tests. Its functionality has been subsumed by SkXfermodeImageFilter. 
R=robertphillips@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10482 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-01 14:59:05 +00:00
commit-bot@chromium.org
92ffe7d10e Inverse fill support in PDF 
BUG= https://code.google.com/p/skia/issues/detail?id=241 (partial fix)
R=edisonn@google.com, vandebo@chromium.org, reed@google.com

Author: richardlin@chromium.org

Review URL: https://chromiumcodereview.appspot.com/19519017

git-svn-id: http://skia.googlecode.com/svn/trunk@10476 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-07-31 22:54:31 +00:00
reed@google.com
65a629ab33 Revert "Revert "Revert "try enabling FONTHOST_USES_FONTMGR and see what breaks""" 
This reverts commit d0a1a568ac5d5c2ed94e826e91b01241de2ca0ce.

git-svn-id: http://skia.googlecode.com/svn/trunk@10472 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-07-31 19:36:07 +00:00
reed@google.com
699c06e2f5 Revert "Revert "try enabling FONTHOST_USES_FONTMGR and see what breaks"" 
This reverts commit a8946cf4180908d577681cb62d621db0ebcbe67e.

i.e. reapply the change to try enabling FONTHOST_USES_FONTMGR

git-svn-id: http://skia.googlecode.com/svn/trunk@10471 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-07-31 19:00:30 +00:00
bsalomon@google.com
f3f2d1619e set nominmax on windows 
R=scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10470 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-07-31 18:52:31 +00:00
reed@google.com
cde269a6a6 Revert "try enabling FONTHOST_USES_FONTMGR and see what breaks" 
This reverts commit a289c38fc14664b5ba1269cfe08b3048cdbd1e97.

git-svn-id: http://skia.googlecode.com/svn/trunk@10468 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-07-31 18:25:33 +00:00
reed@google.com
b14d5bc091 try enabling FONTHOST_USES_FONTMGR and see what breaks 
git-svn-id: http://skia.googlecode.com/svn/trunk@10466 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-07-31 18:08:49 +00:00
mtklein@google.com
caacc8f4e1 Remove a stray double assign that g++ 4.8 thinks has ill-defined sequencing. 
BUG=
R=bungeman@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10462 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-07-31 16:01:25 +00:00
djsollen@google.com
29bf862515 Upstream changes from Android 
R=scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10461 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-07-31 15:48:10 +00:00
robertphillips@google.com
631a59b939 added drawVertices path to GameBench 
https://codereview.chromium.org/21168006/



git-svn-id: http://skia.googlecode.com/svn/trunk@10459 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-07-31 14:57:53 +00:00
robertphillips@google.com
f2776ee02a Alter assert that is causing Chromium compilation failure 
../../third_party/skia/include/core/SkTypeface.h:303:19: error: implicit conversion turns string literal into bool: 'const char [14]' to 'bool' [-Werror,-Wstring-conversion]
        SkASSERT(!"unimplemented");
                 ~^~~~~~~~~~~~~~~



git-svn-id: http://skia.googlecode.com/svn/trunk@10447 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-07-31 00:00:56 +00:00
reed@google.com
30ddd615c4 refactoring for SK_FONTHOST_USES_FONTMGR option 
BUG=
R=bungeman@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10440 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-07-30 17:47:39 +00:00
commit-bot@chromium.org
38bad32cf5 fold SK_CPU_HAS_CONDITION_INSTR through as always defined 
BUG=
R=reed@google.com

Author: mtklein@google.com

Review URL: https://chromiumcodereview.appspot.com/21122005

git-svn-id: http://skia.googlecode.com/svn/trunk@10432 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-07-30 13:16:29 +00:00
mtklein@google.com
d49173afc8 always have conditional instruction 
BUG=
R=djsollen@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10422 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-07-29 20:53:14 +00:00
mtklein@google.com
069aea7f2c one more thing to try before rebaselining android 
BUG=
R=djsollen@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10420 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-07-29 19:30:00 +00:00
reed@google.com
08df48d241 expose getFamilyName to public SkTypeface 
git-svn-id: http://skia.googlecode.com/svn/trunk@10418 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-07-29 18:54:08 +00:00
skia.committer@gmail.com
aeefb2afe7 Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@10398 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-07-27 07:01:06 +00:00
commit-bot@chromium.org
cffff79a40 get genmipmap function in the struct 
BUG=
R=bsalomon@google.com, reed@google.com

Author: humper@google.com

Review URL: https://chromiumcodereview.appspot.com/20436002

git-svn-id: http://skia.googlecode.com/svn/trunk@10393 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-07-26 16:36:04 +00:00
skia.committer@gmail.com
956b310f13 Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@10385 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-07-26 07:00:58 +00:00
senorblanco@chromium.org
4e16bb2a32 Implement crop rect for lighting image filters. Changes for the CPU path were fairly straightforward: use the bounds rectangle when traversing the pixels, not the source rectangle. 
For the GPU path, this required modifying the signature of SkImageFilter::asNewEffect() to receive the bounds offset, so that the lighting filters could offset the light position by the offset. It also required modifying the base-class implementation of SkImageFilter::filterImageGPU() (which implements single-pass filters) to intersect against the bounds rect, to pass its offset to asNewEffect(), and to modify the caller's offset (so it's drawn in the correct place).

Note: this will require rebaselining the lighting GM. Six new test cases were added, to accommodate a cropped version of each lighting filter.

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

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10379 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-07-26 00:10:07 +00:00
commit-bot@chromium.org
4d24b747e2 Make SkImage_Gpu share it's pixelref with the surface to prevent premature return to scratch pool. 
BUG=crbug.com/263329
TEST=Surface unit test, function Test_crbug263329
R=bsalomon@google.com, reed@google.com

Author: junov@chromium.org

Review URL: https://chromiumcodereview.appspot.com/20354003

git-svn-id: http://skia.googlecode.com/svn/trunk@10378 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-07-25 23:29:40 +00:00
bsalomon@google.com
68f2a0df14 This reverts commit 4052fd051db67bd1099fde2c4fe400cfbe1f2426. 
git-svn-id: http://skia.googlecode.com/svn/trunk@10374 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-07-25 21:30:52 +00:00
commit-bot@chromium.org
47fad70da3 R=borenet@google.com, bungeman@google.com, robertphillips@google.com 
Author: bsalomon@google.com

Review URL: https://chromiumcodereview.appspot.com/19862002

git-svn-id: http://skia.googlecode.com/svn/trunk@10372 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-07-25 20:01:20 +00:00
humper@google.com
b86add1ad3 make the filter mode for GrTextureAccess an enum so we can plumb down 
the paint's filter modes to the GPU

BUG=
R=bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10368 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-07-25 18:49:07 +00:00