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 13 matching lines...) Expand all Loading... |
24 #include "net/base/network_change_notifier.h" | 24 #include "net/base/network_change_notifier.h" |
25 #include "third_party/WebKit/public/platform/WebConnectionType.h" | 25 #include "third_party/WebKit/public/platform/WebConnectionType.h" |
26 #include "ui/gfx/native_widget_types.h" | 26 #include "ui/gfx/native_widget_types.h" |
27 | 27 |
28 #if defined(OS_MACOSX) | 28 #if defined(OS_MACOSX) |
29 #include "third_party/WebKit/public/web/mac/WebScrollbarTheme.h" | 29 #include "third_party/WebKit/public/web/mac/WebScrollbarTheme.h" |
30 #endif | 30 #endif |
31 | 31 |
32 class GrContext; | 32 class GrContext; |
33 class SkBitmap; | 33 class SkBitmap; |
| 34 struct FrameMsg_NewFrame_WidgetParams; |
34 struct ViewMsg_New_Params; | 35 struct ViewMsg_New_Params; |
35 struct WorkerProcessMsg_CreateWorker_Params; | 36 struct WorkerProcessMsg_CreateWorker_Params; |
36 | 37 |
37 namespace blink { | 38 namespace blink { |
38 class WebGamepads; | 39 class WebGamepads; |
39 class WebGraphicsContext3D; | 40 class WebGraphicsContext3D; |
40 class WebMediaStreamCenter; | 41 class WebMediaStreamCenter; |
41 class WebMediaStreamCenterClient; | 42 class WebMediaStreamCenterClient; |
42 } | 43 } |
43 | 44 |
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
414 const GPUCreateCommandBufferConfig& init_params, | 415 const GPUCreateCommandBufferConfig& init_params, |
415 int32 route_id) OVERRIDE; | 416 int32 route_id) OVERRIDE; |
416 virtual scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer( | 417 virtual scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer( |
417 size_t width, | 418 size_t width, |
418 size_t height, | 419 size_t height, |
419 unsigned internalformat, | 420 unsigned internalformat, |
420 unsigned usage) OVERRIDE; | 421 unsigned usage) OVERRIDE; |
421 | 422 |
422 void Init(); | 423 void Init(); |
423 | 424 |
424 void OnCreateNewFrame(int routing_id, int parent_routing_id); | 425 void OnCreateNewFrame(int routing_id, |
| 426 int parent_routing_id, |
| 427 FrameMsg_NewFrame_WidgetParams params); |
425 void OnCreateNewFrameProxy(int routing_id, | 428 void OnCreateNewFrameProxy(int routing_id, |
426 int parent_routing_id, | 429 int parent_routing_id, |
427 int render_view_routing_id); | 430 int render_view_routing_id); |
428 void OnSetZoomLevelForCurrentURL(const std::string& scheme, | 431 void OnSetZoomLevelForCurrentURL(const std::string& scheme, |
429 const std::string& host, | 432 const std::string& host, |
430 double zoom_level); | 433 double zoom_level); |
431 void OnCreateNewView(const ViewMsg_New_Params& params); | 434 void OnCreateNewView(const ViewMsg_New_Params& params); |
432 void OnTransferBitmap(const SkBitmap& bitmap, int resource_id); | 435 void OnTransferBitmap(const SkBitmap& bitmap, int resource_id); |
433 #if defined(ENABLE_PLUGINS) | 436 #if defined(ENABLE_PLUGINS) |
434 void OnPurgePluginListCache(bool reload_pages); | 437 void OnPurgePluginListCache(bool reload_pages); |
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
579 bool is_one_copy_enabled_; | 582 bool is_one_copy_enabled_; |
580 | 583 |
581 std::map<int, mojo::MessagePipeHandle> pending_render_frame_connects_; | 584 std::map<int, mojo::MessagePipeHandle> pending_render_frame_connects_; |
582 | 585 |
583 DISALLOW_COPY_AND_ASSIGN(RenderThreadImpl); | 586 DISALLOW_COPY_AND_ASSIGN(RenderThreadImpl); |
584 }; | 587 }; |
585 | 588 |
586 } // namespace content | 589 } // namespace content |
587 | 590 |
588 #endif // CONTENT_RENDERER_RENDER_THREAD_IMPL_H_ | 591 #endif // CONTENT_RENDERER_RENDER_THREAD_IMPL_H_ |
OLD | NEW |