diff options
author | Ben Murdoch <benm@google.com> | 2010-07-22 15:37:06 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2010-07-27 10:20:25 +0100 |
commit | 967717af5423377c967781471ee106e2bb4e11c8 (patch) | |
tree | 1e701dc0a12f7f07cce1df4a7681717de77a211b /WebCore/platform/qt | |
parent | dcc30a9fca45f634b1d3a12b276d3a0ccce99fc3 (diff) | |
download | external_webkit-967717af5423377c967781471ee106e2bb4e11c8.zip external_webkit-967717af5423377c967781471ee106e2bb4e11c8.tar.gz external_webkit-967717af5423377c967781471ee106e2bb4e11c8.tar.bz2 |
Merge WebKit at r63859 : Initial merge by git.
Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
Diffstat (limited to 'WebCore/platform/qt')
-rw-r--r-- | WebCore/platform/qt/CursorQt.cpp | 8 | ||||
-rw-r--r-- | WebCore/platform/qt/GeolocationServiceQt.cpp | 12 | ||||
-rw-r--r-- | WebCore/platform/qt/RenderThemeQt.cpp | 2 | ||||
-rw-r--r-- | WebCore/platform/qt/WidgetQt.cpp | 5 |
4 files changed, 11 insertions, 16 deletions
diff --git a/WebCore/platform/qt/CursorQt.cpp b/WebCore/platform/qt/CursorQt.cpp index 2e495e7..6017daa 100644 --- a/WebCore/platform/qt/CursorQt.cpp +++ b/WebCore/platform/qt/CursorQt.cpp @@ -44,12 +44,12 @@ namespace WebCore { Cursor::Cursor(PlatformCursor p) - : m_impl(p) + : m_platformCursor(p) { } Cursor::Cursor(const Cursor& other) - : m_impl(other.m_impl) + : m_platformCursor(other.m_platformCursor) { } @@ -61,13 +61,13 @@ Cursor::Cursor(Image* image, const IntPoint& hotSpot) { #ifndef QT_NO_CURSOR IntPoint effectiveHotSpot = determineHotSpot(image, hotSpot); - m_impl = QCursor(*(image->nativeImageForCurrentFrame()), effectiveHotSpot.x(), effectiveHotSpot.y()); + m_platformCursor = QCursor(*(image->nativeImageForCurrentFrame()), effectiveHotSpot.x(), effectiveHotSpot.y()); #endif } Cursor& Cursor::operator=(const Cursor& other) { - m_impl = other.m_impl; + m_platformCursor = other.m_platformCursor; return *this; } diff --git a/WebCore/platform/qt/GeolocationServiceQt.cpp b/WebCore/platform/qt/GeolocationServiceQt.cpp index e24d497..3562eb9 100644 --- a/WebCore/platform/qt/GeolocationServiceQt.cpp +++ b/WebCore/platform/qt/GeolocationServiceQt.cpp @@ -55,6 +55,7 @@ GeolocationServiceQt::GeolocationServiceQt(GeolocationServiceClient* client) GeolocationServiceQt::~GeolocationServiceQt() { + delete m_location; } void GeolocationServiceQt::positionUpdated(const QGeoPositionInfo &geoPosition) @@ -65,20 +66,19 @@ void GeolocationServiceQt::positionUpdated(const QGeoPositionInfo &geoPosition) QGeoCoordinate coord = geoPosition.coordinate(); double latitude = coord.latitude(); double longitude = coord.longitude(); - bool providesAltitude = true; + bool providesAltitude = (geoPosition.coordinate().type() == QGeoCoordinate::Coordinate3D); double altitude = coord.altitude(); - double accuracy = geoPosition.hasAttribute(QGeoPositionInfo::HorizontalAccuracy) ? - geoPosition.attribute(QGeoPositionInfo::HorizontalAccuracy) : 0.0; + double accuracy = geoPosition.attribute(QGeoPositionInfo::HorizontalAccuracy); bool providesAltitudeAccuracy = geoPosition.hasAttribute(QGeoPositionInfo::VerticalAccuracy); - double altitudeAccuracy = providesAltitudeAccuracy ? geoPosition.attribute(QGeoPositionInfo::VerticalAccuracy) : 0.0; + double altitudeAccuracy = geoPosition.attribute(QGeoPositionInfo::VerticalAccuracy); bool providesHeading = geoPosition.hasAttribute(QGeoPositionInfo::Direction); - double heading = providesHeading ? geoPosition.attribute(QGeoPositionInfo::Direction) : 0.0; + double heading = geoPosition.attribute(QGeoPositionInfo::Direction); bool providesSpeed = geoPosition.hasAttribute(QGeoPositionInfo::GroundSpeed); - double speed = providesSpeed ? geoPosition.attribute(QGeoPositionInfo::GroundSpeed) : 0.0; + double speed = geoPosition.attribute(QGeoPositionInfo::GroundSpeed); RefPtr<Coordinates> coordinates = Coordinates::create(latitude, longitude, providesAltitude, altitude, accuracy, providesAltitudeAccuracy, altitudeAccuracy, diff --git a/WebCore/platform/qt/RenderThemeQt.cpp b/WebCore/platform/qt/RenderThemeQt.cpp index deb9037..22d99a1 100644 --- a/WebCore/platform/qt/RenderThemeQt.cpp +++ b/WebCore/platform/qt/RenderThemeQt.cpp @@ -58,8 +58,6 @@ #include "ScrollbarThemeQt.h" #include "TimeRanges.h" #include "UserAgentStyleSheets.h" -#include "qwebpage.h" - #include <QApplication> #include <QColor> diff --git a/WebCore/platform/qt/WidgetQt.cpp b/WebCore/platform/qt/WidgetQt.cpp index 00a58a4..0903b6e 100644 --- a/WebCore/platform/qt/WidgetQt.cpp +++ b/WebCore/platform/qt/WidgetQt.cpp @@ -41,14 +41,11 @@ #include "QWebPageClient.h" #include "ScrollView.h" -#include "qwebframe.h" -#include "qwebframe_p.h" -#include "qwebpage.h" - #include <QCoreApplication> #include <QDebug> #include <QPaintEngine> #include <QPainter> +#include <QWidget> namespace WebCore { |