Title: [120548] trunk/Source/WebCore
- Revision
- 120548
- Author
- [email protected]
- Date
- 2012-06-17 01:34:38 -0700 (Sun, 17 Jun 2012)
Log Message
Attempt to fix a large number of tests I broke with http://trac.webkit.org/changeset/120547
We need to reset the device scale facter after each test.
* testing/InternalSettings.cpp:
(WebCore::InternalSettings::InternalSettings):
(WebCore::InternalSettings::restoreTo):
* testing/InternalSettings.h:
(InternalSettings):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (120547 => 120548)
--- trunk/Source/WebCore/ChangeLog 2012-06-17 07:01:14 UTC (rev 120547)
+++ trunk/Source/WebCore/ChangeLog 2012-06-17 08:34:38 UTC (rev 120548)
@@ -1,3 +1,15 @@
+2012-06-17 Adam Barth <[email protected]>
+
+ Attempt to fix a large number of tests I broke with http://trac.webkit.org/changeset/120547
+
+ We need to reset the device scale facter after each test.
+
+ * testing/InternalSettings.cpp:
+ (WebCore::InternalSettings::InternalSettings):
+ (WebCore::InternalSettings::restoreTo):
+ * testing/InternalSettings.h:
+ (InternalSettings):
+
2012-06-16 Huang Dongsung <[email protected]>
[Texmap] Share gaussian formula between shaders in TextureMapperShaderManager.
Modified: trunk/Source/WebCore/testing/InternalSettings.cpp (120547 => 120548)
--- trunk/Source/WebCore/testing/InternalSettings.cpp 2012-06-17 07:01:14 UTC (rev 120547)
+++ trunk/Source/WebCore/testing/InternalSettings.cpp 2012-06-17 08:34:38 UTC (rev 120548)
@@ -107,6 +107,7 @@
, m_originalWindowFocusRestricted(settings()->windowFocusRestricted())
, m_originalDeviceSupportsTouch(settings()->deviceSupportsTouch())
, m_originalDeviceSupportsMouse(settings()->deviceSupportsMouse())
+ , m_originalDeviceScaleFactor(page() ? page()->deviceScaleFactor() : 1.0)
{
}
@@ -128,6 +129,9 @@
settings->setWindowFocusRestricted(m_originalWindowFocusRestricted);
settings->setDeviceSupportsTouch(m_originalDeviceSupportsTouch);
settings->setDeviceSupportsMouse(m_originalDeviceSupportsMouse);
+
+ if (page())
+ page()->setDeviceScaleFactor(m_originalDeviceScaleFactor);
}
Settings* InternalSettings::settings() const
Modified: trunk/Source/WebCore/testing/InternalSettings.h (120547 => 120548)
--- trunk/Source/WebCore/testing/InternalSettings.h 2012-06-17 07:01:14 UTC (rev 120547)
+++ trunk/Source/WebCore/testing/InternalSettings.h 2012-06-17 08:34:38 UTC (rev 120548)
@@ -108,6 +108,7 @@
bool m_originalWindowFocusRestricted;
bool m_originalDeviceSupportsTouch;
bool m_originalDeviceSupportsMouse;
+ float m_originalDeviceScaleFactor;
};
} // namespace WebCore
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
