OLD | NEW |
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 16 matching lines...) Expand all Loading... |
27 #include "net/base/network_change_notifier.h" | 27 #include "net/base/network_change_notifier.h" |
28 #include "third_party/WebKit/public/platform/WebConnectionType.h" | 28 #include "third_party/WebKit/public/platform/WebConnectionType.h" |
29 #include "ui/gfx/native_widget_types.h" | 29 #include "ui/gfx/native_widget_types.h" |
30 | 30 |
31 #if defined(OS_MACOSX) | 31 #if defined(OS_MACOSX) |
32 #include "third_party/WebKit/public/web/mac/WebScrollbarTheme.h" | 32 #include "third_party/WebKit/public/web/mac/WebScrollbarTheme.h" |
33 #endif | 33 #endif |
34 | 34 |
35 class GrContext; | 35 class GrContext; |
36 class SkBitmap; | 36 class SkBitmap; |
| 37 struct FrameMsg_NewFrame_WidgetParams; |
37 struct ViewMsg_New_Params; | 38 struct ViewMsg_New_Params; |
38 struct WorkerProcessMsg_CreateWorker_Params; | 39 struct WorkerProcessMsg_CreateWorker_Params; |
39 | 40 |
40 namespace blink { | 41 namespace blink { |
41 class WebGamepads; | 42 class WebGamepads; |
42 class WebGraphicsContext3D; | 43 class WebGraphicsContext3D; |
43 class WebMediaStreamCenter; | 44 class WebMediaStreamCenter; |
44 class WebMediaStreamCenterClient; | 45 class WebMediaStreamCenterClient; |
45 } | 46 } |
46 | 47 |
(...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
421 scoped_ptr<base::SharedMemory> AllocateSharedMemory(size_t size) override; | 422 scoped_ptr<base::SharedMemory> AllocateSharedMemory(size_t size) override; |
422 CreateCommandBufferResult CreateViewCommandBuffer( | 423 CreateCommandBufferResult CreateViewCommandBuffer( |
423 int32 surface_id, | 424 int32 surface_id, |
424 const GPUCreateCommandBufferConfig& init_params, | 425 const GPUCreateCommandBufferConfig& init_params, |
425 int32 route_id) override; | 426 int32 route_id) override; |
426 | 427 |
427 void Init(); | 428 void Init(); |
428 | 429 |
429 void OnCreateNewFrame(int routing_id, | 430 void OnCreateNewFrame(int routing_id, |
430 int parent_routing_id, | 431 int parent_routing_id, |
431 int proxy_routing_id); | 432 int proxy_routing_id, |
| 433 FrameMsg_NewFrame_WidgetParams params); |
432 void OnCreateNewFrameProxy(int routing_id, | 434 void OnCreateNewFrameProxy(int routing_id, |
433 int parent_routing_id, | 435 int parent_routing_id, |
434 int render_view_routing_id, | 436 int render_view_routing_id, |
435 const FrameReplicationState& replicated_state); | 437 const FrameReplicationState& replicated_state); |
436 void OnSetZoomLevelForCurrentURL(const std::string& scheme, | 438 void OnSetZoomLevelForCurrentURL(const std::string& scheme, |
437 const std::string& host, | 439 const std::string& host, |
438 double zoom_level); | 440 double zoom_level); |
439 void OnCreateNewView(const ViewMsg_New_Params& params); | 441 void OnCreateNewView(const ViewMsg_New_Params& params); |
440 void OnTransferBitmap(const SkBitmap& bitmap, int resource_id); | 442 void OnTransferBitmap(const SkBitmap& bitmap, int resource_id); |
441 #if defined(ENABLE_PLUGINS) | 443 #if defined(ENABLE_PLUGINS) |
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
595 unsigned use_image_texture_target_; | 597 unsigned use_image_texture_target_; |
596 | 598 |
597 std::map<int, mojo::MessagePipeHandle> pending_render_frame_connects_; | 599 std::map<int, mojo::MessagePipeHandle> pending_render_frame_connects_; |
598 | 600 |
599 DISALLOW_COPY_AND_ASSIGN(RenderThreadImpl); | 601 DISALLOW_COPY_AND_ASSIGN(RenderThreadImpl); |
600 }; | 602 }; |
601 | 603 |
602 } // namespace content | 604 } // namespace content |
603 | 605 |
604 #endif // CONTENT_RENDERER_RENDER_THREAD_IMPL_H_ | 606 #endif // CONTENT_RENDERER_RENDER_THREAD_IMPL_H_ |
OLD | NEW |