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

Unified Diff: content/browser/renderer_host/compositing_iosurface_layer_mac.mm

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 side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/compositing_iosurface_layer_mac.mm
diff --git a/content/browser/renderer_host/compositing_iosurface_layer_mac.mm b/content/browser/renderer_host/compositing_iosurface_layer_mac.mm
index dfcc5718da9ebc538a2381900ea03610af20acf9..2f2068e036206867b0871d5cadec9b016ecd0121 100644
--- a/content/browser/renderer_host/compositing_iosurface_layer_mac.mm
+++ b/content/browser/renderer_host/compositing_iosurface_layer_mac.mm
@@ -41,32 +41,15 @@
[self setContentsGravity:kCAGravityTopLeft];
[self setFrame:NSRectToCGRect(
[renderWidgetHostView_->cocoa_view() bounds])];
+ if ([self respondsToSelector:(@selector(setContentsScale:))]) {
+ [self setContentsScale:
+ renderWidgetHostView_->backing_store_scale_factor_];
+ }
[self setNeedsDisplay];
- [self updateScaleFactor];
}
return self;
}
-- (void)updateScaleFactor {
- if (!renderWidgetHostView_ ||
- ![self respondsToSelector:(@selector(contentsScale))] ||
- ![self respondsToSelector:(@selector(setContentsScale:))])
- return;
-
- float current_scale_factor = [self contentsScale];
- float new_scale_factor = current_scale_factor;
- if (renderWidgetHostView_->compositing_iosurface_) {
- new_scale_factor =
- renderWidgetHostView_->compositing_iosurface_->scale_factor();
- }
-
- if (new_scale_factor == current_scale_factor)
- return;
-
- ScopedCAActionDisabler disabler;
- [self setContentsScale:new_scale_factor];
-}
-
- (void)disableCompositing{
ScopedCAActionDisabler disabler;
[self removeFromSuperlayer];

Powered by Google App Engine
This is Rietveld 408576698