| Index: examples/ui/pdf_viewer/pdf_viewer.cc
|
| diff --git a/examples/ui/pdf_viewer/pdf_viewer.cc b/examples/ui/pdf_viewer/pdf_viewer.cc
|
| index aad4d5343ceb5b4875edf2b175dc93ace51a74ea..233ebe56bf69c50258c82a00394f7419ea4ed06b 100644
|
| --- a/examples/ui/pdf_viewer/pdf_viewer.cc
|
| +++ b/examples/ui/pdf_viewer/pdf_viewer.cc
|
| @@ -169,27 +169,34 @@ class PDFDocumentView : public mojo::ui::GaneshView,
|
| if (!properties())
|
| return;
|
|
|
| - const mojo::Size& size = *properties()->view_layout->size;
|
| - mojo::RectF bounds;
|
| - bounds.width = size.width;
|
| - bounds.height = size.height;
|
| -
|
| auto update = mojo::gfx::composition::SceneUpdate::New();
|
| - mojo::gfx::composition::ResourcePtr content_resource =
|
| - ganesh_renderer()->DrawCanvas(size,
|
| - base::Bind(&PDFDocumentView::DrawContent,
|
| - base::Unretained(this), size));
|
| - DCHECK(content_resource);
|
| - update->resources.insert(kContentImageResourceId, content_resource.Pass());
|
| -
|
| - auto root_node = mojo::gfx::composition::Node::New();
|
| - root_node->hit_test_behavior =
|
| - mojo::gfx::composition::HitTestBehavior::New();
|
| - root_node->op = mojo::gfx::composition::NodeOp::New();
|
| - root_node->op->set_image(mojo::gfx::composition::ImageNodeOp::New());
|
| - root_node->op->get_image()->content_rect = bounds.Clone();
|
| - root_node->op->get_image()->image_resource_id = kContentImageResourceId;
|
| - update->nodes.insert(kRootNodeId, root_node.Pass());
|
| +
|
| + const mojo::Size& size = *properties()->view_layout->size;
|
| + if (size.width > 0 && size.height > 0) {
|
| + mojo::RectF bounds;
|
| + bounds.width = size.width;
|
| + bounds.height = size.height;
|
| +
|
| + mojo::gfx::composition::ResourcePtr content_resource =
|
| + ganesh_renderer()->DrawCanvas(
|
| + size, base::Bind(&PDFDocumentView::DrawContent,
|
| + base::Unretained(this), size));
|
| + DCHECK(content_resource);
|
| + update->resources.insert(kContentImageResourceId,
|
| + content_resource.Pass());
|
| +
|
| + auto root_node = mojo::gfx::composition::Node::New();
|
| + root_node->hit_test_behavior =
|
| + mojo::gfx::composition::HitTestBehavior::New();
|
| + root_node->op = mojo::gfx::composition::NodeOp::New();
|
| + root_node->op->set_image(mojo::gfx::composition::ImageNodeOp::New());
|
| + root_node->op->get_image()->content_rect = bounds.Clone();
|
| + root_node->op->get_image()->image_resource_id = kContentImageResourceId;
|
| + update->nodes.insert(kRootNodeId, root_node.Pass());
|
| + } else {
|
| + auto root_node = mojo::gfx::composition::Node::New();
|
| + update->nodes.insert(kRootNodeId, root_node.Pass());
|
| + }
|
|
|
| scene()->Update(update.Pass());
|
|
|
|
|