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