Diff
Modified: trunk/ChangeLog (119751 => 119752)
--- trunk/ChangeLog 2012-06-07 21:11:36 UTC (rev 119751)
+++ trunk/ChangeLog 2012-06-07 21:21:31 UTC (rev 119752)
@@ -1,3 +1,14 @@
+2012-06-07 Adam Barth <[email protected]>
+
+ Settings::defaultDeviceScaleFactor is redundant with Page::deviceScaleFactor
+ https://bugs.webkit.org/show_bug.cgi?id=88375
+
+ Reviewed by James Robinson.
+
+ This symbol no longer exists.
+
+ * Source/autotools/symbols.filter:
+
2012-06-06 David Kilzer <[email protected]>
Teach git about localizable *.strings files
Modified: trunk/Source/WebCore/ChangeLog (119751 => 119752)
--- trunk/Source/WebCore/ChangeLog 2012-06-07 21:11:36 UTC (rev 119751)
+++ trunk/Source/WebCore/ChangeLog 2012-06-07 21:21:31 UTC (rev 119752)
@@ -1,3 +1,24 @@
+2012-06-07 Adam Barth <[email protected]>
+
+ Settings::defaultDeviceScaleFactor is redundant with Page::deviceScaleFactor
+ https://bugs.webkit.org/show_bug.cgi?id=88375
+
+ Reviewed by James Robinson.
+
+ This patch removes Settings::defaultDeviceScaleFactor because it is
+ redundant with Page::deviceScaleFactor now that we no longer support
+ target-densitydpi. Page::deviceScaleFactor is the canonical place to
+ store the device scale factor.
+
+ * WebCore.exp.in:
+ * page/Settings.cpp:
+ (WebCore::Settings::Settings):
+ (WebCore):
+ * page/Settings.h:
+ (Settings):
+ * testing/InternalSettings.cpp:
+ (WebCore::InternalSettings::setDeviceScaleFactor):
+
2012-06-07 Alec Flett <[email protected]>
IndexedDB: Error codes, phase one
Modified: trunk/Source/WebCore/WebCore.exp.in (119751 => 119752)
--- trunk/Source/WebCore/WebCore.exp.in 2012-06-07 21:11:36 UTC (rev 119751)
+++ trunk/Source/WebCore/WebCore.exp.in 2012-06-07 21:21:31 UTC (rev 119752)
@@ -1033,7 +1033,6 @@
__ZN7WebCore8Settings27setLoadsImagesAutomaticallyEb
__ZN7WebCore8Settings27setLocalStorageDatabasePathERKN3WTF6StringE
__ZN7WebCore8Settings27setSpatialNavigationEnabledEb
-__ZN7WebCore8Settings27setDefaultDeviceScaleFactorEi
__ZN7WebCore8Settings28setForceFTPDirectoryListingsEb
__ZN7WebCore8Settings29setAccelerated2dCanvasEnabledEb
__ZN7WebCore8Settings29setAuthorAndUserStylesEnabledEb
Modified: trunk/Source/WebCore/page/Settings.cpp (119751 => 119752)
--- trunk/Source/WebCore/page/Settings.cpp 2012-06-07 21:11:36 UTC (rev 119751)
+++ trunk/Source/WebCore/page/Settings.cpp 2012-06-07 21:21:31 UTC (rev 119752)
@@ -129,7 +129,6 @@
, m_minimumLogicalFontSize(0)
, m_defaultFontSize(0)
, m_defaultFixedFontSize(0)
- , m_defaultDeviceScaleFactor(1)
, m_validationMessageTimerMagnification(50)
, m_minimumAccelerated2dCanvasSize(257 * 256)
, m_layoutFallbackWidth(980)
@@ -404,11 +403,6 @@
m_page->setNeedsRecalcStyleInAllFrames();
}
-void Settings::setDefaultDeviceScaleFactor(int defaultDeviceScaleFactor)
-{
- m_defaultDeviceScaleFactor = defaultDeviceScaleFactor;
-}
-
void Settings::setFontBoostingEnabled(bool fontBoostingEnabled)
{
if (m_fontBoostingEnabled == fontBoostingEnabled)
Modified: trunk/Source/WebCore/page/Settings.h (119751 => 119752)
--- trunk/Source/WebCore/page/Settings.h 2012-06-07 21:11:36 UTC (rev 119751)
+++ trunk/Source/WebCore/page/Settings.h 2012-06-07 21:21:31 UTC (rev 119752)
@@ -103,9 +103,6 @@
void setDefaultFixedFontSize(int);
int defaultFixedFontSize() const { return m_defaultFixedFontSize; }
- void setDefaultDeviceScaleFactor(int);
- int defaultDeviceScaleFactor() const { return m_defaultDeviceScaleFactor; }
-
void setFontBoostingEnabled(bool);
bool fontBoostingEnabled() const { return m_fontBoostingEnabled; }
@@ -626,7 +623,6 @@
int m_minimumLogicalFontSize;
int m_defaultFontSize;
int m_defaultFixedFontSize;
- int m_defaultDeviceScaleFactor;
int m_validationMessageTimerMagnification;
int m_minimumAccelerated2dCanvasSize;
int m_layoutFallbackWidth;
Modified: trunk/Source/WebCore/testing/InternalSettings.cpp (119751 => 119752)
--- trunk/Source/WebCore/testing/InternalSettings.cpp 2012-06-07 21:11:36 UTC (rev 119751)
+++ trunk/Source/WebCore/testing/InternalSettings.cpp 2012-06-07 21:21:31 UTC (rev 119752)
@@ -278,8 +278,6 @@
void InternalSettings::setDeviceScaleFactor(float scaleFactor, ExceptionCode& ec)
{
- InternalSettingsGuardForSettings();
- settings()->setDefaultDeviceScaleFactor(scaleFactor);
InternalSettingsGuardForPage();
page()->setDeviceScaleFactor(scaleFactor);
}
Modified: trunk/Source/WebKit/chromium/ChangeLog (119751 => 119752)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-06-07 21:11:36 UTC (rev 119751)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-06-07 21:21:31 UTC (rev 119752)
@@ -1,3 +1,24 @@
+2012-06-07 Adam Barth <[email protected]>
+
+ Settings::defaultDeviceScaleFactor is redundant with Page::deviceScaleFactor
+ https://bugs.webkit.org/show_bug.cgi?id=88375
+
+ Reviewed by James Robinson.
+
+ * public/WebSettings.h:
+ (WebKit::WebSettings::setDefaultDeviceScaleFactor):
+ (WebSettings):
+ * src/ChromeClientImpl.cpp:
+ (WebKit::ChromeClientImpl::dispatchViewportPropertiesDidChange):
+ * src/WebSettingsImpl.cpp:
+ (WebKit):
+ * src/WebSettingsImpl.h:
+ (WebSettingsImpl):
+ * src/WebViewImpl.cpp:
+ (WebKit::WebViewImpl::setIsAcceleratedCompositingActive):
+ * tests/WebFrameTest.cpp:
+ (WebKit::TEST_F):
+
2012-06-07 Peter Beverloo <[email protected]>
[Chromium] features.gypi should have the correct definitions for Android
Modified: trunk/Source/WebKit/chromium/public/WebSettings.h (119751 => 119752)
--- trunk/Source/WebKit/chromium/public/WebSettings.h 2012-06-07 21:11:36 UTC (rev 119751)
+++ trunk/Source/WebKit/chromium/public/WebSettings.h 2012-06-07 21:21:31 UTC (rev 119752)
@@ -64,7 +64,6 @@
virtual void setDefaultFixedFontSize(int) = 0;
virtual void setMinimumFontSize(int) = 0;
virtual void setMinimumLogicalFontSize(int) = 0;
- virtual void setDefaultDeviceScaleFactor(int) = 0;
virtual void setApplyDefaultDeviceScaleFactorInCompositor(bool) = 0;
virtual void setFontBoostingEnabled(bool) = 0;
virtual void setDefaultTextEncodingName(const WebString&) = 0;
@@ -161,6 +160,9 @@
virtual bool forceSoftwareCompositing() const = 0;
+ // DEPRECATED
+ virtual void setDefaultDeviceScaleFactor(int) { }
+
protected:
~WebSettings() { }
};
Modified: trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp (119751 => 119752)
--- trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp 2012-06-07 21:11:36 UTC (rev 119751)
+++ trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp 2012-06-07 21:21:31 UTC (rev 119752)
@@ -634,12 +634,10 @@
if (!m_webView->settings()->viewportEnabled() || !m_webView->isFixedLayoutModeEnabled() || !m_webView->client() || !m_webView->page())
return;
- bool useDefaultDeviceScaleFactor = false;
ViewportArguments args;
if (arguments == args) {
// Default viewport arguments passed in. This is a signal to reset the viewport.
args.width = ViewportArguments::ValueDesktopWidth;
- useDefaultDeviceScaleFactor = true;
} else
args = arguments;
@@ -664,10 +662,7 @@
m_webView->setFixedLayoutSize(IntSize(layoutWidth, layoutHeight));
bool needInitializePageScale = !m_webView->isPageScaleFactorSet();
- if (useDefaultDeviceScaleFactor && settings->defaultDeviceScaleFactor())
- m_webView->setDeviceScaleFactor(settings->defaultDeviceScaleFactor());
- else
- m_webView->setDeviceScaleFactor(computed.devicePixelRatio);
+ m_webView->setDeviceScaleFactor(computed.devicePixelRatio);
m_webView->setPageScaleFactorLimits(computed.minimumScale, computed.maximumScale);
if (needInitializePageScale)
m_webView->setPageScaleFactorPreservingScrollOffset(computed.initialScale * computed.devicePixelRatio);
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp (119751 => 119752)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2012-06-07 21:11:36 UTC (rev 119751)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2012-06-07 21:21:31 UTC (rev 119752)
@@ -119,16 +119,6 @@
m_settings->setMinimumLogicalFontSize(size);
}
-void WebSettingsImpl::setDefaultDeviceScaleFactor(int defaultDeviceScaleFactor)
-{
- m_settings->setDefaultDeviceScaleFactor(defaultDeviceScaleFactor);
-}
-
-int WebSettingsImpl::defaultDeviceScaleFactor()
-{
- return m_settings->defaultDeviceScaleFactor();
-}
-
void WebSettingsImpl::setDeviceSupportsTouch(bool deviceSupportsTouch)
{
m_settings->setDeviceSupportsTouch(deviceSupportsTouch);
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.h (119751 => 119752)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2012-06-07 21:11:36 UTC (rev 119751)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2012-06-07 21:21:31 UTC (rev 119752)
@@ -55,8 +55,6 @@
virtual void setDefaultFixedFontSize(int);
virtual void setMinimumFontSize(int);
virtual void setMinimumLogicalFontSize(int);
- virtual void setDefaultDeviceScaleFactor(int);
- virtual int defaultDeviceScaleFactor();
virtual void setApplyDefaultDeviceScaleFactorInCompositor(bool);
virtual void setFontBoostingEnabled(bool);
virtual void setDefaultTextEncodingName(const WebString&);
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (119751 => 119752)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-06-07 21:11:36 UTC (rev 119751)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-06-07 21:21:31 UTC (rev 119752)
@@ -3476,10 +3476,10 @@
m_nonCompositedContentHost = NonCompositedContentHost::create(WebViewImplContentPainter::create(this));
m_nonCompositedContentHost->setShowDebugBorders(page()->settings()->showDebugBorders());
- if (m_webSettings->applyDefaultDeviceScaleFactorInCompositor() && page()->settings()->defaultDeviceScaleFactor() != 1) {
- ASSERT(page()->settings()->defaultDeviceScaleFactor());
+ if (m_webSettings->applyDefaultDeviceScaleFactorInCompositor() && page()->deviceScaleFactor() != 1) {
+ ASSERT(page()->deviceScaleFactor());
- m_deviceScaleInCompositor = page()->settings()->defaultDeviceScaleFactor();
+ m_deviceScaleInCompositor = page()->deviceScaleFactor();
layerTreeViewSettings.deviceScaleFactor = m_deviceScaleInCompositor;
setDeviceScaleFactor(m_deviceScaleInCompositor);
}
Modified: trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp (119751 => 119752)
--- trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp 2012-06-07 21:11:36 UTC (rev 119751)
+++ trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp 2012-06-07 21:21:31 UTC (rev 119752)
@@ -225,13 +225,12 @@
int viewportHeight = 480;
FixedLayoutTestWebViewClient client;
- client.m_screenInfo.horizontalDPI = 160;
+ client.m_screenInfo.horizontalDPI = 320;
client.m_windowRect = WebRect(0, 0, viewportWidth, viewportHeight);
WebView* webView = static_cast<WebView*>(FrameTestHelpers::createWebViewAndLoad(m_baseURL + "no_viewport_tag.html", true, 0, &client));
webView->settings()->setViewportEnabled(true);
- webView->settings()->setDefaultDeviceScaleFactor(2);
webView->enableFixedLayoutMode(true);
webView->resize(WebSize(viewportWidth, viewportHeight));
webView->layout();
Modified: trunk/Source/WebKit2/win/WebKit2.def (119751 => 119752)
--- trunk/Source/WebKit2/win/WebKit2.def 2012-06-07 21:11:36 UTC (rev 119751)
+++ trunk/Source/WebKit2/win/WebKit2.def 2012-06-07 21:21:31 UTC (rev 119752)
@@ -207,7 +207,6 @@
?scriptNameToCode@WebCore@@YA?AW4UScriptCode@@ABVString@WTF@@@Z
?scrollElementToRect@FrameView@WebCore@@QAEXPAVElement@2@ABVIntRect@2@@Z
?setCursiveFontFamily@Settings@WebCore@@QAEXABVAtomicString@WTF@@W4UScriptCode@@@Z
- ?setDefaultDeviceScaleFactor@Settings@WebCore@@QAEXH@Z
?setDeviceScaleFactor@Page@WebCore@@QAEXM@Z
?setDOMException@WebCore@@YAXPAVExecState@JSC@@H@Z
?setFantasyFontFamily@Settings@WebCore@@QAEXABVAtomicString@WTF@@W4UScriptCode@@@Z
Modified: trunk/Source/WebKit2/win/WebKit2CFLite.def (119751 => 119752)
--- trunk/Source/WebKit2/win/WebKit2CFLite.def 2012-06-07 21:11:36 UTC (rev 119751)
+++ trunk/Source/WebKit2/win/WebKit2CFLite.def 2012-06-07 21:21:31 UTC (rev 119752)
@@ -200,7 +200,6 @@
?scriptNameToCode@WebCore@@YA?AW4UScriptCode@@ABVString@WTF@@@Z
?scrollElementToRect@FrameView@WebCore@@QAEXPAVElement@2@ABVIntRect@2@@Z
?setCursiveFontFamily@Settings@WebCore@@QAEXABVAtomicString@WTF@@W4UScriptCode@@@Z
- ?setDefaultDeviceScaleFactor@Settings@WebCore@@QAEXH@Z
?setDeviceScaleFactor@Page@WebCore@@QAEXM@Z
?setDOMException@WebCore@@YAXPAVExecState@JSC@@H@Z
?setFantasyFontFamily@Settings@WebCore@@QAEXABVAtomicString@WTF@@W4UScriptCode@@@Z
Modified: trunk/Source/autotools/symbols.filter (119751 => 119752)
--- trunk/Source/autotools/symbols.filter 2012-06-07 21:11:36 UTC (rev 119751)
+++ trunk/Source/autotools/symbols.filter 2012-06-07 21:21:31 UTC (rev 119752)
@@ -128,7 +128,6 @@
_ZN7WebCore8Settings22setSansSerifFontFamilyERKN3WTF12AtomicStringE11UScriptCode;
_ZN7WebCore8Settings23setPictographFontFamilyERKN3WTF12AtomicStringE11UScriptCode;
_ZN7WebCore8Settings24setMockScrollbarsEnabledEb;
-_ZN7WebCore8Settings27setDefaultDeviceScaleFactorEi;
_ZN7WebCore8Settings37setFixedElementsLayoutRelativeToFrameEb;
_ZN7WebCore9FrameView17paintControlTintsEv;
_ZN7WebCore9FrameView19scrollElementToRectEPNS_7ElementERKNS_7IntRectE;
