New drop of Skia. This is up to CL 121320.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6925 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 21 insertions, 4 deletions

diff --git a/skia/include/SkBlurDrawLooper.h b/skia/include/SkBlurDrawLooper.h
index b1c3d20..028b2eb 100644
--- a/skia/include/SkBlurDrawLooper.h
+++ b/skia/include/SkBlurDrawLooper.h
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2008 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 SkBlurDrawLooper_DEFINED
 #define SkBlurDrawLooper_DEFINED
 
@@ -9,7 +25,7 @@ class SkMaskFilter;
 /** \class SkBlurDrawLooper
     This class draws a shadow of the object (possibly offset), and then draws
     the original object in its original position.
-    <reed> should there be an option to just draw the shadow/blur layer? webkit?
+    should there be an option to just draw the shadow/blur layer? webkit?
 */
 class SkBlurDrawLooper : public SkDrawLooper {
 public:
@@ -21,6 +37,10 @@ public:
     virtual bool next();
     virtual void restore();
 
+    static SkFlattenable* CreateProc(SkFlattenableReadBuffer& buffer) {
+        return SkNEW_ARGS(SkBlurDrawLooper, (buffer));
+    }
+
 protected:
     SkBlurDrawLooper(SkFlattenableReadBuffer&);
     // overrides from SkFlattenable
@@ -28,9 +48,6 @@ protected:
     virtual Factory getFactory() { return CreateProc; }
 
 private:
-    static SkFlattenable* CreateProc(SkFlattenableReadBuffer& buffer) {
-        return SkNEW_ARGS(SkBlurDrawLooper, (buffer)); }
-
     SkCanvas*       fCanvas;
     SkPaint*        fPaint;
     SkMaskFilter*   fBlur;