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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_mac.h

Issue 10735010: 3D Compositing in <browser>, first draft. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Major changes to clean up deadlock & other issues Created 8 years, 4 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
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_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 #include <list> 9 #include <list>
10 #include <map> 10 #include <map>
(...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after
460 std::string selected_text_; 460 std::string selected_text_;
461 461
462 // The fullscreen window used for pepper flash. 462 // The fullscreen window used for pepper flash.
463 scoped_nsobject<NSWindow> pepper_fullscreen_window_; 463 scoped_nsobject<NSWindow> pepper_fullscreen_window_;
464 scoped_nsobject<FullscreenWindowManager> fullscreen_window_manager_; 464 scoped_nsobject<FullscreenWindowManager> fullscreen_window_manager_;
465 465
466 // List of pending swaps for deferred acking: 466 // List of pending swaps for deferred acking:
467 // pairs of (route_id, gpu_host_id). 467 // pairs of (route_id, gpu_host_id).
468 std::list<std::pair<int32, int32> > pending_swap_buffers_acks_; 468 std::list<std::pair<int32, int32> > pending_swap_buffers_acks_;
469 469
470 // The current composition character range and its bounds.
471 ui::Range composition_range_;
472 std::vector<gfx::Rect> composition_bounds_;
473
474 // The current caret bounds.
475 gfx::Rect caret_rect_;
476
scshunt 2012/08/12 01:42:45 This should not be here.
477 class CompositingDelegateMac : public CompositingDelegate { 470 class CompositingDelegateMac : public CompositingDelegate {
478 public: 471 public:
479 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE; 472 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE;
480 virtual bool ResizeNeedsNewSurface() OVERRIDE; 473 virtual bool ResizeNeedsNewSurface() OVERRIDE;
481 474
482 virtual void AcceleratedSurfaceBuffersSwapped( 475 virtual void AcceleratedSurfaceBuffersSwapped(
483 const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params, 476 const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params,
484 int gpu_host_id) OVERRIDE; 477 int gpu_host_id) OVERRIDE;
485 virtual void AcceleratedSurfacePostSubBuffer( 478 virtual void AcceleratedSurfacePostSubBuffer(
486 const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params, 479 const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params,
487 int gpu_host_id) OVERRIDE; 480 int gpu_host_id) OVERRIDE;
488 481
489 private: 482 private:
490 friend class RenderWidgetHostViewMac; 483 friend class RenderWidgetHostViewMac;
491 CompositingDelegateMac(RenderWidgetHostViewMac* view) 484 CompositingDelegateMac(RenderWidgetHostViewMac* view)
492 : view_(view) 485 : view_(view)
493 {} 486 {}
494 RenderWidgetHostViewMac* view_; 487 RenderWidgetHostViewMac* view_;
495 }; 488 };
496 489
497 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); 490 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
498 }; 491 };
499 492
500 } // namespace content 493 } // namespace content
501 494
502 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 495 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698