Update from chromium https://crrev.com/301315
This updates from chromium commit
060d7dc875cc41f46ab264181d1d622d02c3c8b7 aka commit position 301315. The
following changes from earlier rolls are included:
*) Remove gpu_media.patch, no longer needed thanks to
https://crrev.com/301048
*) Added skia_build.patch to resolve blink dependency added by
https://crrev.com/301105
*) Applied mojo changes for https://crrev.com/301165
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/681713002
diff --git a/gpu/command_buffer/service/texture_definition.h b/gpu/command_buffer/service/texture_definition.h
index cb21abd..ff891fc 100644
--- a/gpu/command_buffer/service/texture_definition.h
+++ b/gpu/command_buffer/service/texture_definition.h
@@ -40,8 +40,8 @@
// the underlying image buffer(s).
class TextureDefinition {
public:
- TextureDefinition(GLenum target,
- Texture* texture,
+ TextureDefinition();
+ TextureDefinition(Texture* texture,
unsigned int version,
const scoped_refptr<NativeImageBuffer>& image);
virtual ~TextureDefinition();
@@ -55,7 +55,7 @@
}
bool Matches(const Texture* texture) const;
- scoped_refptr<NativeImageBuffer> image() { return image_buffer_; }
+ scoped_refptr<NativeImageBuffer> image() const { return image_buffer_; }
private:
struct LevelInfo {
