staticMethod -> StaticMethod
BUG=skia:
R=reed@google.com, mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/166193006
git-svn-id: http://skia.googlecode.com/svn/trunk@13485 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/core/SkPictureFlat.h b/src/core/SkPictureFlat.h
index 7973e65..6b4af13 100644
--- a/src/core/SkPictureFlat.h
+++ b/src/core/SkPictureFlat.h
@@ -265,7 +265,7 @@
buffer.setTypefaceRecorder(controller->getTypefaceSet());
buffer.setNamedFactoryRecorder(controller->getNamedFactorySet());
- Traits::flatten(buffer, obj);
+ Traits::Flatten(buffer, obj);
size_t size = buffer.bytesWritten();
SkASSERT(SkIsAlign4(size));
@@ -294,7 +294,7 @@
facePlayback->setupBuffer(buffer);
}
- Traits::unflatten(buffer, result);
+ Traits::Unflatten(buffer, result);
SkASSERT(fFlatSize == (int32_t)buffer.offset());
}
@@ -516,7 +516,7 @@
// Layout of fScratch: [ SkFlatData header, 20 bytes ] [ data ..., 4-byte aligned ]
fScratch.reset();
fScratch.reserve(sizeof(SkFlatData));
- Traits::flatten(fScratch, element);
+ Traits::Flatten(fScratch, element);
const size_t dataSize = fScratch.bytesWritten() - sizeof(SkFlatData);
// Reinterpret data in fScratch as an SkFlatData.
@@ -562,10 +562,10 @@
};
struct SkPaintTraits {
- static void flatten(SkWriteBuffer& buffer, const SkPaint& paint) {
+ static void Flatten(SkWriteBuffer& buffer, const SkPaint& paint) {
paint.flatten(buffer);
}
- static void unflatten(SkReadBuffer& buffer, SkPaint* paint) {
+ static void Unflatten(SkReadBuffer& buffer, SkPaint* paint) {
paint->unflatten(buffer);
}
};
diff --git a/src/pipe/SkGPipeWrite.cpp b/src/pipe/SkGPipeWrite.cpp
index adc9cc3..17305bf 100644
--- a/src/pipe/SkGPipeWrite.cpp
+++ b/src/pipe/SkGPipeWrite.cpp
@@ -153,7 +153,7 @@
///////////////////////////////////////////////////////////////////////////////
struct SkFlattenableTraits {
- static void flatten(SkWriteBuffer& buffer, const SkFlattenable& flattenable) {
+ static void Flatten(SkWriteBuffer& buffer, const SkFlattenable& flattenable) {
buffer.writeFlattenable(&flattenable);
}
// No need to define unflatten if we never call it.
diff --git a/tests/BitmapHeapTest.cpp b/tests/BitmapHeapTest.cpp
index c6144b7..dc9905e 100644
--- a/tests/BitmapHeapTest.cpp
+++ b/tests/BitmapHeapTest.cpp
@@ -16,7 +16,7 @@
#include "Test.h"
struct SkShaderTraits {
- static void flatten(SkWriteBuffer& buffer, const SkShader& shader) {
+ static void Flatten(SkWriteBuffer& buffer, const SkShader& shader) {
buffer.writeFlattenable(&shader);
}
};
diff --git a/tests/FlatDataTest.cpp b/tests/FlatDataTest.cpp
index 4b56fc0..2de270d 100644
--- a/tests/FlatDataTest.cpp
+++ b/tests/FlatDataTest.cpp
@@ -17,12 +17,12 @@
#include "Test.h"
struct SkFlattenableTraits {
- static void flatten(SkWriteBuffer& buffer, const SkFlattenable& flattenable) {
+ static void Flatten(SkWriteBuffer& buffer, const SkFlattenable& flattenable) {
buffer.writeFlattenable(&flattenable);
}
};
struct SkBitmapTraits {
- static void flatten(SkWriteBuffer& buffer, const SkBitmap& bitmap) {
+ static void Flatten(SkWriteBuffer& buffer, const SkBitmap& bitmap) {
bitmap.flatten(buffer);
}
};