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

Side by Side Diff: content/renderer/render_thread_impl.h

Issue 1226253005: Convert mojo::ErrorHandler usages into callbacks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add lwchkg@gmail.com to AUTHORS file Created 5 years, 5 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 unified diff | Download patch
« no previous file with comments | « AUTHORS ('k') | content/renderer/render_thread_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef CONTENT_RENDERER_RENDER_THREAD_IMPL_H_ 5 #ifndef CONTENT_RENDERER_RENDER_THREAD_IMPL_H_
6 #define CONTENT_RENDERER_RENDER_THREAD_IMPL_H_ 6 #define CONTENT_RENDERER_RENDER_THREAD_IMPL_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after
604 int gpu_rasterization_msaa_sample_count_; 604 int gpu_rasterization_msaa_sample_count_;
605 bool is_lcd_text_enabled_; 605 bool is_lcd_text_enabled_;
606 bool is_distance_field_text_enabled_; 606 bool is_distance_field_text_enabled_;
607 bool is_zero_copy_enabled_; 607 bool is_zero_copy_enabled_;
608 bool is_one_copy_enabled_; 608 bool is_one_copy_enabled_;
609 bool is_elastic_overscroll_enabled_; 609 bool is_elastic_overscroll_enabled_;
610 unsigned use_image_texture_target_; 610 unsigned use_image_texture_target_;
611 bool is_gather_pixel_refs_enabled_; 611 bool is_gather_pixel_refs_enabled_;
612 612
613 class PendingRenderFrameConnect 613 class PendingRenderFrameConnect
614 : public base::RefCounted<PendingRenderFrameConnect>, 614 : public base::RefCounted<PendingRenderFrameConnect> {
615 public mojo::ErrorHandler {
616 public: 615 public:
617 PendingRenderFrameConnect( 616 PendingRenderFrameConnect(
618 int routing_id, 617 int routing_id,
619 mojo::InterfaceRequest<mojo::ServiceProvider> services, 618 mojo::InterfaceRequest<mojo::ServiceProvider> services,
620 mojo::ServiceProviderPtr exposed_services); 619 mojo::ServiceProviderPtr exposed_services);
621 620
622 mojo::InterfaceRequest<mojo::ServiceProvider>& services() { 621 mojo::InterfaceRequest<mojo::ServiceProvider>& services() {
623 return services_; 622 return services_;
624 } 623 }
625 624
626 mojo::ServiceProviderPtr& exposed_services() { return exposed_services_; } 625 mojo::ServiceProviderPtr& exposed_services() { return exposed_services_; }
627 626
628 private: 627 private:
629 friend class base::RefCounted<PendingRenderFrameConnect>; 628 friend class base::RefCounted<PendingRenderFrameConnect>;
630 629
631 ~PendingRenderFrameConnect() override; 630 ~PendingRenderFrameConnect();
632 631
633 void OnConnectionError() override; 632 // Mojo error handler.
633 void OnConnectionError();
634 634
635 int routing_id_; 635 int routing_id_;
636 mojo::InterfaceRequest<mojo::ServiceProvider> services_; 636 mojo::InterfaceRequest<mojo::ServiceProvider> services_;
637 mojo::ServiceProviderPtr exposed_services_; 637 mojo::ServiceProviderPtr exposed_services_;
638 }; 638 };
639 639
640 typedef std::map<int, scoped_refptr<PendingRenderFrameConnect>> 640 typedef std::map<int, scoped_refptr<PendingRenderFrameConnect>>
641 PendingRenderFrameConnectMap; 641 PendingRenderFrameConnectMap;
642 PendingRenderFrameConnectMap pending_render_frame_connects_; 642 PendingRenderFrameConnectMap pending_render_frame_connects_;
643 643
644 DISALLOW_COPY_AND_ASSIGN(RenderThreadImpl); 644 DISALLOW_COPY_AND_ASSIGN(RenderThreadImpl);
645 }; 645 };
646 646
647 #if defined(COMPILER_MSVC) 647 #if defined(COMPILER_MSVC)
648 #pragma warning(pop) 648 #pragma warning(pop)
649 #endif 649 #endif
650 650
651 } // namespace content 651 } // namespace content
652 652
653 #endif // CONTENT_RENDERER_RENDER_THREAD_IMPL_H_ 653 #endif // CONTENT_RENDERER_RENDER_THREAD_IMPL_H_
OLDNEW
« no previous file with comments | « AUTHORS ('k') | content/renderer/render_thread_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698