- Revision
- 130389
- Author
- [email protected]
- Date
- 2012-10-04 06:42:11 -0700 (Thu, 04 Oct 2012)
Log Message
.: Don't allow to disable compositing in forced compositing mode
https://bugs.webkit.org/show_bug.cgi?id=98048
Reviewed by Jocelyn Turcotte.
Export Settings::setAcceleratedCompositingEnabled because it has been deinlined.
* Source/autotools/symbols.filter:
Source/WebCore: Don't allow to disable compositing in forced compositing mode
https://bugs.webkit.org/show_bug.cgi?id=98048
Reviewed by Jocelyn Turcotte.
Make forced compositing mode imply accelerated compositing. This will
avoid unexpected situations for platforms that don't want to support
the non-accelerated rendering path.
Covered by existing tests.
* WebCore.exp.in: Export Settings::setAcceleratedCompositingEnabled
because it has been deinlined.
* page/Settings.cpp:
(WebCore::Settings::setAcceleratedCompositingEnabled):
(WebCore::Settings::setForceCompositingMode):
(WebCore):
* page/Settings.h:
(Settings):
(WebCore::Settings::forceCompositingMode): Make it const as a side fix.
Source/WebKit2: Don't allow compositing to be disabled in forced compositing mode
https://bugs.webkit.org/show_bug.cgi?id=98048
Reviewed by Jocelyn Turcotte.
Export Settings::setAcceleratedCompositingEnabled because it has been deinlined.
* win/WebKit2.def:
* win/WebKit2CFLite.def:
Modified Paths
Diff
Modified: trunk/ChangeLog (130388 => 130389)
--- trunk/ChangeLog 2012-10-04 13:20:05 UTC (rev 130388)
+++ trunk/ChangeLog 2012-10-04 13:42:11 UTC (rev 130389)
@@ -1,3 +1,14 @@
+2012-10-04 Balazs Kelemen <[email protected]>
+
+ Don't allow to disable compositing in forced compositing mode
+ https://bugs.webkit.org/show_bug.cgi?id=98048
+
+ Reviewed by Jocelyn Turcotte.
+
+ Export Settings::setAcceleratedCompositingEnabled because it has been deinlined.
+
+ * Source/autotools/symbols.filter:
+
2012-10-03 Ryuan Choi <[email protected]>
[EFL] Default.edj should be generated although ENABLE_WEBKIT disabled.
Modified: trunk/Source/WebCore/ChangeLog (130388 => 130389)
--- trunk/Source/WebCore/ChangeLog 2012-10-04 13:20:05 UTC (rev 130388)
+++ trunk/Source/WebCore/ChangeLog 2012-10-04 13:42:11 UTC (rev 130389)
@@ -1,3 +1,26 @@
+2012-10-04 Balazs Kelemen <[email protected]>
+
+ Don't allow to disable compositing in forced compositing mode
+ https://bugs.webkit.org/show_bug.cgi?id=98048
+
+ Reviewed by Jocelyn Turcotte.
+
+ Make forced compositing mode imply accelerated compositing. This will
+ avoid unexpected situations for platforms that don't want to support
+ the non-accelerated rendering path.
+
+ Covered by existing tests.
+
+ * WebCore.exp.in: Export Settings::setAcceleratedCompositingEnabled
+ because it has been deinlined.
+ * page/Settings.cpp:
+ (WebCore::Settings::setAcceleratedCompositingEnabled):
+ (WebCore::Settings::setForceCompositingMode):
+ (WebCore):
+ * page/Settings.h:
+ (Settings):
+ (WebCore::Settings::forceCompositingMode): Make it const as a side fix.
+
2012-10-04 Harald Alvestrand <[email protected]>
Change RTCPeerConnection GetStats to use Date timestamp format
Modified: trunk/Source/WebCore/WebCore.exp.in (130388 => 130389)
--- trunk/Source/WebCore/WebCore.exp.in 2012-10-04 13:20:05 UTC (rev 130388)
+++ trunk/Source/WebCore/WebCore.exp.in 2012-10-04 13:42:11 UTC (rev 130389)
@@ -882,6 +882,7 @@
__ZN7WebCore8Settings23setDefaultFixedFontSizeEi
__ZN7WebCore8Settings23setEditableLinkBehaviorENS_20EditableLinkBehaviorE
__ZN7WebCore8Settings23setLoadDeferringEnabledEb
+__ZN7WebCore8Settings23setForceCompositingModeEb
__ZN7WebCore8Settings23setPictographFontFamilyERKN3WTF12AtomicStringE11UScriptCode
__ZN7WebCore8Settings23setUsesEncodingDetectorEb
__ZN7WebCore8Settings24setApplicationChromeModeEb
Modified: trunk/Source/WebCore/page/Settings.cpp (130388 => 130389)
--- trunk/Source/WebCore/page/Settings.cpp 2012-10-04 13:20:05 UTC (rev 130388)
+++ trunk/Source/WebCore/page/Settings.cpp 2012-10-04 13:42:11 UTC (rev 130389)
@@ -841,6 +841,9 @@
{
if (m_acceleratedCompositingEnabled == enabled)
return;
+
+ if (!enabled && m_forceCompositingMode)
+ return;
m_acceleratedCompositingEnabled = enabled;
m_page->setNeedsRecalcStyleInAllFrames();
@@ -969,6 +972,14 @@
#endif
}
+void Settings::setForceCompositingMode(bool flag)
+{
+ m_forceCompositingMode = flag;
+
+ if (flag)
+ setAcceleratedCompositingEnabled(true);
+}
+
void Settings::setScrollingPerformanceLoggingEnabled(bool enabled)
{
m_scrollingPerformanceLoggingEnabled = enabled;
Modified: trunk/Source/WebCore/page/Settings.h (130388 => 130389)
--- trunk/Source/WebCore/page/Settings.h 2012-10-04 13:20:05 UTC (rev 130388)
+++ trunk/Source/WebCore/page/Settings.h 2012-10-04 13:42:11 UTC (rev 130389)
@@ -508,8 +508,8 @@
void setDeviceHeight(int height) { m_deviceHeight = height; }
int deviceHeight() const { return m_deviceHeight; }
- void setForceCompositingMode(bool flag) { m_forceCompositingMode = flag; }
- bool forceCompositingMode() { return m_forceCompositingMode; }
+ void setForceCompositingMode(bool flag);
+ bool forceCompositingMode() const { return m_forceCompositingMode; }
void setShouldInjectUserScriptsInInitialEmptyDocument(bool flag) { m_shouldInjectUserScriptsInInitialEmptyDocument = flag; }
bool shouldInjectUserScriptsInInitialEmptyDocument() { return m_shouldInjectUserScriptsInInitialEmptyDocument; }
Modified: trunk/Source/WebKit2/ChangeLog (130388 => 130389)
--- trunk/Source/WebKit2/ChangeLog 2012-10-04 13:20:05 UTC (rev 130388)
+++ trunk/Source/WebKit2/ChangeLog 2012-10-04 13:42:11 UTC (rev 130389)
@@ -1,3 +1,15 @@
+2012-10-04 Balazs Kelemen <[email protected]>
+
+ Don't allow compositing to be disabled in forced compositing mode
+ https://bugs.webkit.org/show_bug.cgi?id=98048
+
+ Reviewed by Jocelyn Turcotte.
+
+ Export Settings::setAcceleratedCompositingEnabled because it has been deinlined.
+
+ * win/WebKit2.def:
+ * win/WebKit2CFLite.def:
+
2012-10-04 Jocelyn Turcotte <[email protected]>
[Qt] Fix the tst_QQuickWebView::scrollRequest auto test
Modified: trunk/Source/WebKit2/win/WebKit2.def (130388 => 130389)
--- trunk/Source/WebKit2/win/WebKit2.def 2012-10-04 13:20:05 UTC (rev 130388)
+++ trunk/Source/WebKit2/win/WebKit2.def 2012-10-04 13:42:11 UTC (rev 130389)
@@ -238,6 +238,7 @@
?setSerifFontFamily@Settings@WebCore@@QAEXABVAtomicString@WTF@@W4UScriptCode@@@Z
?setStandardFontFamily@Settings@WebCore@@QAEXABVAtomicString@WTF@@W4UScriptCode@@@Z
?setStorageBlockingPolicy@Settings@WebCore@@QAEXW4StorageBlockingPolicy@SecurityOrigin@2@@Z
+ ?setForceCompositingMode@Settings@WebCore@@QAEX_N@Z
?setSuggestedValue@HTMLInputElement@WebCore@@QAEXABVString@WTF@@@Z
?setEditingValue@HTMLInputElement@WebCore@@QAEXABVString@WTF@@@Z
?settings@Document@WebCore@@QBEPAVSettings@2@XZ
Modified: trunk/Source/WebKit2/win/WebKit2CFLite.def (130388 => 130389)
--- trunk/Source/WebKit2/win/WebKit2CFLite.def 2012-10-04 13:20:05 UTC (rev 130388)
+++ trunk/Source/WebKit2/win/WebKit2CFLite.def 2012-10-04 13:42:11 UTC (rev 130389)
@@ -231,6 +231,7 @@
?setSerifFontFamily@Settings@WebCore@@QAEXABVAtomicString@WTF@@W4UScriptCode@@@Z
?setStandardFontFamily@Settings@WebCore@@QAEXABVAtomicString@WTF@@W4UScriptCode@@@Z
?setStorageBlockingPolicy@Settings@WebCore@@QAEXW4StorageBlockingPolicy@SecurityOrigin@2@@Z
+ ?setForceCompositingMode@Settings@WebCore@@QAEX_N@Z
?setSuggestedValue@HTMLInputElement@WebCore@@QAEXABVString@WTF@@@Z
?setEditingValue@HTMLInputElement@WebCore@@QAEXABVString@WTF@@@Z
?settings@Document@WebCore@@QBEPAVSettings@2@XZ
Modified: trunk/Source/autotools/symbols.filter (130388 => 130389)
--- trunk/Source/autotools/symbols.filter 2012-10-04 13:20:05 UTC (rev 130388)
+++ trunk/Source/autotools/symbols.filter 2012-10-04 13:42:11 UTC (rev 130389)
@@ -171,6 +171,7 @@
_ZN7WebCore8Settings21setStandardFontFamilyERKN3WTF12AtomicStringE11UScriptCode;
_ZN7WebCore8Settings22setSansSerifFontFamilyERKN3WTF12AtomicStringE11UScriptCode;
_ZN7WebCore8Settings23setPictographFontFamilyERKN3WTF12AtomicStringE11UScriptCode;
+_ZN7WebCore8Settings23setForceCompositingModeEb;
_ZN7WebCore8Settings24setMockScrollbarsEnabledEb;
_ZN7WebCore8Settings24setUsesOverlayScrollbarsEb;
_ZN7WebCore8Settings24setStorageBlockingPolicyENS_14SecurityOrigin21StorageBlockingPolicyE;
