Merge change I85087ab0 into eclair-mr2

* changes:
  Enable orientation events.

5 files changed, 1 insertions, 17 deletions

diff --git a/WebCore/page/DOMWindow.cpp b/WebCore/page/DOMWindow.cpp
index 64aae8d..8452e55 100644
--- a/WebCore/page/DOMWindow.cpp
+++ b/WebCore/page/DOMWindow.cpp
@@ -914,13 +914,6 @@ int DOMWindow::scrollX() const
     return static_cast<int>(view->scrollX() / m_frame->pageZoomFactor());
 }
 
-#ifdef ANDROID_ORIENTATION_SUPPORT
-int DOMWindow::orientation() const
-{
-    return screen()->orientation();
-}
-#endif
-
 int DOMWindow::scrollY() const
 {
     if (!m_frame)
diff --git a/WebCore/page/DOMWindow.h b/WebCore/page/DOMWindow.h
index c116f5b..235c9a0 100644
--- a/WebCore/page/DOMWindow.h
+++ b/WebCore/page/DOMWindow.h
@@ -154,9 +154,6 @@ namespace WebCore {
         int scrollY() const;
         int pageXOffset() const { return scrollX(); }
         int pageYOffset() const { return scrollY(); }
-#ifdef ANDROID_ORIENTATION_SUPPORT
-        int orientation() const;
-#endif
 
         bool closed() const;
 
diff --git a/WebCore/page/DOMWindow.idl b/WebCore/page/DOMWindow.idl
index dfafa35..c7bcf82 100644
--- a/WebCore/page/DOMWindow.idl
+++ b/WebCore/page/DOMWindow.idl
@@ -106,9 +106,6 @@ module window {
         attribute [Replaceable] long scrollY;
         readonly attribute long pageXOffset;
         readonly attribute long pageYOffset;
-#if defined(ANDROID_ORIENTATION_SUPPORT)
-        attribute [Replaceable] long orientation;
-#endif
 
         [RequiresAllArguments] void scrollBy(in long x, in long y);
         [RequiresAllArguments] void scrollTo(in long x, in long y);
diff --git a/WebCore/page/Frame.cpp b/WebCore/page/Frame.cpp
index dac6553..b9bf94e 100644
--- a/WebCore/page/Frame.cpp
+++ b/WebCore/page/Frame.cpp
@@ -296,7 +296,7 @@ void Frame::sendOrientationChangeEvent(int orientation)
 {
     m_orientation = orientation;
     if (Document* doc = document())
-        doc->dispatchWindowEvent(eventNames().orientationchangeEvent, false, false);
+        doc->dispatchWindowEvent(Event::create(eventNames().orientationchangeEvent, false, false));
 }
 #endif // ENABLE(ORIENTATION_EVENTS)
     
diff --git a/WebCore/page/Screen.h b/WebCore/page/Screen.h
index 6f34195..2c84abd 100644
--- a/WebCore/page/Screen.h
+++ b/WebCore/page/Screen.h
@@ -52,9 +52,6 @@ namespace WebCore {
         unsigned availTop() const;
         unsigned availHeight() const;
         unsigned availWidth() const;
-#ifdef ANDROID_ORIENTATION_SUPPORT
-        int orientation() const;
-#endif
 
     private:
         Screen(Frame*);