diff options
author | senorblanco@chromium.org <senorblanco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-13 13:16:52 +0000 |
---|---|---|
committer | senorblanco@chromium.org <senorblanco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-13 13:16:52 +0000 |
commit | d5282e72b2da0b27b2a487d8376c44ad795736dc (patch) | |
tree | 7296767f5fcfa3b1cdd46f122e14dfaca1dd7e4a /skia/include/Sk2DPathEffect.h | |
parent | 3ac3f51f8261910dbc38ccfa4cdf3d491ba7ecdb (diff) | |
download | chromium_src-d5282e72b2da0b27b2a487d8376c44ad795736dc.zip chromium_src-d5282e72b2da0b27b2a487d8376c44ad795736dc.tar.gz chromium_src-d5282e72b2da0b27b2a487d8376c44ad795736dc.tar.bz2 |
This CL updates chrome to the latest version of skia, retrieved via DEPS, and
placed in third_party. All relevant skia changes (for all 3 platforms) have
been upstreamed.
Most of this CL is mind-numbingly repetitive. Things of interest are: skia.gyp
(now points at third_party versions), DEPS, and SkUserConfig.h. stdint.h: Skia
now requires C99 integer types, which MSVC doesn't support natively. I have put
typedefs in config/win/stdint.h.
Note that the new version of skia appears to render rects whose coordinates
are "backwards" (ie., x2 < x1 or y2 < y1), which were formerly culled. There
were a couple obvious instances of this in the code which I fixed, but there may
be more.
There were ~35 layout test failures due to minor pixel differences which I
rebaselined on Windows and Linux, and 8 genuine failures related to masks and
stroked text, which I have put in text_expectations.txt and assigned to
myself. (There was another change which broke ~1700 tests on each platform,
but I put that change behind an #ifdef for now).
R=brettw
Review URL: http://codereview.chromium.org/65012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15949 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/include/Sk2DPathEffect.h')
-rw-r--r-- | skia/include/Sk2DPathEffect.h | 73 |
1 files changed, 0 insertions, 73 deletions
diff --git a/skia/include/Sk2DPathEffect.h b/skia/include/Sk2DPathEffect.h deleted file mode 100644 index 6e54d0a..0000000 --- a/skia/include/Sk2DPathEffect.h +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright (C) 2006 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef Sk2DPathEffect_DEFINED -#define Sk2DPathEffect_DEFINED - -#include "SkPathEffect.h" -#include "SkMatrix.h" - -// This class is not exported to java. -class Sk2DPathEffect : public SkPathEffect { -public: - Sk2DPathEffect(const SkMatrix& mat); - - // overrides - // This method is not exported to java. - virtual bool filterPath(SkPath* dst, const SkPath& src, SkScalar* width); - - // overrides from SkFlattenable - // This method is not exported to java. - virtual void flatten(SkFlattenableWriteBuffer&); - - // This method is not exported to java. - virtual Factory getFactory(); - -protected: - /** New virtual, to be overridden by subclasses. - This is called once from filterPath, and provides the - uv parameter bounds for the path. Subsequent calls to - next() will receive u and v values within these bounds, - and then a call to end() will signal the end of processing. - */ - virtual void begin(const SkIRect& uvBounds, SkPath* dst); - virtual void next(const SkPoint& loc, int u, int v, SkPath* dst); - virtual void end(SkPath* dst); - - /** Low-level virtual called per span of locations in the u-direction. - The default implementation calls next() repeatedly with each - location. - */ - virtual void nextSpan(int u, int v, int ucount, SkPath* dst); - - const SkMatrix& getMatrix() const { return fMatrix; } - - // protected so that subclasses can call this during unflattening - Sk2DPathEffect(SkFlattenableReadBuffer&); - -private: - SkMatrix fMatrix, fInverse; - // illegal - Sk2DPathEffect(const Sk2DPathEffect&); - Sk2DPathEffect& operator=(const Sk2DPathEffect&); - - static SkFlattenable* CreateProc(SkFlattenableReadBuffer&); - - friend class Sk2DPathEffectBlitter; - typedef SkPathEffect INHERITED; -}; - -#endif |