Diff
Modified: trunk/ChangeLog (128209 => 128210)
--- trunk/ChangeLog 2012-09-11 18:13:16 UTC (rev 128209)
+++ trunk/ChangeLog 2012-09-11 18:31:11 UTC (rev 128210)
@@ -1,3 +1,16 @@
+2012-09-11 Marcelo Lira <[email protected]>
+
+ Restore original value of mock scrollbars enabled in InternalSettings
+ https://bugs.webkit.org/show_bug.cgi?id=87680
+
+ Reviewed by Adam Barth.
+
+ Added backup support for mock scrollbars state in
+ InternalSettings::Backup, and removed support for these
+ from Qt's DumpRenderTree.
+
+ * Source/autotools/symbols.filter:
+
2012-09-11 Raphael Kubo da Costa <[email protected]>
[EFL] Rewrite the EFL-related Find modules
Modified: trunk/Source/WebCore/ChangeLog (128209 => 128210)
--- trunk/Source/WebCore/ChangeLog 2012-09-11 18:13:16 UTC (rev 128209)
+++ trunk/Source/WebCore/ChangeLog 2012-09-11 18:31:11 UTC (rev 128210)
@@ -1,3 +1,20 @@
+2012-09-11 Marcelo Lira <[email protected]>
+
+ Restore original value of mock scrollbars enabled in InternalSettings
+ https://bugs.webkit.org/show_bug.cgi?id=87680
+
+ Reviewed by Adam Barth.
+
+ Added backup support for mock scrollbars state in
+ InternalSettings::Backup, and removed support for these
+ from Qt's DumpRenderTree.
+
+ * testing/InternalSettings.cpp:
+ (WebCore::InternalSettings::Backup::Backup):
+ (WebCore::InternalSettings::Backup::restoreTo):
+ * testing/InternalSettings.h:
+ (Backup):
+
2012-09-11 Mike West <[email protected]>
Improve console error messages when 'document.domain' blocks cross-origin script access.
Modified: trunk/Source/WebCore/testing/InternalSettings.cpp (128209 => 128210)
--- trunk/Source/WebCore/testing/InternalSettings.cpp 2012-09-11 18:13:16 UTC (rev 128209)
+++ trunk/Source/WebCore/testing/InternalSettings.cpp 2012-09-11 18:31:11 UTC (rev 128210)
@@ -97,6 +97,7 @@
, m_originalDialogElementEnabled(RuntimeEnabledFeatures::dialogElementEnabled())
#endif
, m_canStartMedia(page->canStartMedia())
+ , m_originalMockScrollbarsEnabled(settings->mockScrollbarsEnabled())
{
}
@@ -129,6 +130,7 @@
RuntimeEnabledFeatures::setDialogElementEnabled(m_originalDialogElementEnabled);
#endif
page->setCanStartMedia(m_canStartMedia);
+ settings->setMockScrollbarsEnabled(m_originalMockScrollbarsEnabled);
}
InternalSettings* InternalSettings::from(Page* page)
Modified: trunk/Source/WebCore/testing/InternalSettings.h (128209 => 128210)
--- trunk/Source/WebCore/testing/InternalSettings.h 2012-09-11 18:13:16 UTC (rev 128209)
+++ trunk/Source/WebCore/testing/InternalSettings.h 2012-09-11 18:31:11 UTC (rev 128210)
@@ -79,6 +79,7 @@
bool m_originalDialogElementEnabled;
#endif
bool m_canStartMedia;
+ bool m_originalMockScrollbarsEnabled;
};
typedef RefCountedSupplement<Page, InternalSettings> SuperType;
Modified: trunk/Source/WebKit/qt/ChangeLog (128209 => 128210)
--- trunk/Source/WebKit/qt/ChangeLog 2012-09-11 18:13:16 UTC (rev 128209)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-09-11 18:31:11 UTC (rev 128210)
@@ -1,3 +1,17 @@
+2012-09-11 Marcelo Lira <[email protected]>
+
+ Restore original value of mock scrollbars enabled in InternalSettings
+ https://bugs.webkit.org/show_bug.cgi?id=87680
+
+ Reviewed by Adam Barth.
+
+ Added backup support for mock scrollbars state in
+ InternalSettings::Backup, and removed support for these
+ from Qt's DumpRenderTree.
+
+ * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
+ * WebCoreSupport/DumpRenderTreeSupportQt.h:
+
2012-09-11 Tor Arne Vestbø <[email protected]>
[Qt] Add a configure step to the Qt build system
Modified: trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp (128209 => 128210)
--- trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp 2012-09-11 18:13:16 UTC (rev 128209)
+++ trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp 2012-09-11 18:31:11 UTC (rev 128210)
@@ -237,11 +237,6 @@
QWebPagePrivate::core(page)->settings()->setFrameFlatteningEnabled(enabled);
}
-void DumpRenderTreeSupportQt::setMockScrollbarsEnabled(QWebPage* page, bool enabled)
-{
- QWebPagePrivate::core(page)->settings()->setMockScrollbarsEnabled(enabled);
-}
-
void DumpRenderTreeSupportQt::webPageSetGroupName(QWebPage* page, const QString& groupName)
{
page->handle()->page->setGroupName(groupName);
Modified: trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h (128209 => 128210)
--- trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h 2012-09-11 18:13:16 UTC (rev 128209)
+++ trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h 2012-09-11 18:31:11 UTC (rev 128210)
@@ -104,7 +104,6 @@
static void setDomainRelaxationForbiddenForURLScheme(bool forbidden, const QString& scheme);
static void setFrameFlatteningEnabled(QWebPage*, bool);
- static void setMockScrollbarsEnabled(QWebPage*, bool);
static void setCaretBrowsingEnabled(QWebPage* page, bool value);
static void setAuthorAndUserStylesEnabled(QWebPage*, bool);
static void setMediaType(QWebFrame* qframe, const QString& type);
Modified: trunk/Source/WebKit2/ChangeLog (128209 => 128210)
--- trunk/Source/WebKit2/ChangeLog 2012-09-11 18:13:16 UTC (rev 128209)
+++ trunk/Source/WebKit2/ChangeLog 2012-09-11 18:31:11 UTC (rev 128210)
@@ -1,3 +1,16 @@
+2012-09-11 Marcelo Lira <[email protected]>
+
+ Restore original value of mock scrollbars enabled in InternalSettings
+ https://bugs.webkit.org/show_bug.cgi?id=87680
+
+ Reviewed by Adam Barth.
+
+ Added backup support for mock scrollbars state in
+ InternalSettings::Backup, and removed support for these
+ from Qt's DumpRenderTree.
+
+ * win/WebKit2.def:
+
2012-09-11 Brady Eidson <[email protected]>
We should wait longer before killing the PluginProcess.
Modified: trunk/Source/WebKit2/win/WebKit2.def (128209 => 128210)
--- trunk/Source/WebKit2/win/WebKit2.def 2012-09-11 18:13:16 UTC (rev 128209)
+++ trunk/Source/WebKit2/win/WebKit2.def 2012-09-11 18:31:11 UTC (rev 128210)
@@ -222,6 +222,7 @@
?setFantasyFontFamily@Settings@WebCore@@QAEXABVAtomicString@WTF@@W4UScriptCode@@@Z
?setFixedFontFamily@Settings@WebCore@@QAEXABVAtomicString@WTF@@W4UScriptCode@@@Z
?setMockScrollbarsEnabled@Settings@WebCore@@SAX_N@Z
+ ?mockScrollbarsEnabled@Settings@WebCore@@SA_NXZ
?setPageScaleFactor@Page@WebCore@@QAEXMABVIntPoint@2@@Z
?setPagination@Page@WebCore@@QAEXABUPagination@2@@Z
?setPictographFontFamily@Settings@WebCore@@QAEXABVAtomicString@WTF@@W4UScriptCode@@@Z
Modified: trunk/Source/autotools/symbols.filter (128209 => 128210)
--- trunk/Source/autotools/symbols.filter 2012-09-11 18:13:16 UTC (rev 128209)
+++ trunk/Source/autotools/symbols.filter 2012-09-11 18:31:11 UTC (rev 128210)
@@ -149,6 +149,7 @@
_ZN7WebCore8Settings18setSerifFontFamilyERKN3WTF12AtomicStringE11UScriptCode;
_ZN7WebCore8Settings20setCursiveFontFamilyERKN3WTF12AtomicStringE11UScriptCode;
_ZN7WebCore8Settings20setFantasyFontFamilyERKN3WTF12AtomicStringE11UScriptCode;
+_ZN7WebCore8Settings21mockScrollbarsEnabledEv;
_ZN7WebCore8Settings21setStandardFontFamilyERKN3WTF12AtomicStringE11UScriptCode;
_ZN7WebCore8Settings22setSansSerifFontFamilyERKN3WTF12AtomicStringE11UScriptCode;
_ZN7WebCore8Settings23setPictographFontFamilyERKN3WTF12AtomicStringE11UScriptCode;
Modified: trunk/Tools/ChangeLog (128209 => 128210)
--- trunk/Tools/ChangeLog 2012-09-11 18:13:16 UTC (rev 128209)
+++ trunk/Tools/ChangeLog 2012-09-11 18:31:11 UTC (rev 128210)
@@ -1,3 +1,21 @@
+2012-09-11 Marcelo Lira <[email protected]>
+
+ Restore original value of mock scrollbars enabled in InternalSettings
+ https://bugs.webkit.org/show_bug.cgi?id=87680
+
+ Reviewed by Adam Barth.
+
+ Added backup support for mock scrollbars state in
+ InternalSettings::Backup, and removed support for these
+ from Qt's DumpRenderTree.
+
+ * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+ (WebCore::WebPage::resetSettings):
+ * DumpRenderTree/qt/TestRunnerQt.cpp:
+ (TestRunner::setFrameFlatteningEnabled):
+ * DumpRenderTree/qt/TestRunnerQt.h:
+ (TestRunner):
+
2012-09-11 Dan Bernstein <[email protected]>
Fixed a bug where kill-old-processes failed to kill clang++.
Modified: trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp (128209 => 128210)
--- trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp 2012-09-11 18:13:16 UTC (rev 128209)
+++ trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp 2012-09-11 18:31:11 UTC (rev 128210)
@@ -197,7 +197,6 @@
m_drt->testRunner()->setCaretBrowsingEnabled(false);
m_drt->testRunner()->setAuthorAndUserStylesEnabled(true);
m_drt->testRunner()->setFrameFlatteningEnabled(false);
- m_drt->testRunner()->setMockScrollbarsEnabled(false);
m_drt->testRunner()->setSmartInsertDeleteEnabled(true);
m_drt->testRunner()->setSelectTrailingWhitespaceEnabled(false);
m_drt->testRunner()->setDefersLoading(false);
Modified: trunk/Tools/DumpRenderTree/qt/TestRunnerQt.cpp (128209 => 128210)
--- trunk/Tools/DumpRenderTree/qt/TestRunnerQt.cpp 2012-09-11 18:13:16 UTC (rev 128209)
+++ trunk/Tools/DumpRenderTree/qt/TestRunnerQt.cpp 2012-09-11 18:31:11 UTC (rev 128210)
@@ -444,11 +444,6 @@
DumpRenderTreeSupportQt::setFrameFlatteningEnabled(m_drt->webPage(), enabled);
}
-void TestRunner::setMockScrollbarsEnabled(bool enabled)
-{
- DumpRenderTreeSupportQt::setMockScrollbarsEnabled(m_drt->webPage(), enabled);
-}
-
void TestRunner::goBack()
{
DumpRenderTreeSupportQt::goBack(m_drt->webPage());
Modified: trunk/Tools/DumpRenderTree/qt/TestRunnerQt.h (128209 => 128210)
--- trunk/Tools/DumpRenderTree/qt/TestRunnerQt.h 2012-09-11 18:13:16 UTC (rev 128209)
+++ trunk/Tools/DumpRenderTree/qt/TestRunnerQt.h 2012-09-11 18:31:11 UTC (rev 128210)
@@ -156,7 +156,6 @@
void removeAllVisitedLinks();
void setMediaType(const QString&);
void setFrameFlatteningEnabled(bool);
- void setMockScrollbarsEnabled(bool);
void setAllowUniversalAccessFromFileURLs(bool enable);
void setAllowFileAccessFromFileURLs(bool enable);
void setAppCacheMaximumSize(unsigned long long quota);
