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 372 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
416 const GPUCreateCommandBufferConfig& init_params, | 417 const GPUCreateCommandBufferConfig& init_params, |
417 int32 route_id) OVERRIDE; | 418 int32 route_id) OVERRIDE; |
418 virtual scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer( | 419 virtual scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer( |
419 size_t width, | 420 size_t width, |
420 size_t height, | 421 size_t height, |
421 unsigned internalformat, | 422 unsigned internalformat, |
422 unsigned usage) OVERRIDE; | 423 unsigned usage) OVERRIDE; |
423 | 424 |
424 void Init(); | 425 void Init(); |
425 | 426 |
426 void OnCreateNewFrame(int routing_id, int parent_routing_id); | 427 void OnCreateNewFrame(int routing_id, |
| 428 int parent_routing_id, |
| 429 FrameMsg_NewFrame_WidgetParams params); |
427 void OnCreateNewFrameProxy(int routing_id, | 430 void OnCreateNewFrameProxy(int routing_id, |
428 int parent_routing_id, | 431 int parent_routing_id, |
429 int render_view_routing_id); | 432 int render_view_routing_id); |
430 void OnSetZoomLevelForCurrentURL(const std::string& scheme, | 433 void OnSetZoomLevelForCurrentURL(const std::string& scheme, |
431 const std::string& host, | 434 const std::string& host, |
432 double zoom_level); | 435 double zoom_level); |
433 void OnCreateNewView(const ViewMsg_New_Params& params); | 436 void OnCreateNewView(const ViewMsg_New_Params& params); |
434 void OnTransferBitmap(const SkBitmap& bitmap, int resource_id); | 437 void OnTransferBitmap(const SkBitmap& bitmap, int resource_id); |
435 #if defined(ENABLE_PLUGINS) | 438 #if defined(ENABLE_PLUGINS) |
436 void OnPurgePluginListCache(bool reload_pages); | 439 void OnPurgePluginListCache(bool reload_pages); |
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
586 bool is_one_copy_enabled_; | 589 bool is_one_copy_enabled_; |
587 | 590 |
588 std::map<int, mojo::MessagePipeHandle> pending_render_frame_connects_; | 591 std::map<int, mojo::MessagePipeHandle> pending_render_frame_connects_; |
589 | 592 |
590 DISALLOW_COPY_AND_ASSIGN(RenderThreadImpl); | 593 DISALLOW_COPY_AND_ASSIGN(RenderThreadImpl); |
591 }; | 594 }; |
592 | 595 |
593 } // namespace content | 596 } // namespace content |
594 | 597 |
595 #endif // CONTENT_RENDERER_RENDER_THREAD_IMPL_H_ | 598 #endif // CONTENT_RENDERER_RENDER_THREAD_IMPL_H_ |
OLD | NEW |