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

Side by Side Diff: sky/viewer/viewer.cc

Issue 797063002: Make reftests work for sky. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: cleanup Created 6 years 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 unified diff | Download patch
« sky/tools/tester/tester.cc ('K') | « sky/viewer/internals.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/files/file_path.h" 5 #include "base/files/file_path.h"
6 #include "base/message_loop/message_loop.h" 6 #include "base/message_loop/message_loop.h"
7 #include "base/threading/thread.h" 7 #include "base/threading/thread.h"
8 #include "mojo/application/application_runner_chromium.h" 8 #include "mojo/application/application_runner_chromium.h"
9 #include "mojo/common/tracing_impl.h" 9 #include "mojo/common/tracing_impl.h"
10 #include "mojo/public/c/system/main.h" 10 #include "mojo/public/c/system/main.h"
11 #include "mojo/public/cpp/application/application_connection.h" 11 #include "mojo/public/cpp/application/application_connection.h"
12 #include "mojo/public/cpp/application/application_delegate.h" 12 #include "mojo/public/cpp/application/application_delegate.h"
13 #include "mojo/public/cpp/application/application_impl.h" 13 #include "mojo/public/cpp/application/application_impl.h"
14 #include "mojo/public/cpp/application/interface_factory_impl.h" 14 #include "mojo/public/cpp/application/interface_factory_impl.h"
15 #include "mojo/services/content_handler/public/interfaces/content_handler.mojom. h" 15 #include "mojo/services/content_handler/public/interfaces/content_handler.mojom. h"
16 #include "sky/engine/public/web/Sky.h" 16 #include "sky/engine/public/web/Sky.h"
17 #include "sky/viewer/content_handler_impl.h" 17 #include "sky/viewer/content_handler_impl.h"
18 #include "sky/viewer/document_view.h" 18 #include "sky/viewer/document_view.h"
19 #include "sky/viewer/platform/platform_impl.h" 19 #include "sky/viewer/platform/platform_impl.h"
20 20
21 #if !defined(COMPONENT_BUILD) 21 #if !defined(COMPONENT_BUILD)
22 #include "base/i18n/icu_util.h" 22 #include "base/i18n/icu_util.h"
23 #endif 23 #endif
24 24
25 namespace sky { 25 namespace sky {
26 26
27 // Load the viewer in testing mode so we can dump pixels.
28 const char kTesting[] = "--testing";
29
27 class Viewer : public mojo::ApplicationDelegate, 30 class Viewer : public mojo::ApplicationDelegate,
28 public mojo::InterfaceFactory<mojo::ContentHandler> { 31 public mojo::InterfaceFactory<mojo::ContentHandler> {
29 public: 32 public:
30 Viewer() {} 33 Viewer() {}
31 34
32 virtual ~Viewer() { blink::shutdown(); } 35 virtual ~Viewer() { blink::shutdown(); }
33 36
34 private: 37 private:
35 // Overridden from ApplicationDelegate: 38 // Overridden from ApplicationDelegate:
36 virtual void Initialize(mojo::ApplicationImpl* app) override { 39 virtual void Initialize(mojo::ApplicationImpl* app) override {
40 is_testing_ = app->HasArg(kTesting);
41
37 platform_impl_.reset(new PlatformImpl(app)); 42 platform_impl_.reset(new PlatformImpl(app));
38 blink::initialize(platform_impl_.get()); 43 blink::initialize(platform_impl_.get());
39 base::i18n::InitializeICU(); 44 base::i18n::InitializeICU();
40 45
41 mojo::TracingImpl::Create(app); 46 mojo::TracingImpl::Create(app);
42 } 47 }
43 48
44 virtual bool ConfigureIncomingConnection( 49 virtual bool ConfigureIncomingConnection(
45 mojo::ApplicationConnection* connection) override { 50 mojo::ApplicationConnection* connection) override {
46 connection->AddService<mojo::ContentHandler>(this); 51 connection->AddService<mojo::ContentHandler>(this);
47 return true; 52 return true;
48 } 53 }
49 54
50 // Overridden from InterfaceFactory<ContentHandler> 55 // Overridden from InterfaceFactory<ContentHandler>
51 virtual void Create(mojo::ApplicationConnection* connection, 56 virtual void Create(mojo::ApplicationConnection* connection,
52 mojo::InterfaceRequest<mojo::ContentHandler> request) over ride { 57 mojo::InterfaceRequest<mojo::ContentHandler> request) over ride {
53 mojo::BindToRequest(new ContentHandlerImpl(), &request); 58 mojo::BindToRequest(new ContentHandlerImpl(is_testing_), &request);
54 } 59 }
55 60
56 scoped_ptr<PlatformImpl> platform_impl_; 61 scoped_ptr<PlatformImpl> platform_impl_;
62 bool is_testing_;
57 63
58 DISALLOW_COPY_AND_ASSIGN(Viewer); 64 DISALLOW_COPY_AND_ASSIGN(Viewer);
59 }; 65 };
60 66
61 } // namespace mojo 67 } // namespace mojo
62 68
63 MojoResult MojoMain(MojoHandle shell_handle) { 69 MojoResult MojoMain(MojoHandle shell_handle) {
64 mojo::ApplicationRunnerChromium runner(new sky::Viewer); 70 mojo::ApplicationRunnerChromium runner(new sky::Viewer);
65 return runner.Run(shell_handle); 71 return runner.Run(shell_handle);
66 } 72 }
OLDNEW
« sky/tools/tester/tester.cc ('K') | « sky/viewer/internals.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698