Changeset 73584 in webkit

Timestamp:

Dec 8, 2010 7:10:51 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2010-12-08 Qi Zhang <​qi.2.zhang@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Support OrientationChange event
​https://bugs.webkit.org/show_bug.cgi?id=50685

Get OrientationChange event from qtmobility then send to webkit.

• Api/qwebframe.cpp: (QWebFrame::orientationChanged): (QWebFrame::QWebFrame):
• Api/qwebframe.h:
• Api/qwebframe_p.h:

Location:

trunk/WebKit/qt

Files:

• Api/qwebframe.cpp (modified) (3 diffs)
• Api/qwebframe.h (modified) (1 diff)
• Api/qwebframe_p.h (modified) (3 diffs)
• ChangeLog (modified) (1 diff)

trunk/WebKit/qt/Api/qwebframe.cpp

@@ -410 +410 @@
 }
 
+void QWebFrame::orientationChanged()
+{
+#if ENABLE(ORIENTATION_EVENTS) && ENABLE(DEVICE_ORIENTATION)
+    int orientation;
+    WebCore::Frame* frame = QWebFramePrivate::core(this);
+
+    switch (d->m_orientation.reading()->orientation()) {
+    case QtMobility::QOrientationReading::TopUp:
+        orientation = 0;
+        break;
+    case QtMobility::QOrientationReading::TopDown:
+        orientation = 180;
+        break;
+    case QtMobility::QOrientationReading::LeftUp:
+        orientation = -90;
+        break;
+    case QtMobility::QOrientationReading::RightUp:
+        orientation = 90;
+        break;
+    case QtMobility::QOrientationReading::FaceUp:
+    case QtMobility::QOrientationReading::FaceDown:
+        // WebCore unable to handle it
+    default:
+        return;
+    }
+    frame->sendOrientationChangeEvent(orientation);
+#endif
+}
 /*!
     \class QWebFrame
@@ -484 +512 @@
         d->frame->loader()->load(request, frameData->name, false);
     }
+#if ENABLE(ORIENTATION_EVENTS) && ENABLE(DEVICE_ORIENTATION)
+    connect(&d->m_orientation, SIGNAL(readingChanged()), this, SLOT(orientationChanged()));
+    d->m_orientation.start();
+#endif
 }
 
@@ -492 +524 @@
     d->page = parent->d->page;
     d->init(this, frameData);
+#if ENABLE(ORIENTATION_EVENTS) && ENABLE(DEVICE_ORIENTATION)
+    connect(&d->m_orientation, SIGNAL(readingChanged()), this, SLOT(orientationChanged()));
+    d->m_orientation.start();
+#endif
 }
 

trunk/WebKit/qt/Api/qwebframe.h

@@ -206 +206 @@
 #endif
 
+private Q_SLOTS:
+    void orientationChanged();
+
 Q_SIGNALS:
     void javaScriptWindowObjectCleared();

trunk/WebKit/qt/Api/qwebframe_p.h

@@ -29 +29 @@
 #include "KURL.h"
 #include "PlatformString.h"
+#if ENABLE(ORIENTATION_EVENTS) && ENABLE(DEVICE_ORIENTATION)
+#include "qorientationsensor.h"
+#endif
 #include "qwebelement.h"
 #include "wtf/RefPtr.h"
@@ -37 +40 @@
 #include "texmap/TextureMapper.h"
 #endif
+
 
 namespace WebCore {
@@ -115 +119 @@
     OwnPtr<WebCore::TextureMapper> textureMapper;
 #endif
+
+#if ENABLE(ORIENTATION_EVENTS) && ENABLE(DEVICE_ORIENTATION)
+    QtMobility::QOrientationSensor m_orientation;
+#endif
 };
 

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-12-08  Qi Zhang  <qi.2.zhang@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Support OrientationChange event
+        https://bugs.webkit.org/show_bug.cgi?id=50685
+
+        Get OrientationChange event from qtmobility then send to webkit.
+
+        * Api/qwebframe.cpp:
+        (QWebFrame::orientationChanged):
+        (QWebFrame::QWebFrame):
+        * Api/qwebframe.h:
+        * Api/qwebframe_p.h:
+
 2010-12-07  Brian Weinstein  <bweinstein@apple.com>