Title: [195333] branches/safari-601.3.9.1-branch/Source/WebCore
- Revision
- 195333
- Author
- [email protected]
- Date
- 2016-01-19 17:14:59 -0800 (Tue, 19 Jan 2016)
Log Message
Merged r192700. rdar://problem/19861992
Modified Paths
Diff
Modified: branches/safari-601.3.9.1-branch/Source/WebCore/ChangeLog (195332 => 195333)
--- branches/safari-601.3.9.1-branch/Source/WebCore/ChangeLog 2016-01-20 01:11:09 UTC (rev 195332)
+++ branches/safari-601.3.9.1-branch/Source/WebCore/ChangeLog 2016-01-20 01:14:59 UTC (rev 195333)
@@ -1,5 +1,22 @@
2016-01-19 Babak Shafiei <[email protected]>
+ Merge r192700.
+
+ 2015-11-20 Brent Fulgham <[email protected]>
+
+ [Win] Support High DPI drawing with CACFLayers
+ https://bugs.webkit.org/show_bug.cgi?id=147242
+ <rdar://problem/19861992>
+
+ Reviewed by Simon Fraser.
+
+ * platform/graphics/ca/win/WKCACFViewLayerTreeHost.cpp:
+ (WebCore::WKCACFViewLayerTreeHost::initializeContext): Set correct content scale factor
+ for current screen, and apply an appropriate base transform to the CACFLayer so drawing
+ operations are done properly.
+
+2016-01-19 Babak Shafiei <[email protected]>
+
Merge r194235.
2015-12-17 Brent Fulgham <[email protected]>
Modified: branches/safari-601.3.9.1-branch/Source/WebCore/platform/graphics/ca/win/WKCACFViewLayerTreeHost.cpp (195332 => 195333)
--- branches/safari-601.3.9.1-branch/Source/WebCore/platform/graphics/ca/win/WKCACFViewLayerTreeHost.cpp 2016-01-20 01:11:09 UTC (rev 195332)
+++ branches/safari-601.3.9.1-branch/Source/WebCore/platform/graphics/ca/win/WKCACFViewLayerTreeHost.cpp 2016-01-20 01:14:59 UTC (rev 195333)
@@ -26,8 +26,10 @@
#include "config.h"
#include "WKCACFViewLayerTreeHost.h"
+#include "GDIUtilities.h"
#include "PlatformCALayer.h"
#include "SoftLinking.h"
+#include <QuartzCore/CACFLayer.h>
#include <wtf/CurrentTime.h>
#include <wtf/MainThread.h>
@@ -120,6 +122,12 @@
void WKCACFViewLayerTreeHost::initializeContext(void* userData, PlatformCALayer* layer)
{
+#if HAVE(CACFLAYER_SETCONTENTSSCALE)
+ float scaleFactor = deviceScaleFactorForWindow(nullptr);
+ CACFLayerSetTransform(layer->platformLayer(), CATransform3DMakeScale(scaleFactor, scaleFactor, 1));
+ CACFLayerSetContentsScale(layer->platformLayer(), scaleFactor);
+#endif
+
WKCACFViewSetContextUserData(m_view.get(), userData);
WKCACFViewSetLayer(m_view.get(), layer->platformLayer());
WKCACFViewSetContextDidChangeCallback(m_view.get(), contextDidChangeCallback, this);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
