Title: [168810] branches/safari-538.34-branch/Source
Diff
Modified: branches/safari-538.34-branch/Source/WebCore/ChangeLog (168809 => 168810)
--- branches/safari-538.34-branch/Source/WebCore/ChangeLog 2014-05-14 08:04:56 UTC (rev 168809)
+++ branches/safari-538.34-branch/Source/WebCore/ChangeLog 2014-05-14 08:08:18 UTC (rev 168810)
@@ -1,5 +1,21 @@
2014-05-14 Lucas Forschler <[email protected]>
+ Merge r168661
+
+ 2014-05-12 Simon Fraser <[email protected]>
+
+ [iOS WK2] Fuzzy tiles on some sites on loading
+ https://bugs.webkit.org/show_bug.cgi?id=132847
+ <rdar://problem/16816178>
+
+ Reviewed by Benjamin Poulain.
+
+ Export WebCore::TileController::contentsScale() const
+
+ * WebCore.exp.in:
+
+2014-05-14 Lucas Forschler <[email protected]>
+
Merge r168655
2014-05-12 Beth Dakin <[email protected]>
Modified: branches/safari-538.34-branch/Source/WebCore/WebCore.exp.in (168809 => 168810)
--- branches/safari-538.34-branch/Source/WebCore/WebCore.exp.in 2014-05-14 08:04:56 UTC (rev 168809)
+++ branches/safari-538.34-branch/Source/WebCore/WebCore.exp.in 2014-05-14 08:08:18 UTC (rev 168810)
@@ -1648,6 +1648,7 @@
__ZNK7WebCore14SecurityOrigin20isSameSchemeHostPortEPKS0_
__ZNK7WebCore14SecurityOrigin5equalEPKS0_
__ZNK7WebCore14SecurityOrigin8toStringEv
+__ZNK7WebCore14TileController13contentsScaleEv
__ZNK7WebCore15AffineTransform10isIdentityEv
__ZNK7WebCore15AffineTransform12isInvertibleEv
__ZNK7WebCore15AffineTransform6xScaleEv
Modified: branches/safari-538.34-branch/Source/WebKit2/ChangeLog (168809 => 168810)
--- branches/safari-538.34-branch/Source/WebKit2/ChangeLog 2014-05-14 08:04:56 UTC (rev 168809)
+++ branches/safari-538.34-branch/Source/WebKit2/ChangeLog 2014-05-14 08:08:18 UTC (rev 168810)
@@ -1,5 +1,25 @@
2014-05-14 Lucas Forschler <[email protected]>
+ Merge r168661
+
+ 2014-05-12 Simon Fraser <[email protected]>
+
+ [iOS WK2] Fuzzy tiles on some sites on loading
+ https://bugs.webkit.org/show_bug.cgi?id=132847
+ <rdar://problem/16816178>
+
+ Reviewed by Benjamin Poulain.
+
+ PlatformCALayerRemoteTiledBacking overrode setContentsScale() but not contentsScale(),
+ causing us to early-return from GraphicsLayerCA::updateContentsScale() and leave the
+ scale wrong. Fix by overriding contentsScale() also.
+
+ * WebProcess/WebPage/mac/PlatformCALayerRemoteTiledBacking.cpp:
+ (WebKit::PlatformCALayerRemoteTiledBacking::contentsScale):
+ * WebProcess/WebPage/mac/PlatformCALayerRemoteTiledBacking.h:
+
+2014-05-14 Lucas Forschler <[email protected]>
+
Merge r168637
2014-05-12 Anders Carlsson <[email protected]>
Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteTiledBacking.cpp (168809 => 168810)
--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteTiledBacking.cpp 2014-05-14 08:04:56 UTC (rev 168809)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteTiledBacking.cpp 2014-05-14 08:08:18 UTC (rev 168810)
@@ -86,6 +86,11 @@
m_tileController->setAcceleratesDrawing(acceleratesDrawing);
}
+float PlatformCALayerRemoteTiledBacking::contentsScale() const
+{
+ return m_tileController->contentsScale();
+}
+
void PlatformCALayerRemoteTiledBacking::setContentsScale(float scale)
{
m_tileController->setContentsScale(scale);
Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteTiledBacking.h (168809 => 168810)
--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteTiledBacking.h 2014-05-14 08:04:56 UTC (rev 168809)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteTiledBacking.h 2014-05-14 08:08:18 UTC (rev 168810)
@@ -45,11 +45,16 @@
virtual const WebCore::PlatformCALayerList* customSublayers() const override;
virtual void setBounds(const WebCore::FloatRect&) override;
+
virtual bool isOpaque() const override;
virtual void setOpaque(bool) override;
+
virtual bool acceleratesDrawing() const override;
virtual void setAcceleratesDrawing(bool) override;
+
+ virtual float contentsScale() const override;
virtual void setContentsScale(float) override;
+
virtual void setBorderWidth(float) override;
virtual void setBorderColor(const WebCore::Color&) override;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
