michael@0: # HG changeset patch
michael@0: # Parent 979e60d9c09f22eb139643da6de7568b603e1aa1
michael@0: 
michael@0: diff --git a/gfx/skia/include/images/SkImages.h b/gfx/skia/include/images/SkImages.h
michael@0: --- a/gfx/skia/include/images/SkImages.h
michael@0: +++ b/gfx/skia/include/images/SkImages.h
michael@0: @@ -1,14 +1,19 @@
michael@0:  /*
michael@0:   * Copyright 2012 Google Inc.
michael@0:   *
michael@0:   * Use of this source code is governed by a BSD-style license that can be
michael@0:   * found in the LICENSE file.
michael@0:   */
michael@0:  
michael@0: +#ifndef SkImages_DEFINED
michael@0: +#define SkImages_DEFINED
michael@0: +
michael@0:  class SkImages {
michael@0:  public:
michael@0:      /**
michael@0:       * Initializes flattenables in the images project.
michael@0:       */
michael@0:      static void InitializeFlattenables();
michael@0:  };
michael@0: +
michael@0: +#endif
michael@0: diff --git a/gfx/skia/src/gpu/GrAAConvexPathRenderer.h b/gfx/skia/src/gpu/GrAAConvexPathRenderer.h
michael@0: --- a/gfx/skia/src/gpu/GrAAConvexPathRenderer.h
michael@0: +++ b/gfx/skia/src/gpu/GrAAConvexPathRenderer.h
michael@0: @@ -1,16 +1,19 @@
michael@0:  
michael@0:  /*
michael@0:   * Copyright 2012 Google Inc.
michael@0:   *
michael@0:   * Use of this source code is governed by a BSD-style license that can be
michael@0:   * found in the LICENSE file.
michael@0:   */
michael@0:  
michael@0: +#ifndef GrAAConvexPathRenderer_DEFINED
michael@0: +#define GrAAConvexPathRenderer_DEFINED
michael@0: +
michael@0:  #include "GrPathRenderer.h"
michael@0:  
michael@0:  
michael@0:  class GrAAConvexPathRenderer : public GrPathRenderer {
michael@0:  public:
michael@0:      GrAAConvexPathRenderer();
michael@0:  
michael@0:      virtual bool canDrawPath(const SkPath& path,
michael@0: @@ -19,8 +22,10 @@ public:
michael@0:                               bool antiAlias) const SK_OVERRIDE;
michael@0:  
michael@0:  protected:
michael@0:      virtual bool onDrawPath(const SkPath& path,
michael@0:                              const SkStrokeRec& stroke,
michael@0:                              GrDrawTarget* target,
michael@0:                              bool antiAlias) SK_OVERRIDE;
michael@0:  };
michael@0: +
michael@0: +#endif
michael@0: diff --git a/gfx/skia/src/gpu/GrReducedClip.h b/gfx/skia/src/gpu/GrReducedClip.h
michael@0: --- a/gfx/skia/src/gpu/GrReducedClip.h
michael@0: +++ b/gfx/skia/src/gpu/GrReducedClip.h
michael@0: @@ -1,16 +1,19 @@
michael@0:  
michael@0:  /*
michael@0:   * Copyright 2012 Google Inc.
michael@0:   *
michael@0:   * Use of this source code is governed by a BSD-style license that can be
michael@0:   * found in the LICENSE file.
michael@0:   */
michael@0:  
michael@0: +#ifndef GrReducedClip_DEFINED
michael@0: +#define GrReducedClip_DEFINED
michael@0: +
michael@0:  #include "SkClipStack.h"
michael@0:  #include "SkTLList.h"
michael@0:  
michael@0:  namespace GrReducedClip {
michael@0:  
michael@0:  typedef SkTLList<SkClipStack::Element> ElementList;
michael@0:  
michael@0:  enum InitialState {
michael@0: @@ -33,8 +36,10 @@ enum InitialState {
michael@0:  void ReduceClipStack(const SkClipStack& stack,
michael@0:                       const SkIRect& queryBounds,
michael@0:                       ElementList* result,
michael@0:                       InitialState* initialState,
michael@0:                       SkIRect* tighterBounds = NULL,
michael@0:                       bool* requiresAA = NULL);
michael@0:  
michael@0:  } // namespace GrReducedClip
michael@0: +
michael@0: +#endif