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

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

Issue 171763002: Refactor device scale factor on Mac and fix CoreAnimation bug (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Clean up Created 6 years, 10 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 461 matching lines...) Expand 10 before | Expand all | Expand 10 after
472 RenderWidgetHostViewMac* fullscreen_parent_host_view() const { 472 RenderWidgetHostViewMac* fullscreen_parent_host_view() const {
473 return fullscreen_parent_host_view_; 473 return fullscreen_parent_host_view_;
474 } 474 }
475 475
476 RenderWidgetHostViewFrameSubscriber* frame_subscriber() const { 476 RenderWidgetHostViewFrameSubscriber* frame_subscriber() const {
477 return frame_subscriber_.get(); 477 return frame_subscriber_.get();
478 } 478 }
479 479
480 int window_number() const; 480 int window_number() const;
481 481
482 float scale_factor() const; 482 // The scale factor for the screen that the view is currently on.
483 float ViewScaleFactor() const;
484
485 // Update the scale factor for the backing store and for any CALayers.
486 void UpdateBackingStoreScaleFactor();
487
488 // The scale factor of the backing store and all CALayers. Note that this is
489 // updated based on ViewScaleFactor with some delay.
490 float backing_store_scale_factor_;
483 491
484 void AddPendingLatencyInfo( 492 void AddPendingLatencyInfo(
485 const std::vector<ui::LatencyInfo>& latency_info); 493 const std::vector<ui::LatencyInfo>& latency_info);
486 void SendPendingLatencyInfoToHost(); 494 void SendPendingLatencyInfoToHost();
487 void TickPendingLatencyInfoDelay(); 495 void TickPendingLatencyInfoDelay();
488 496
489 void SendPendingSwapAck(); 497 void SendPendingSwapAck();
490 498
491 private: 499 private:
492 friend class RenderWidgetHostView; 500 friend class RenderWidgetHostView;
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
603 scoped_ptr<RenderWidgetHostViewFrameSubscriber> frame_subscriber_; 611 scoped_ptr<RenderWidgetHostViewFrameSubscriber> frame_subscriber_;
604 612
605 base::WeakPtrFactory<RenderWidgetHostViewMac> 613 base::WeakPtrFactory<RenderWidgetHostViewMac>
606 software_frame_weak_ptr_factory_; 614 software_frame_weak_ptr_factory_;
607 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); 615 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
608 }; 616 };
609 617
610 } // namespace content 618 } // namespace content
611 619
612 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 620 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698