[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 13:42:28 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 86b1f85b32d14f0f6c9817e77910cf74154a50bc
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 23 20:35:30 2010 +0000
2010-09-23 Matthew Delaney <mdelaney at apple.com>
Reviewed by Simon Fraser.
Reduce minimum DOMTimer interval
https://bugs.webkit.org/show_bug.cgi?id=45362
Since the setInterval call is meant to reflect a global change for
all pages' DOMTimers, it's misleading to have it be a method on a
given page's settings' object. Thus, this patch changes the call to be static.
This simple change to using a static call instead of the page's setting's
method doesn't warrant a test.
* page/Settings.h: Changed the setInterval call to be static.
2010-09-23 Matthew Delaney <mdelaney at apple.com>
Reviewed by Simon Fraser.
Reduce minimum DOMTimer interval
https://bugs.webkit.org/show_bug.cgi?id=45362
* WebView/WebView.mm:
Updating set interval call to use Settings' static version inside
one time init block.
2010-09-23 Matthew Delaney <mdelaney at apple.com>
Reviewed by Simon Fraser.
Reduce minimum DOMTimer interval
https://bugs.webkit.org/show_bug.cgi?id=45362
* WebView.cpp:
Updating set interval call to use Settings' static version inside
one time init block.
2010-09-23 Matthew Delaney <mdelaney at apple.com>
Reviewed by Simon Fraser.
Reduce minimum DOMTimer interval
https://bugs.webkit.org/show_bug.cgi?id=45362
* WebProcess/WebPage/WebPage.cpp:
Updating set interval call to use Settings' static version.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68188 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0f431e6..1e3af13 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-09-23 Matthew Delaney <mdelaney at apple.com>
+
+ Reviewed by Simon Fraser.
+
+ Reduce minimum DOMTimer interval
+ https://bugs.webkit.org/show_bug.cgi?id=45362
+
+ Since the setInterval call is meant to reflect a global change for
+ all pages' DOMTimers, it's misleading to have it be a method on a
+ given page's settings' object. Thus, this patch changes the call to be static.
+
+ This simple change to using a static call instead of the page's setting's
+ method doesn't warrant a test.
+
+ * page/Settings.h: Changed the setInterval call to be static.
+
2010-09-23 David Hyatt <hyatt at apple.com>
Reviewed by Dan Bernstein.
diff --git a/WebCore/page/Settings.h b/WebCore/page/Settings.h
index 85ce0c8..a6b7de7 100644
--- a/WebCore/page/Settings.h
+++ b/WebCore/page/Settings.h
@@ -200,7 +200,7 @@ namespace WebCore {
void setDOMPasteAllowed(bool);
bool isDOMPasteAllowed() const { return m_isDOMPasteAllowed; }
- void setMinDOMTimerInterval(double); // Interval specified in seconds.
+ static void setMinDOMTimerInterval(double); // Interval specified in seconds.
void setUsesPageCache(bool);
bool usesPageCache() const { return m_usesPageCache; }
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index ab10ed4..4357f8c 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-23 Matthew Delaney <mdelaney at apple.com>
+
+ Reviewed by Simon Fraser.
+
+ Reduce minimum DOMTimer interval
+ https://bugs.webkit.org/show_bug.cgi?id=45362
+
+ * WebView/WebView.mm:
+ Updating set interval call to use Settings' static version inside
+ one time init block.
+
2010-09-22 Andy Estes <aestes at apple.com>
Reviewed by Darin Adler.
diff --git a/WebKit/mac/WebView/WebView.mm b/WebKit/mac/WebView/WebView.mm
index dffe5dd..89d963a 100644
--- a/WebKit/mac/WebView/WebView.mm
+++ b/WebKit/mac/WebView/WebView.mm
@@ -695,6 +695,7 @@ static bool shouldEnableLoadDeferring()
// Initialize our platform strategies.
WebPlatformStrategies::initialize();
+ Settings::setMinDOMTimerInterval(0.004);
didOneTimeInitialization = true;
}
@@ -716,7 +717,6 @@ static bool shouldEnableLoadDeferring()
_private->page->setCanStartMedia([self window]);
_private->page->settings()->setLocalStorageDatabasePath([[self preferences] _localStorageDatabasePath]);
- _private->page->settings()->setMinDOMTimerInterval(0.004);
[WebFrame _createMainFrameWithPage:_private->page frameName:frameName frameView:frameView];
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index dccce16..e2b1257 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-23 Matthew Delaney <mdelaney at apple.com>
+
+ Reviewed by Simon Fraser.
+
+ Reduce minimum DOMTimer interval
+ https://bugs.webkit.org/show_bug.cgi?id=45362
+
+ * WebView.cpp:
+ Updating set interval call to use Settings' static version inside
+ one time init block.
+
2010-09-23 Nate Chapin <japhet at chromium.org>
Unreviewed, build fix.
diff --git a/WebKit/win/WebView.cpp b/WebKit/win/WebView.cpp
index 2effb06..547daf8 100755
--- a/WebKit/win/WebView.cpp
+++ b/WebKit/win/WebView.cpp
@@ -2569,6 +2569,7 @@ HRESULT STDMETHODCALLTYPE WebView::initWithFrame(
#endif
WebKitSetApplicationCachePathIfNecessary();
WebPlatformStrategies::initialize();
+ Settings::setMinDOMTimerInterval(0.004);
didOneTimeInitialization = true;
}
@@ -2594,7 +2595,6 @@ HRESULT STDMETHODCALLTYPE WebView::initWithFrame(
pageClients.geolocationControllerClient = new WebGeolocationControllerClient(this);
#endif
m_page = new Page(pageClients);
- m_page->settings()->setMinDOMTimerInterval(0.004);
BSTR localStoragePath;
if (SUCCEEDED(m_preferences->localStorageDatabasePath(&localStoragePath))) {
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index b06dc0e..101b638 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-23 Matthew Delaney <mdelaney at apple.com>
+
+ Reviewed by Simon Fraser.
+
+ Reduce minimum DOMTimer interval
+ https://bugs.webkit.org/show_bug.cgi?id=45362
+
+ * WebProcess/WebPage/WebPage.cpp:
+ Updating set interval call to use Settings' static version.
+
2010-09-23 Adam Roben <aroben at apple.com>
Try to fix the Windows build
diff --git a/WebKit2/WebProcess/WebPage/WebPage.cpp b/WebKit2/WebProcess/WebPage/WebPage.cpp
index 8c6506a..6eb3610 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -123,11 +123,11 @@ WebPage::WebPage(uint64_t pageID, const IntSize& viewSize, const WebPreferencesS
m_page->settings()->setSansSerifFontFamily(store.sansSerifFontFamily);
m_page->settings()->setSerifFontFamily(store.serifFontFamily);
m_page->settings()->setJavaScriptCanOpenWindowsAutomatically(true);
- m_page->settings()->setMinDOMTimerInterval(0.004);
m_page->setGroupName("WebKit2Group");
platformInitialize();
+ Settings::setMinDOMTimerInterval(0.004);
m_mainFrame = WebFrame::createMainFrame(this);
WebProcess::shared().connection()->send(WebPageProxyMessage::DidCreateMainFrame, m_pageID, CoreIPC::In(m_mainFrame->frameID()));
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list