Title: [211699] branches/safari-603-branch/Source/WebKit/win
- Revision
- 211699
- Author
- matthew_han...@apple.com
- Date
- 2017-02-05 21:25:07 -0800 (Sun, 05 Feb 2017)
Log Message
Merge r211584. rdar://problem/29994156
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WebKit/win/ChangeLog (211698 => 211699)
--- branches/safari-603-branch/Source/WebKit/win/ChangeLog 2017-02-06 05:25:04 UTC (rev 211698)
+++ branches/safari-603-branch/Source/WebKit/win/ChangeLog 2017-02-06 05:25:07 UTC (rev 211699)
@@ -1,5 +1,21 @@
2017-02-05 Matthew Hanson <matthew_han...@apple.com>
+ Merge r211584. rdar://problem/29994156
+
+ 2017-02-02 Per Arne Vollan <pvol...@apple.com>
+
+ [Win][HiDPI] Scale factor is applied twice in accelerated compositing mode.
+ https://bugs.webkit.org/show_bug.cgi?id=167732
+
+ Reviewed by Brent Fulgham.
+
+ Backing layer should not be scaled when CACFLayerSetContentsScale is used for scaling.
+
+ * WebView.cpp:
+ (WebView::setAcceleratedCompositing):
+
+2017-02-05 Matthew Hanson <matthew_han...@apple.com>
+
Merge r211207. rdar://problem/30154036
2017-01-26 Per Arne Vollan <pvol...@apple.com>
Modified: branches/safari-603-branch/Source/WebKit/win/WebView.cpp (211698 => 211699)
--- branches/safari-603-branch/Source/WebKit/win/WebView.cpp 2017-02-06 05:25:04 UTC (rev 211698)
+++ branches/safari-603-branch/Source/WebKit/win/WebView.cpp 2017-02-06 05:25:07 UTC (rev 211699)
@@ -7160,10 +7160,12 @@
m_backingLayer->setNeedsDisplay();
m_layerTreeHost->setRootChildLayer(PlatformCALayer::platformCALayer(m_backingLayer->platformLayer()));
+#if !HAVE(CACFLAYER_SETCONTENTSSCALE)
TransformationMatrix m;
m.scale(deviceScaleFactor());
m_backingLayer->setAnchorPoint(FloatPoint3D());
m_backingLayer->setTransform(m);
+#endif
// We aren't going to be using our backing store while we're in accelerated compositing
// mode. But don't delete it immediately, in case we switch out of accelerated
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
