Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2893)

Unified Diff: core/cross/cairo/texture_cairo.cc

Issue 2825074: Initial version rendering 2D path for O3D. This will eventually allow O3D app... (Closed) Base URL: http://src.chromium.org/svn/trunk/src/o3d/
Patch Set: '' Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « core/cross/cairo/texture_cairo.h ('k') | core/cross/class_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: core/cross/cairo/texture_cairo.cc
===================================================================
--- core/cross/cairo/texture_cairo.cc (revision 57528)
+++ core/cross/cairo/texture_cairo.cc (working copy)
@@ -69,7 +69,6 @@
int width,
int height,
bool enable_render_surfaces) {
- DLOG(INFO) << "Texture2DCairo Create";
TextureCairo* texture = new TextureCairo(service_locator,
format,
levels,
@@ -86,6 +85,7 @@
}
TextureCairo::~TextureCairo() {
+ renderer_ = NULL;
DLOG(INFO) << "Texture2DCairo Destruct";
}
@@ -99,11 +99,19 @@
int src_pitch) {
DLOG(INFO) << "Texture2DCairo SetRect";
- renderer_->SetNewFrame(src_data,
- src_width, src_height,
- src_pitch);
+ resource_.data = src_data;
+ resource_.left = dst_left;
+ resource_.top = dst_top;
+ resource_.width = src_width;
+ resource_.height = src_height;
+ resource_.pitch = src_pitch;
}
+TextureResource* TextureCairo::GetResource() {
+ DLOG(INFO) << "Texture2DCairo Get Resource";
+ return &resource_;
+}
+
// Locks the given mipmap level of this texture for loading from main memory,
// and returns a pointer to the buffer.
bool TextureCairo::PlatformSpecificLock(
« no previous file with comments | « core/cross/cairo/texture_cairo.h ('k') | core/cross/class_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698