[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 11:21:59 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 3f9e4eaab66ea2b692820d0255a92ad246dc31e2
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jul 20 18:12:10 2010 +0000
2010-07-20 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r63750.
http://trac.webkit.org/changeset/63750
https://bugs.webkit.org/show_bug.cgi?id=42648
This revision breaks the windows builds (Requested by
hwennborg on #webkit).
* bindings/generic/RuntimeEnabledFeatures.cpp:
* bindings/generic/RuntimeEnabledFeatures.h:
* page/DOMWindow.cpp:
(WebCore::DOMWindow::addEventListener):
(WebCore::DOMWindow::removeEventListener):
(WebCore::DOMWindow::removeAllEventListeners):
* page/DOMWindow.idl:
* page/Page.cpp:
(WebCore::Page::Page):
2010-07-20 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r63750.
http://trac.webkit.org/changeset/63750
https://bugs.webkit.org/show_bug.cgi?id=42648
This revision breaks the windows builds (Requested by
hwennborg on #webkit).
* public/WebRuntimeFeatures.h:
* src/WebRuntimeFeatures.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63759 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1a76311..0ac1a6c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2010-07-20 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r63750.
+ http://trac.webkit.org/changeset/63750
+ https://bugs.webkit.org/show_bug.cgi?id=42648
+
+ This revision breaks the windows builds (Requested by
+ hwennborg on #webkit).
+
+ * bindings/generic/RuntimeEnabledFeatures.cpp:
+ * bindings/generic/RuntimeEnabledFeatures.h:
+ * page/DOMWindow.cpp:
+ (WebCore::DOMWindow::addEventListener):
+ (WebCore::DOMWindow::removeEventListener):
+ (WebCore::DOMWindow::removeAllEventListeners):
+ * page/DOMWindow.idl:
+ * page/Page.cpp:
+ (WebCore::Page::Page):
+
2010-07-20 Ilya Tikhonovsky <loislo at chromium.org>
Reviewed by Pavel Feldman.
diff --git a/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp b/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp
index 153f995..7d4e5c1 100644
--- a/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp
+++ b/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp
@@ -47,7 +47,6 @@ bool RuntimeEnabledFeatures::isIndexedDBEnabled = false;
bool RuntimeEnabledFeatures::isWebGLEnabled = false;
bool RuntimeEnabledFeatures::isPushStateEnabled = false;
bool RuntimeEnabledFeatures::isTouchEnabled = true;
-bool RuntimeEnabledFeatures::isDeviceOrientationEnabled = true;
#if ENABLE(VIDEO)
diff --git a/WebCore/bindings/generic/RuntimeEnabledFeatures.h b/WebCore/bindings/generic/RuntimeEnabledFeatures.h
index d8eae23..73bbf0f 100644
--- a/WebCore/bindings/generic/RuntimeEnabledFeatures.h
+++ b/WebCore/bindings/generic/RuntimeEnabledFeatures.h
@@ -113,11 +113,6 @@ public:
static bool ontouchcancelEnabled() { return isTouchEnabled; }
#endif
- static void setDeviceOrientationEnabled(bool isEnabled) { isDeviceOrientationEnabled = isEnabled; }
- static bool deviceOrientationEnabled() { return isDeviceOrientationEnabled; }
- static bool deviceOrientationEventEnabled() { return isDeviceOrientationEnabled; }
- static bool ondeviceorientationEnabled() { return isDeviceOrientationEnabled; }
-
private:
// Never instantiate.
RuntimeEnabledFeatures() { }
@@ -131,7 +126,6 @@ private:
static bool isWebGLEnabled;
static bool isPushStateEnabled;
static bool isTouchEnabled;
- static bool isDeviceOrientationEnabled;
};
} // namespace WebCore
diff --git a/WebCore/page/DOMWindow.cpp b/WebCore/page/DOMWindow.cpp
index 062d0df..918a83a 100644
--- a/WebCore/page/DOMWindow.cpp
+++ b/WebCore/page/DOMWindow.cpp
@@ -1413,8 +1413,8 @@ bool DOMWindow::addEventListener(const AtomicString& eventType, PassRefPtr<Event
else if (eventType == eventNames().beforeunloadEvent && allowsBeforeUnloadListeners(this))
addBeforeUnloadEventListener(this);
#if ENABLE(DEVICE_ORIENTATION)
- else if (eventType == eventNames().deviceorientationEvent && frame() && frame()->page() && frame()->page()->deviceOrientationController())
- frame()->page()->deviceOrientationController()->addListener(this);
+ else if (eventType == eventNames().deviceorientationEvent && frame() && frame()->page())
+ frame()->page()->deviceOrientation()->addListener(this);
#endif
return true;
@@ -1430,8 +1430,8 @@ bool DOMWindow::removeEventListener(const AtomicString& eventType, EventListener
else if (eventType == eventNames().beforeunloadEvent && allowsBeforeUnloadListeners(this))
removeBeforeUnloadEventListener(this);
#if ENABLE(DEVICE_ORIENTATION)
- else if (eventType == eventNames().deviceorientationEvent && frame() && frame()->page() && frame()->page()->deviceOrientationController())
- frame()->page()->deviceOrientationController()->removeListener(this);
+ else if (eventType == eventNames().deviceorientationEvent && frame() && frame()->page())
+ frame()->page()->deviceOrientation()->removeListener(this);
#endif
return true;
@@ -1508,8 +1508,8 @@ void DOMWindow::removeAllEventListeners()
EventTarget::removeAllEventListeners();
#if ENABLE(DEVICE_ORIENTATION)
- if (frame() && frame()->page() && frame()->page()->deviceOrientationController())
- frame()->page()->deviceOrientationController()->removeAllListeners(this);
+ if (frame() && frame()->page())
+ frame()->page()->deviceOrientation()->removeAllListeners(this);
#endif
removeAllUnloadEventListeners(this);
diff --git a/WebCore/page/DOMWindow.idl b/WebCore/page/DOMWindow.idl
index 82521ba..c500ee7 100644
--- a/WebCore/page/DOMWindow.idl
+++ b/WebCore/page/DOMWindow.idl
@@ -304,8 +304,8 @@ module window {
attribute [Conditional=TOUCH_EVENTS,EnabledAtRuntime] EventListener ontouchend;
attribute [Conditional=TOUCH_EVENTS,EnabledAtRuntime] EventListener ontouchcancel;
- attribute [Conditional=DEVICE_ORIENTATION, EnabledAtRuntime] DeviceOrientationEventConstructor DeviceOrientationEvent;
- attribute [Conditional=DEVICE_ORIENTATION, EnabledAtRuntime] EventListener ondeviceorientation;
+ attribute [Conditional=DEVICE_ORIENTATION] DeviceOrientationEventConstructor DeviceOrientationEvent;
+ attribute [Conditional=DEVICE_ORIENTATION] EventListener ondeviceorientation;
// EventTarget interface
[Custom] void addEventListener(in DOMString type,
diff --git a/WebCore/page/Page.cpp b/WebCore/page/Page.cpp
index aaf3d4c..59c2238 100644
--- a/WebCore/page/Page.cpp
+++ b/WebCore/page/Page.cpp
@@ -57,7 +57,6 @@
#include "ProgressTracker.h"
#include "RenderTheme.h"
#include "RenderWidget.h"
-#include "RuntimeEnabledFeatures.h"
#include "ScriptController.h"
#include "SelectionController.h"
#include "Settings.h"
@@ -140,7 +139,7 @@ Page::Page(ChromeClient* chromeClient, ContextMenuClient* contextMenuClient, Edi
, m_geolocationController(new GeolocationController(this, geolocationControllerClient))
#endif
#if ENABLE(DEVICE_ORIENTATION)
- , m_deviceOrientationController(RuntimeEnabledFeatures::deviceOrientationEnabled() ? new DeviceOrientationController(this, deviceOrientationClient) : 0)
+ , m_deviceOrientationController(new DeviceOrientationController(this, deviceOrientationClient))
#endif
#if ENABLE(INPUT_SPEECH)
, m_speechInputClient(0)
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index f441f2f..459683b 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-20 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r63750.
+ http://trac.webkit.org/changeset/63750
+ https://bugs.webkit.org/show_bug.cgi?id=42648
+
+ This revision breaks the windows builds (Requested by
+ hwennborg on #webkit).
+
+ * public/WebRuntimeFeatures.h:
+ * src/WebRuntimeFeatures.cpp:
+
2010-07-19 Victor Wang <victorw at chromium.org>
Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/public/WebRuntimeFeatures.h b/WebKit/chromium/public/WebRuntimeFeatures.h
index 95307a2..03ff681 100644
--- a/WebKit/chromium/public/WebRuntimeFeatures.h
+++ b/WebKit/chromium/public/WebRuntimeFeatures.h
@@ -77,9 +77,6 @@ public:
WEBKIT_API static void enableTouch(bool);
WEBKIT_API static bool isTouchEnabled();
- WEBKIT_API static void enableDeviceOrientation(bool);
- WEBKIT_API static bool isDeviceOrientationEnabled();
-
private:
WebRuntimeFeatures();
};
diff --git a/WebKit/chromium/src/WebRuntimeFeatures.cpp b/WebKit/chromium/src/WebRuntimeFeatures.cpp
index efb287c..595a47f 100644
--- a/WebKit/chromium/src/WebRuntimeFeatures.cpp
+++ b/WebKit/chromium/src/WebRuntimeFeatures.cpp
@@ -226,14 +226,4 @@ bool WebRuntimeFeatures::isTouchEnabled()
#endif
}
-void WebRuntimeFeatures::enableDeviceOrientation(bool enable)
-{
- RuntimeEnabledFeatures::setDeviceOrientationEnabled(enable);
-}
-
-bool WebRuntimeFeatures::isDeviceOrientationEnabled()
-{
- return RuntimeEnabledFeatures::deviceOrientationEnabled();
-}
-
} // namespace WebKit
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list