| OLD | NEW | 
|---|
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ | 5 #ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ | 
| 6 #define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ | 6 #define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ | 
| 7 | 7 | 
| 8 #import <Cocoa/Cocoa.h> | 8 #import <Cocoa/Cocoa.h> | 
| 9 | 9 | 
| 10 #include "base/time.h" | 10 #include "base/time.h" | 
| 11 #include "chrome/browser/renderer_host/render_widget_host_view.h" | 11 #include "chrome/browser/renderer_host/render_widget_host_view.h" | 
|  | 12 #include "webkit/glue/webcursor.h" | 
| 12 | 13 | 
| 13 class RenderWidgetHostViewMac; | 14 class RenderWidgetHostViewMac; | 
| 14 | 15 | 
| 15 // This is the NSView that lives in the Cocoa view hierarchy. In Windows-land, | 16 // This is the NSView that lives in the Cocoa view hierarchy. In Windows-land, | 
| 16 // RenderWidgetHostViewWin is both the view and the delegate. We split the roles | 17 // RenderWidgetHostViewWin is both the view and the delegate. We split the roles | 
| 17 // but that means that the view needs to own the delegate and will dispose of it | 18 // but that means that the view needs to own the delegate and will dispose of it | 
| 18 // when it's removed from the view system. | 19 // when it's removed from the view system. | 
| 19 | 20 | 
| 20 @interface RenderWidgetHostViewCocoa : NSView { | 21 @interface RenderWidgetHostViewCocoa : NSView { | 
| 21  @private | 22  @private | 
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 85   // Redraws the window asynchronously. | 86   // Redraws the window asynchronously. | 
| 86   void Redraw(const gfx::Rect& invalid_rect); | 87   void Redraw(const gfx::Rect& invalid_rect); | 
| 87 | 88 | 
| 88   // The associated view. | 89   // The associated view. | 
| 89   RenderWidgetHostViewCocoa* cocoa_view_;  // WEAK | 90   RenderWidgetHostViewCocoa* cocoa_view_;  // WEAK | 
| 90 | 91 | 
| 91   // The associated Model. | 92   // The associated Model. | 
| 92   RenderWidgetHost* render_widget_host_; | 93   RenderWidgetHost* render_widget_host_; | 
| 93 | 94 | 
| 94   // The cursor for the page. This is passed up from the renderer. | 95   // The cursor for the page. This is passed up from the renderer. | 
| 95 //  WebCursor current_cursor_; // temporarily commented for link issues | 96   WebCursor current_cursor_; | 
| 96 | 97 | 
| 97   // Indicates if the page is loading. | 98   // Indicates if the page is loading. | 
| 98   bool is_loading_; | 99   bool is_loading_; | 
| 99 | 100 | 
| 100   // true if the View is not visible. | 101   // true if the View is not visible. | 
| 101   bool is_hidden_; | 102   bool is_hidden_; | 
| 102 | 103 | 
| 103   // Tooltips | 104   // Tooltips | 
| 104   // The text to be shown in the tooltip, supplied by the renderer. | 105   // The text to be shown in the tooltip, supplied by the renderer. | 
| 105   std::wstring tooltip_text_; | 106   std::wstring tooltip_text_; | 
| 106 | 107 | 
| 107   // The time at which this view started displaying white pixels as a result of | 108   // The time at which this view started displaying white pixels as a result of | 
| 108   // not having anything to paint (empty backing store from renderer). This | 109   // not having anything to paint (empty backing store from renderer). This | 
| 109   // value returns true for is_null() if we are not recording whiteout times. | 110   // value returns true for is_null() if we are not recording whiteout times. | 
| 110   base::TimeTicks whiteout_start_time_; | 111   base::TimeTicks whiteout_start_time_; | 
| 111 | 112 | 
| 112   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); | 113   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); | 
| 113 }; | 114 }; | 
| 114 | 115 | 
| 115 #endif  // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ | 116 #endif  // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ | 
| 116 | 117 | 
| OLD | NEW | 
|---|