[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 18:45:17 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 9592543216f298f517c82ce3aed4ed2aa6ea9231
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Dec 17 10:19:46 2010 +0000
2010-12-17 James Simonsen <simonjam at chromium.org>
Reviewed by Darin Fisher.
[Web Timing] Navigation type enums should begin with TYPE_
https://bugs.webkit.org/show_bug.cgi?id=51200
* fast/dom/Window/window-properties-performance-expected.txt: Added TYPE_ to navigation types and added TYPE_RESERVED.
2010-12-17 James Simonsen <simonjam at chromium.org>
Reviewed by Darin Fisher.
[Web Timing] Navigation type enums should begin with TYPE_
https://bugs.webkit.org/show_bug.cgi?id=51200
* page/PerformanceNavigation.cpp:
(WebCore::PerformanceNavigation::type): Added TYPE_ to navigation types.
* page/PerformanceNavigation.h: Ditto and added TYPE_RESERVED.
* page/PerformanceNavigation.idl: Ditto.
2010-12-17 James Simonsen <simonjam at chromium.org>
Reviewed by Darin Fisher.
[Web Timing] Navigation type enums should begin with TYPE_
https://bugs.webkit.org/show_bug.cgi?id=51200
* src/WebPerformance.cpp:
(WebKit::WebPerformance::navigationType): Added TYPE_ to navigation types.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74241 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 328b1ac..26e07a9 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-17 James Simonsen <simonjam at chromium.org>
+
+ Reviewed by Darin Fisher.
+
+ [Web Timing] Navigation type enums should begin with TYPE_
+ https://bugs.webkit.org/show_bug.cgi?id=51200
+
+ * fast/dom/Window/window-properties-performance-expected.txt: Added TYPE_ to navigation types and added TYPE_RESERVED.
+
2010-12-17 Andrey Kosyakov <caseq at chromium.org>
Unreviewed test fix: removed real user agent from test expectations.
diff --git a/LayoutTests/fast/dom/Window/window-properties-performance-expected.txt b/LayoutTests/fast/dom/Window/window-properties-performance-expected.txt
index e6ae84a..1b608cb 100644
--- a/LayoutTests/fast/dom/Window/window-properties-performance-expected.txt
+++ b/LayoutTests/fast/dom/Window/window-properties-performance-expected.txt
@@ -5,9 +5,10 @@ window.webkitPerformance.memory [object MemoryInfo]
window.webkitPerformance.memory.totalJSHeapSize [number]
window.webkitPerformance.memory.usedJSHeapSize [number]
window.webkitPerformance.navigation [object PerformanceNavigation]
-window.webkitPerformance.navigation.BACK_FORWARD [number]
-window.webkitPerformance.navigation.NAVIGATE [number]
-window.webkitPerformance.navigation.RELOAD [number]
+window.webkitPerformance.navigation.TYPE_BACK_FORWARD [number]
+window.webkitPerformance.navigation.TYPE_NAVIGATE [number]
+window.webkitPerformance.navigation.TYPE_RELOAD [number]
+window.webkitPerformance.navigation.TYPE_RESERVED [number]
window.webkitPerformance.navigation.redirectCount [number]
window.webkitPerformance.navigation.type [number]
window.webkitPerformance.timing [object PerformanceTiming]
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2ee924e..b6b771a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-17 James Simonsen <simonjam at chromium.org>
+
+ Reviewed by Darin Fisher.
+
+ [Web Timing] Navigation type enums should begin with TYPE_
+ https://bugs.webkit.org/show_bug.cgi?id=51200
+
+ * page/PerformanceNavigation.cpp:
+ (WebCore::PerformanceNavigation::type): Added TYPE_ to navigation types.
+ * page/PerformanceNavigation.h: Ditto and added TYPE_RESERVED.
+ * page/PerformanceNavigation.idl: Ditto.
+
2010-12-17 Steve Block <steveblock at google.com>
Unreviewed build fix.
diff --git a/WebCore/page/PerformanceNavigation.cpp b/WebCore/page/PerformanceNavigation.cpp
index d570561..597af20 100644
--- a/WebCore/page/PerformanceNavigation.cpp
+++ b/WebCore/page/PerformanceNavigation.cpp
@@ -57,20 +57,20 @@ void PerformanceNavigation::disconnectFrame()
unsigned short PerformanceNavigation::type() const
{
if (!m_frame)
- return NAVIGATE;
+ return TYPE_NAVIGATE;
DocumentLoader* documentLoader = m_frame->loader()->documentLoader();
if (!documentLoader)
- return NAVIGATE;
+ return TYPE_NAVIGATE;
WebCore::NavigationType navigationType = documentLoader->triggeringAction().type();
switch (navigationType) {
case NavigationTypeReload:
- return RELOAD;
+ return TYPE_RELOAD;
case NavigationTypeBackForward:
- return BACK_FORWARD;
+ return TYPE_BACK_FORWARD;
default:
- return NAVIGATE;
+ return TYPE_NAVIGATE;
}
}
diff --git a/WebCore/page/PerformanceNavigation.h b/WebCore/page/PerformanceNavigation.h
index 2ba9b9c..bdf6eaa 100644
--- a/WebCore/page/PerformanceNavigation.h
+++ b/WebCore/page/PerformanceNavigation.h
@@ -48,9 +48,10 @@ public:
void disconnectFrame();
enum PerformanceNavigationType {
- NAVIGATE,
- RELOAD,
- BACK_FORWARD
+ TYPE_NAVIGATE,
+ TYPE_RELOAD,
+ TYPE_BACK_FORWARD,
+ TYPE_RESERVED = 255
};
unsigned short type() const;
diff --git a/WebCore/page/PerformanceNavigation.idl b/WebCore/page/PerformanceNavigation.idl
index 5c06050..d16bcba 100644
--- a/WebCore/page/PerformanceNavigation.idl
+++ b/WebCore/page/PerformanceNavigation.idl
@@ -30,11 +30,12 @@
module window {
- // See: http://dev.w3.org/2006/webapi/WebTiming/
+ // See: http://www.w3.org/TR/navigation-timing/
interface [Conditional=WEB_TIMING, OmitConstructor] PerformanceNavigation {
- const unsigned short NAVIGATE = 0;
- const unsigned short RELOAD = 1;
- const unsigned short BACK_FORWARD = 2;
+ const unsigned short TYPE_NAVIGATE = 0;
+ const unsigned short TYPE_RELOAD = 1;
+ const unsigned short TYPE_BACK_FORWARD = 2;
+ const unsigned short TYPE_RESERVED = 255;
readonly attribute unsigned short type;
readonly attribute unsigned short redirectCount;
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 5925849..522aaff 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-17 James Simonsen <simonjam at chromium.org>
+
+ Reviewed by Darin Fisher.
+
+ [Web Timing] Navigation type enums should begin with TYPE_
+ https://bugs.webkit.org/show_bug.cgi?id=51200
+
+ * src/WebPerformance.cpp:
+ (WebKit::WebPerformance::navigationType): Added TYPE_ to navigation types.
+
2010-12-16 John Knottenbelt <jknotten at chromium.org>
Reviewed by Jeremy Orlow.
diff --git a/WebKit/chromium/src/WebPerformance.cpp b/WebKit/chromium/src/WebPerformance.cpp
index de9c1f6..10df4c7 100644
--- a/WebKit/chromium/src/WebPerformance.cpp
+++ b/WebKit/chromium/src/WebPerformance.cpp
@@ -55,12 +55,14 @@ void WebPerformance::assign(const WebPerformance& other)
WebNavigationType WebPerformance::navigationType() const
{
switch (m_private->navigation()->type()) {
- case PerformanceNavigation::NAVIGATE:
+ case PerformanceNavigation::TYPE_NAVIGATE:
return WebNavigationTypeOther;
- case PerformanceNavigation::RELOAD:
+ case PerformanceNavigation::TYPE_RELOAD:
return WebNavigationTypeReload;
- case PerformanceNavigation::BACK_FORWARD:
+ case PerformanceNavigation::TYPE_BACK_FORWARD:
return WebNavigationTypeBackForward;
+ case PerformanceNavigation::TYPE_RESERVED:
+ return WebNavigationTypeOther;
}
ASSERT_NOT_REACHED();
return WebNavigationTypeOther;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list