Fix build

Mistakenly broke sky_viewer.mojo.
This commit is contained in:
Adam Barth
2015-10-09 09:19:21 -07:00
parent ce2719ce05
commit 06eaaf7909
3 changed files with 31 additions and 6 deletions
+23 -3
View File
@@ -4,10 +4,26 @@
#include "services/sky/platform_impl.h"
#include "base/bind.h"
#include "mojo/message_pump/message_pump_mojo.h"
namespace sky {
namespace {
scoped_ptr<base::MessagePump> CreateMessagePumpMojo() {
return make_scoped_ptr(new mojo::common::MessagePumpMojo);
}
} // namespace
PlatformImpl::PlatformImpl()
: main_thread_task_runner_(base::MessageLoop::current()->task_runner()) {
: ui_task_runner_(base::MessageLoop::current()->task_runner()) {
base::Thread::Options options;
options.message_pump_factory = base::Bind(&CreateMessagePumpMojo);
io_thread_.reset(new base::Thread("io_thread"));
io_thread_->StartWithOptions(options);
io_task_runner_ = io_thread_->message_loop()->task_runner();
}
PlatformImpl::~PlatformImpl() {
@@ -17,8 +33,12 @@ blink::WebString PlatformImpl::defaultLocale() {
return blink::WebString::fromUTF8("en-US");
}
base::SingleThreadTaskRunner* PlatformImpl::mainThreadTaskRunner() {
return main_thread_task_runner_.get();
base::SingleThreadTaskRunner* PlatformImpl::GetUITaskRunner() {
return ui_task_runner_.get();
}
base::SingleThreadTaskRunner* PlatformImpl::GetIOTaskRunner() {
return io_task_runner_.get();
}
} // namespace sky
+7 -2
View File
@@ -7,6 +7,7 @@
#include "base/message_loop/message_loop.h"
#include "sky/engine/public/platform/Platform.h"
#include "base/threading/thread.h"
namespace sky {
@@ -17,10 +18,14 @@ class PlatformImpl : public blink::Platform {
// blink::Platform methods:
blink::WebString defaultLocale() override;
base::SingleThreadTaskRunner* mainThreadTaskRunner() override;
base::SingleThreadTaskRunner* GetUITaskRunner() override;
base::SingleThreadTaskRunner* GetIOTaskRunner() override;
private:
scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_;
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
scoped_ptr<base::Thread> io_thread_;
DISALLOW_COPY_AND_ASSIGN(PlatformImpl);
};
@@ -39,7 +39,7 @@ void CanvasImageDecoder::initWithConsumer(mojo::ScopedDataPipeConsumerHandle han
}
void CanvasImageDecoder::initWithList(const Uint8List& list) {
RefPtr<SharedBuffer> buffer = SharedBuffer::create(list.num_elements());
RefPtr<SharedBuffer> buffer = SharedBuffer::create();
buffer->append(reinterpret_cast<const char*>(list.data()),
list.num_elements());
base::MessageLoop::current()->PostTask(