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

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

Issue 15682010: Support plumbing LatencyInfo through the old software path. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 | Annotate | Revision Log
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 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 virtual void SetIsLoading(bool is_loading) OVERRIDE; 245 virtual void SetIsLoading(bool is_loading) OVERRIDE;
246 virtual void TextInputStateChanged( 246 virtual void TextInputStateChanged(
247 const ViewHostMsg_TextInputState_Params& params) OVERRIDE; 247 const ViewHostMsg_TextInputState_Params& params) OVERRIDE;
248 virtual void ImeCancelComposition() OVERRIDE; 248 virtual void ImeCancelComposition() OVERRIDE;
249 virtual void ImeCompositionRangeChanged( 249 virtual void ImeCompositionRangeChanged(
250 const ui::Range& range, 250 const ui::Range& range,
251 const std::vector<gfx::Rect>& character_bounds) OVERRIDE; 251 const std::vector<gfx::Rect>& character_bounds) OVERRIDE;
252 virtual void DidUpdateBackingStore( 252 virtual void DidUpdateBackingStore(
253 const gfx::Rect& scroll_rect, 253 const gfx::Rect& scroll_rect,
254 const gfx::Vector2d& scroll_delta, 254 const gfx::Vector2d& scroll_delta,
255 const std::vector<gfx::Rect>& copy_rects) OVERRIDE; 255 const std::vector<gfx::Rect>& copy_rects,
256 const ui::LatencyInfo& latency_info) OVERRIDE;
256 virtual void RenderViewGone(base::TerminationStatus status, 257 virtual void RenderViewGone(base::TerminationStatus status,
257 int error_code) OVERRIDE; 258 int error_code) OVERRIDE;
258 virtual void Destroy() OVERRIDE; 259 virtual void Destroy() OVERRIDE;
259 virtual void SetTooltipText(const string16& tooltip_text) OVERRIDE; 260 virtual void SetTooltipText(const string16& tooltip_text) OVERRIDE;
260 virtual void SelectionChanged(const string16& text, 261 virtual void SelectionChanged(const string16& text,
261 size_t offset, 262 size_t offset,
262 const ui::Range& range) OVERRIDE; 263 const ui::Range& range) OVERRIDE;
263 virtual void SelectionBoundsChanged( 264 virtual void SelectionBoundsChanged(
264 const ViewHostMsg_SelectionBounds_Params& params) OVERRIDE; 265 const ViewHostMsg_SelectionBounds_Params& params) OVERRIDE;
265 virtual void ScrollOffsetChanged() OVERRIDE; 266 virtual void ScrollOffsetChanged() OVERRIDE;
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 392
392 // Current text input type. 393 // Current text input type.
393 ui::TextInputType text_input_type_; 394 ui::TextInputType text_input_type_;
394 bool can_compose_inline_; 395 bool can_compose_inline_;
395 396
396 scoped_ptr<CompositingIOSurfaceMac> compositing_iosurface_; 397 scoped_ptr<CompositingIOSurfaceMac> compositing_iosurface_;
397 398
398 // Whether to allow overlapping views. 399 // Whether to allow overlapping views.
399 bool allow_overlapping_views_; 400 bool allow_overlapping_views_;
400 401
402 ui::LatencyInfo software_latency_info_;
403
401 NSWindow* pepper_fullscreen_window() const { 404 NSWindow* pepper_fullscreen_window() const {
402 return pepper_fullscreen_window_; 405 return pepper_fullscreen_window_;
403 } 406 }
404 407
405 CONTENT_EXPORT void release_pepper_fullscreen_window_for_testing(); 408 CONTENT_EXPORT void release_pepper_fullscreen_window_for_testing();
406 409
407 RenderWidgetHostViewMac* fullscreen_parent_host_view() const { 410 RenderWidgetHostViewMac* fullscreen_parent_host_view() const {
408 return fullscreen_parent_host_view_; 411 return fullscreen_parent_host_view_;
409 } 412 }
410 413
411 RenderWidgetHostViewFrameSubscriber* frame_subscriber() const { 414 RenderWidgetHostViewFrameSubscriber* frame_subscriber() const {
412 return frame_subscriber_.get(); 415 return frame_subscriber_.get();
413 } 416 }
414 417
415 int window_number() const; 418 int window_number() const;
416 419
420 void FrameSwapped();
421
417 private: 422 private:
418 friend class RenderWidgetHostView; 423 friend class RenderWidgetHostView;
419 friend class RenderWidgetHostViewMacTest; 424 friend class RenderWidgetHostViewMacTest;
420 425
421 // The view will associate itself with the given widget. The native view must 426 // The view will associate itself with the given widget. The native view must
422 // be hooked up immediately to the view hierarchy, or else when it is 427 // be hooked up immediately to the view hierarchy, or else when it is
423 // deleted it will delete this out from under the caller. 428 // deleted it will delete this out from under the caller.
424 explicit RenderWidgetHostViewMac(RenderWidgetHost* widget); 429 explicit RenderWidgetHostViewMac(RenderWidgetHost* widget);
425 430
426 // Returns whether this render view is a popup (autocomplete window). 431 // Returns whether this render view is a popup (autocomplete window).
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
494 499
495 // Subscriber that listens to frame presentation events. 500 // Subscriber that listens to frame presentation events.
496 scoped_ptr<RenderWidgetHostViewFrameSubscriber> frame_subscriber_; 501 scoped_ptr<RenderWidgetHostViewFrameSubscriber> frame_subscriber_;
497 502
498 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); 503 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
499 }; 504 };
500 505
501 } // namespace content 506 } // namespace content
502 507
503 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 508 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698