| Index: cc/picture_layer_impl.cc.rej
|
| diff --git a/cc/picture_layer_impl.cc.rej b/cc/picture_layer_impl.cc.rej
|
| new file mode 100644
|
| index 0000000000000000000000000000000000000000..bfda845c9c694a467d9e282758209dd7694b509e
|
| --- /dev/null
|
| +++ b/cc/picture_layer_impl.cc.rej
|
| @@ -0,0 +1,34 @@
|
| +***************
|
| +*** 4,9 ****
|
| +
|
| + #include "cc/picture_layer_impl.h"
|
| +
|
| + #include "cc/layer_tree_host_impl.h"
|
| + #include "cc/math_util.h"
|
| + #include "cc/quad_sink.h"
|
| +--- 4,10 ----
|
| +
|
| + #include "cc/picture_layer_impl.h"
|
| +
|
| ++ #include "base/time.h"
|
| + #include "cc/layer_tree_host_impl.h"
|
| + #include "cc/math_util.h"
|
| + #include "cc/quad_sink.h"
|
| +***************
|
| +*** 13,19 ****
|
| +
|
| + PictureLayerImpl::PictureLayerImpl(int id) :
|
| + LayerImpl(id),
|
| +- tilings_(this) {
|
| + }
|
| +
|
| + PictureLayerImpl::~PictureLayerImpl() {
|
| +--- 14,21 ----
|
| +
|
| + PictureLayerImpl::PictureLayerImpl(int id) :
|
| + LayerImpl(id),
|
| ++ tilings_(this),
|
| ++ last_update_time_(0) {
|
| + }
|
| +
|
| + PictureLayerImpl::~PictureLayerImpl() {
|
|
|