projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 5.34.104.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
skia
/
src
/
core
/
SkComposeShader.cpp
diff --git
a/src/third_party/skia/src/core/SkComposeShader.cpp
b/src/third_party/skia/src/core/SkComposeShader.cpp
index
0d2d687
..
b5ea63c
100644
(file)
--- a/
src/third_party/skia/src/core/SkComposeShader.cpp
+++ b/
src/third_party/skia/src/core/SkComposeShader.cpp
@@
-11,7
+11,8
@@
#include "SkColorFilter.h"
#include "SkColorPriv.h"
#include "SkColorShader.h"
#include "SkColorFilter.h"
#include "SkColorPriv.h"
#include "SkColorShader.h"
-#include "SkFlattenableBuffers.h"
+#include "SkReadBuffer.h"
+#include "SkWriteBuffer.h"
#include "SkXfermode.h"
#include "SkString.h"
#include "SkXfermode.h"
#include "SkString.h"
@@
-25,7
+26,7
@@
SkComposeShader::SkComposeShader(SkShader* sA, SkShader* sB, SkXfermode* mode) {
SkSafeRef(mode);
}
SkSafeRef(mode);
}
-SkComposeShader::SkComposeShader(Sk
Flattenable
ReadBuffer& buffer) :
+SkComposeShader::SkComposeShader(SkReadBuffer& buffer) :
INHERITED(buffer) {
fShaderA = buffer.readShader();
if (NULL == fShaderA) {
INHERITED(buffer) {
fShaderA = buffer.readShader();
if (NULL == fShaderA) {
@@
-61,7
+62,7
@@
private:
};
#define SkAutoAlphaRestore(...) SK_REQUIRE_LOCAL_VAR(SkAutoAlphaRestore)
};
#define SkAutoAlphaRestore(...) SK_REQUIRE_LOCAL_VAR(SkAutoAlphaRestore)
-void SkComposeShader::flatten(Sk
Flattenable
WriteBuffer& buffer) const {
+void SkComposeShader::flatten(SkWriteBuffer& buffer) const {
this->INHERITED::flatten(buffer);
buffer.writeFlattenable(fShaderA);
buffer.writeFlattenable(fShaderB);
this->INHERITED::flatten(buffer);
buffer.writeFlattenable(fShaderA);
buffer.writeFlattenable(fShaderB);