Commit Graph

6812 Commits

Author SHA1 Message Date
reed@google.com
e9bbc81c7e move typeface cache limit from 128 to 1024 (128 is a joke, not sure what a
real upper limit should be)



git-svn-id: http://skia.googlecode.com/svn/trunk@8417 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-27 20:29:18 +00:00
reed@google.com
db23509adc always call SkFontMgr::Factory() (now that everyone has impl'd it)
git-svn-id: http://skia.googlecode.com/svn/trunk@8416 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-27 20:12:59 +00:00
reed@google.com
070da5edcb add dummpy SkFontMgr::Factory() impl to font backends, so we can start testing it
Review URL: https://codereview.chromium.org/13119021

git-svn-id: http://skia.googlecode.com/svn/trunk@8415 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-27 20:01:49 +00:00
bsalomon@google.com
798c8c4fe6 Move GrGLProgramDesc::Build to new cpp file.
Review URL: https://codereview.chromium.org/13097007

git-svn-id: http://skia.googlecode.com/svn/trunk@8414 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-27 19:50:27 +00:00
bsalomon@google.com
db4462566a Fix assertion failure in SkGpuDevice from 8412.
git-svn-id: http://skia.googlecode.com/svn/trunk@8413 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-27 18:46:16 +00:00
bsalomon@google.com
f51c01328d Add interface to SkXfermode to return a GrEffect and blend coeffs.
Review URL: https://codereview.chromium.org/13097006

git-svn-id: http://skia.googlecode.com/svn/trunk@8412 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-27 18:31:15 +00:00
bsalomon@google.com
31ec7985f2 Move GrGLProgram::Desc out of GrGLProgram.
Review URL: https://codereview.chromium.org/12942014

git-svn-id: http://skia.googlecode.com/svn/trunk@8411 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-27 18:14:57 +00:00
rmistry@google.com
04b959abfc Whitespace change to trigger rebuilds
git-svn-id: http://skia.googlecode.com/svn/trunk@8410 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-27 17:03:52 +00:00
reed@google.com
b368551087 fix mask error for BW text, where I forgot to look at just the low-8 bits
of the right mask when computing the number of "full" runs.

possibly related to crbug.com/178796
Review URL: https://codereview.chromium.org/13044012

git-svn-id: http://skia.googlecode.com/svn/trunk@8408 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-27 15:08:23 +00:00
reed@google.com
3dcbd4673d CTFontManagerCopyAvailableFontFamilyNames is not always available (on iOS)
so write a wrapper for it.

fixes iOS build



git-svn-id: http://skia.googlecode.com/svn/trunk@8406 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-27 13:56:34 +00:00
skia.committer@gmail.com
37cbc7fd01 Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@8404 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-27 07:01:04 +00:00
tfarina@chromium.org
48552314f6 Fix a few clang errors while trying to build tools target.
Most of the errors were like:
../../src/gpu/gl/GrGLEffectMatrix.cpp:74:9: error: variable 'varyingType' is used uninitialized whenever switch default is taken [-Werror,-Wsometimes-uninitialized]
../../src/gpu/gl/debug/GrDebugGL.h:125:21: error: private field 'fMaxTextureUnits' is not used [-Werror,-Wunused-private-field]
../../src/core/SkBitmapSampler.cpp:312:25: error: private field 'fProcTable' is not used [-Werror,-Wunused-private-field]

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

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

git-svn-id: http://skia.googlecode.com/svn/trunk@8403 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-26 21:48:58 +00:00
robertphillips@google.com
4f65a27500 Address clang static analyzer issues
https://codereview.chromium.org/12940011/



git-svn-id: http://skia.googlecode.com/svn/trunk@8401 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-26 19:40:46 +00:00
robertphillips@google.com
ad9327f036 Increase space for effect-class-ID and fix assert
https://codereview.chromium.org/12703040/



git-svn-id: http://skia.googlecode.com/svn/trunk@8400 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-26 19:35:06 +00:00
reed@google.com
ce8b3de605 store real fontstyle on mac fonts
git-svn-id: http://skia.googlecode.com/svn/trunk@8399 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-26 19:30:16 +00:00
reed@google.com
919e9c3477 fix infinite recursion calling (non)virtual
git-svn-id: http://skia.googlecode.com/svn/trunk@8398 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-26 19:29:55 +00:00
reed@google.com
ca5c841a64 respect slant param
git-svn-id: http://skia.googlecode.com/svn/trunk@8397 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-26 19:02:52 +00:00
reed@google.com
7244e88383 #if 0 reference to SkFontMgr::Factory for now
git-svn-id: http://skia.googlecode.com/svn/trunk@8396 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-26 17:24:39 +00:00
reed@google.com
83787c55db impl part of SKFontMgr for mac
Here is some test code

    SkFontMgr* mgr = SkFontMgr::RefDefault();
    for (int i = 0; i < mgr->countFamilies(); ++i) {
        SkString familyName;
        mgr->getFamilyName(i, &familyName);
        SkDebugf("%s\n", familyName.c_str());
        SkFontStyleSet* styles = mgr->createStyleSet(i);
        for (int j = 0; j < styles->count(); ++j) {
            SkFontStyle fs;
            SkString styleName;
            styles->getStyle(j, &fs, &styleName);
            SkTypeface* face = styles->createTypeface(j);
            SkDebugf("    %s [%d %d] %x\n", styleName.c_str(), fs.weight(),
                     fs.width(), face);
        }
        styles->unref();
    }
    mgr->unref();
Review URL: https://codereview.chromium.org/13094005

git-svn-id: http://skia.googlecode.com/svn/trunk@8395 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-26 17:19:15 +00:00
bsalomon@google.com
26ec00ea1b Fix unit test build break
git-svn-id: http://skia.googlecode.com/svn/trunk@8394 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-26 16:49:37 +00:00
bsalomon@google.com
e9144c64a6 Program key coverage/discard fixes.
Review URL: https://codereview.chromium.org/13095004

git-svn-id: http://skia.googlecode.com/svn/trunk@8393 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-26 16:42:17 +00:00
bsalomon@google.com
4647f90598 Replace edge types with GrEdgeEffect.
This strips out last of the edge types and the fixed function edge attribute and replaces them with using GrEdgeEffect. Also fixes a minor bug when checking attribute counts -- it was using kAttribIndexCount instead of kVertexAttribCnt. 

Original Author: jvanverth@google.com
Review URL: https://codereview.chromium.org/13069003

git-svn-id: http://skia.googlecode.com/svn/trunk@8392 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-26 14:45:27 +00:00
rmistry@google.com
36ee020fc7 Trigger rebuilds on ChromeOS
(RunBuilders:Skia_ChromeOS_Alex_Release_32)



git-svn-id: http://skia.googlecode.com/svn/trunk@8391 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-26 13:47:19 +00:00
rmistry@google.com
c215d105f8 Trigger rebuilds on Mac-10.7 32 bit
(RunBuilders:Skia_MacMiniLion_Float_Debug_32)



git-svn-id: http://skia.googlecode.com/svn/trunk@8390 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-26 13:36:24 +00:00
rmistry@google.com
c826a7c684 Trigger rebuilds on Mac-10.7
(RunBuilders:Skia_MacMiniLion_Float_Debug_64)



git-svn-id: http://skia.googlecode.com/svn/trunk@8389 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-26 13:24:14 +00:00
reed@google.com
e8be73b2d3 oops, don't say static for an extern function
git-svn-id: http://skia.googlecode.com/svn/trunk@8387 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-26 12:32:03 +00:00
reed@google.com
1fa793fa6b remove SkFontHost::NextLogicalFont, and add android-specific function
SkAndroidNextLogicalTypeface



git-svn-id: http://skia.googlecode.com/svn/trunk@8386 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-26 12:29:05 +00:00
rmistry@google.com
02c77648ce Whitespace change to trigger rebuilds
git-svn-id: http://skia.googlecode.com/svn/trunk@8385 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-26 11:26:06 +00:00
skia.committer@gmail.com
e60ed08a35 Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@8383 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-26 07:01:04 +00:00
borenet@google.com
0e3f6212c7 Whitespace change to test compile-only bots
git-svn-id: http://skia.googlecode.com/svn/trunk@8382 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-26 05:49:40 +00:00
robertphillips@google.com
8cf10efe75 Reverting r8376, r8373 and r8371 due to Android shader compilation failures
git-svn-id: http://skia.googlecode.com/svn/trunk@8378 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-25 22:16:02 +00:00
reed@google.com
95625dbcb6 check-point (early) for fontmgr stuff, not called.
git-svn-id: http://skia.googlecode.com/svn/trunk@8377 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-25 20:44:02 +00:00
sugoi@google.com
33179c817a Unreviewed build fix
git-svn-id: http://skia.googlecode.com/svn/trunk@8376 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-25 20:41:07 +00:00
reed@google.com
50b14a26dc oops, fix name for SkCreateDataProviderFromData
git-svn-id: http://skia.googlecode.com/svn/trunk@8375 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-25 20:21:26 +00:00
reed@google.com
12b1f19c1f expose skdata -> cgdataprovider helper
git-svn-id: http://skia.googlecode.com/svn/trunk@8374 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-25 20:15:40 +00:00
sugoi@google.com
2874906bf2 Unreviewed build fix
git-svn-id: http://skia.googlecode.com/svn/trunk@8373 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-25 20:14:08 +00:00
bungeman@google.com
fe74765f0d Change fixedWidth to fixedPitch and implement on Windows.
https://codereview.appspot.com/7954044/


git-svn-id: http://skia.googlecode.com/svn/trunk@8372 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-25 19:36:11 +00:00
sugoi@google.com
2daa365123 New SVG turbulence in Skia
This cl contains the code for both CPU and GPU generation of noise. Both
codepaths yield equivalent results.

TEST:Added 'perlinnoise' gm
Review URL: https://codereview.chromium.org/13047005

git-svn-id: http://skia.googlecode.com/svn/trunk@8371 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-25 19:31:04 +00:00
reed@google.com
c452d82c82 move fontmgr into include/ports for now
git-svn-id: http://skia.googlecode.com/svn/trunk@8370 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-25 18:44:17 +00:00
bsalomon@google.com
c26d94fd7d Move nested class GrDrawTarget::Caps out as GrDrawTargetCaps.
Pass caps to GrEffect::TestCreate() functions so that they can return effects that will work with the capabilities.
Review URL: https://codereview.chromium.org/12965018

git-svn-id: http://skia.googlecode.com/svn/trunk@8369 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-25 18:19:00 +00:00
robertphillips@google.com
6864cb8a2e Rebaseline Mac 10.8 performance flakes
git-svn-id: http://skia.googlecode.com/svn/trunk@8368 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-25 17:16:37 +00:00
rmistry@google.com
0e642cdb0c Whitespace change to trigger RazrI builds.
(RunBuilders:Skia_RazrI_4-1_Float_Release_32)


git-svn-id: http://skia.googlecode.com/svn/trunk@8367 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-25 16:58:49 +00:00
reed@google.com
d257a7e5fd limit SkFontHost::NextLogicalTypeface to only android (the only backend that
seems to rely on it), so we can remove it from the portable API.



git-svn-id: http://skia.googlecode.com/svn/trunk@8366 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-25 16:36:34 +00:00
bsalomon@google.com
71ebd0595b Fix non-Windows build break in r8364.
git-svn-id: http://skia.googlecode.com/svn/trunk@8365 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-25 15:43:01 +00:00
bsalomon@google.com
bcce892652 Make GrDrawTarget::Caps ref counted and GrGLCaps derive from it.
Also rename GrDrawTarget::getCaps() -> GrDrawTarget::caps().
Review URL: https://codereview.chromium.org/12843026

git-svn-id: http://skia.googlecode.com/svn/trunk@8364 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-25 15:38:39 +00:00
reed@google.com
a45bcc8022 make SkFontHost::NextLogicalTypeface private (only called by SkScalerContext)
git-svn-id: http://skia.googlecode.com/svn/trunk@8363 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-25 14:55:34 +00:00
reed@google.com
e74f83bbfe remove SkFontHost::EnsureTypefaceAccessible declaration (no longer implemented or called)
git-svn-id: http://skia.googlecode.com/svn/trunk@8361 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-25 14:45:12 +00:00
reed@google.com
5526ede94a land https://codereview.chromium.org/12676024
git-svn-id: http://skia.googlecode.com/svn/trunk@8359 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-25 13:03:37 +00:00
robertphillips@google.com
77279cbf9b Fix compiler errors/warnings in r8355
git-svn-id: http://skia.googlecode.com/svn/trunk@8357 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-25 12:01:45 +00:00
robertphillips@google.com
44b85fe217 Rebaselining performance flake
git-svn-id: http://skia.googlecode.com/svn/trunk@8356 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-25 11:52:27 +00:00