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 9.38.198.0
[platform/framework/web/crosswalk.git]
/
src
/
cc
/
quads
/
tile_draw_quad.cc
diff --git
a/src/cc/quads/tile_draw_quad.cc
b/src/cc/quads/tile_draw_quad.cc
index
6e28607
..
ea3a14a
100644
(file)
--- a/
src/cc/quads/tile_draw_quad.cc
+++ b/
src/cc/quads/tile_draw_quad.cc
@@
-4,6
+4,7
@@
#include "cc/quads/tile_draw_quad.h"
#include "cc/quads/tile_draw_quad.h"
+#include "base/debug/trace_event_argument.h"
#include "base/logging.h"
#include "base/values.h"
#include "third_party/khronos/GLES2/gl2.h"
#include "base/logging.h"
#include "base/values.h"
#include "third_party/khronos/GLES2/gl2.h"
@@
-17,10
+18,6
@@
TileDrawQuad::TileDrawQuad()
TileDrawQuad::~TileDrawQuad() {
}
TileDrawQuad::~TileDrawQuad() {
}
-scoped_ptr<TileDrawQuad> TileDrawQuad::Create() {
- return make_scoped_ptr(new TileDrawQuad);
-}
-
void TileDrawQuad::SetNew(const SharedQuadState* shared_quad_state,
const gfx::Rect& rect,
const gfx::Rect& opaque_rect,
void TileDrawQuad::SetNew(const SharedQuadState* shared_quad_state,
const gfx::Rect& rect,
const gfx::Rect& opaque_rect,
@@
-65,7
+62,7
@@
const TileDrawQuad* TileDrawQuad::MaterialCast(const DrawQuad* quad) {
return static_cast<const TileDrawQuad*>(quad);
}
return static_cast<const TileDrawQuad*>(quad);
}
-void TileDrawQuad::ExtendValue(base::
Dictionary
Value* value) const {
+void TileDrawQuad::ExtendValue(base::
debug::Traced
Value* value) const {
ContentDrawQuadBase::ExtendValue(value);
value->SetInteger("resource_id", resource_id);
}
ContentDrawQuadBase::ExtendValue(value);
value->SetInteger("resource_id", resource_id);
}