Title: [88534] trunk/Source/WebKit/qt
- Revision
- 88534
- Author
- [email protected]
- Date
- 2011-06-10 03:06:41 -0700 (Fri, 10 Jun 2011)
Log Message
2011-06-10 Laszlo Gombos <[email protected]>
Reviewed by Kenneth Rohde Christiansen.
[Qt] Keep ORIENTATION_EVENTS independent from DEVICE_ORIENTATION
https://bugs.webkit.org/show_bug.cgi?id=62420
ORIENTATION_EVENTS and DEVICE_ORIENTATION features are very similar
but they meant to be independent.
* Api/qwebframe.cpp:
(QWebFramePrivate::_q_orientationChanged):
(QWebFrame::QWebFrame):
* Api/qwebframe_p.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/Api/qwebframe.cpp (88533 => 88534)
--- trunk/Source/WebKit/qt/Api/qwebframe.cpp 2011-06-10 09:09:45 UTC (rev 88533)
+++ trunk/Source/WebKit/qt/Api/qwebframe.cpp 2011-06-10 10:06:41 UTC (rev 88534)
@@ -449,7 +449,7 @@
void QWebFramePrivate::_q_orientationChanged()
{
-#if ENABLE(ORIENTATION_EVENTS) && ENABLE(DEVICE_ORIENTATION)
+#if ENABLE(ORIENTATION_EVENTS)
int orientation;
WebCore::Frame* frame = core(q);
@@ -592,7 +592,7 @@
WebCore::ResourceRequest request(frameData->url, frameData->referrer);
d->frame->loader()->load(request, frameData->name, false);
}
-#if ENABLE(ORIENTATION_EVENTS) && ENABLE(DEVICE_ORIENTATION)
+#if ENABLE(ORIENTATION_EVENTS)
connect(&d->m_orientation, SIGNAL(readingChanged()), this, SLOT(_q_orientationChanged()));
d->m_orientation.start();
#endif
@@ -604,7 +604,7 @@
{
d->page = parent->d->page;
d->init(this, frameData);
-#if ENABLE(ORIENTATION_EVENTS) && ENABLE(DEVICE_ORIENTATION)
+#if ENABLE(ORIENTATION_EVENTS)
connect(&d->m_orientation, SIGNAL(readingChanged()), this, SLOT(_q_orientationChanged()));
d->m_orientation.start();
#endif
Modified: trunk/Source/WebKit/qt/Api/qwebframe_p.h (88533 => 88534)
--- trunk/Source/WebKit/qt/Api/qwebframe_p.h 2011-06-10 09:09:45 UTC (rev 88533)
+++ trunk/Source/WebKit/qt/Api/qwebframe_p.h 2011-06-10 10:06:41 UTC (rev 88534)
@@ -28,7 +28,7 @@
#include "GraphicsContext.h"
#include "KURL.h"
#include "PlatformString.h"
-#if ENABLE(ORIENTATION_EVENTS) && ENABLE(DEVICE_ORIENTATION)
+#if ENABLE(ORIENTATION_EVENTS)
#include "qorientationsensor.h"
#endif
#include "qwebelement.h"
@@ -126,7 +126,7 @@
OwnPtr<WebCore::TextureMapper> textureMapper;
#endif
-#if ENABLE(ORIENTATION_EVENTS) && ENABLE(DEVICE_ORIENTATION)
+#if ENABLE(ORIENTATION_EVENTS)
QtMobility::QOrientationSensor m_orientation;
#endif
Modified: trunk/Source/WebKit/qt/ChangeLog (88533 => 88534)
--- trunk/Source/WebKit/qt/ChangeLog 2011-06-10 09:09:45 UTC (rev 88533)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-06-10 10:06:41 UTC (rev 88534)
@@ -1,3 +1,18 @@
+2011-06-10 Laszlo Gombos <[email protected]>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [Qt] Keep ORIENTATION_EVENTS independent from DEVICE_ORIENTATION
+ https://bugs.webkit.org/show_bug.cgi?id=62420
+
+ ORIENTATION_EVENTS and DEVICE_ORIENTATION features are very similar
+ but they meant to be independent.
+
+ * Api/qwebframe.cpp:
+ (QWebFramePrivate::_q_orientationChanged):
+ (QWebFrame::QWebFrame):
+ * Api/qwebframe_p.h:
+
2011-06-09 Andras Becsi <[email protected]>
Reviewed by Andreas Kling.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
