Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/callback.h" | 6 #include "base/callback.h" |
| 7 #include "base/containers/hash_tables.h" | 7 #include "base/containers/hash_tables.h" |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "components/view_manager/public/cpp/types.h" | 9 #include "components/view_manager/public/cpp/types.h" |
| 10 #include "components/view_manager/public/cpp/view.h" | 10 #include "components/view_manager/public/cpp/view.h" |
| (...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 365 | 365 |
| 366 void OnViewInputEvent(mojo::View* view, | 366 void OnViewInputEvent(mojo::View* view, |
| 367 const mojo::EventPtr& event) override { | 367 const mojo::EventPtr& event) override { |
| 368 DCHECK(embedder_for_roots_.find(view) != embedder_for_roots_.end()); | 368 DCHECK(embedder_for_roots_.find(view) != embedder_for_roots_.end()); |
| 369 if (event->key_data && | 369 if (event->key_data && |
| 370 (event->action != mojo::EVENT_TYPE_KEY_PRESSED || | 370 (event->action != mojo::EVENT_TYPE_KEY_PRESSED || |
| 371 event->key_data->is_char)) { | 371 event->key_data->is_char)) { |
| 372 return; | 372 return; |
| 373 } | 373 } |
| 374 | 374 |
| 375 // TODO(rjkroege): Make panning and scrolling more performant and | |
| 376 // responsive to gesture events. | |
| 375 if ((event->key_data && | 377 if ((event->key_data && |
| 376 event->key_data->windows_key_code == mojo::KEYBOARD_CODE_DOWN) || | 378 event->key_data->windows_key_code == mojo::KEYBOARD_CODE_DOWN) || |
| 377 (event->pointer_data && event->pointer_data->vertical_wheel < 0)) { | 379 (event->pointer_data && |
| 380 event->pointer_data->kind == mojo::POINTER_KIND_WHEEL && | |
|
sadrul
2015/09/09 04:19:04
It should be possible to look at event->action, in
rjkroege
2015/09/12 01:29:02
Done.
| |
| 381 event->pointer_data->wheel_data->delta_y < 0)) { | |
| 378 if (current_page_ < (page_count_ - 1)) { | 382 if (current_page_ < (page_count_ - 1)) { |
| 379 current_page_++; | 383 current_page_++; |
| 380 DrawBitmap(embedder_for_roots_[view]); | 384 DrawBitmap(embedder_for_roots_[view]); |
| 381 } | 385 } |
| 382 } else if ((event->key_data && | 386 } else if ((event->key_data && |
| 383 event->key_data->windows_key_code == mojo::KEYBOARD_CODE_UP) || | 387 event->key_data->windows_key_code == mojo::KEYBOARD_CODE_UP) || |
| 384 (event->pointer_data && | 388 (event->pointer_data && |
| 385 event->pointer_data->vertical_wheel > 0)) { | 389 event->pointer_data->kind == mojo::POINTER_KIND_WHEEL && |
| 390 event->pointer_data->wheel_data->delta_y > 0)) { | |
| 386 if (current_page_ > 0) { | 391 if (current_page_ > 0) { |
| 387 current_page_--; | 392 current_page_--; |
| 388 DrawBitmap(embedder_for_roots_[view]); | 393 DrawBitmap(embedder_for_roots_[view]); |
| 389 } | 394 } |
| 390 } | 395 } |
| 391 } | 396 } |
| 392 | 397 |
| 393 void OnViewDestroyed(mojo::View* view) override { | 398 void OnViewDestroyed(mojo::View* view) override { |
| 394 DCHECK(embedder_for_roots_.find(view) != embedder_for_roots_.end()); | 399 DCHECK(embedder_for_roots_.find(view) != embedder_for_roots_.end()); |
| 395 const auto& it = embedder_for_roots_.find(view); | 400 const auto& it = embedder_for_roots_.find(view); |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 505 DISALLOW_COPY_AND_ASSIGN(PDFViewer); | 510 DISALLOW_COPY_AND_ASSIGN(PDFViewer); |
| 506 }; | 511 }; |
| 507 | 512 |
| 508 } // namespace | 513 } // namespace |
| 509 } // namespace pdf_viewer | 514 } // namespace pdf_viewer |
| 510 | 515 |
| 511 MojoResult MojoMain(MojoHandle application_request) { | 516 MojoResult MojoMain(MojoHandle application_request) { |
| 512 mojo::ApplicationRunner runner(new pdf_viewer::PDFViewer()); | 517 mojo::ApplicationRunner runner(new pdf_viewer::PDFViewer()); |
| 513 return runner.Run(application_request); | 518 return runner.Run(application_request); |
| 514 } | 519 } |
| OLD | NEW |