From 5a67c05d4972729d7f3febfe7cc4caff3eec89ec Mon Sep 17 00:00:00 2001 From: "leo.yang@torchmobile.com.cn" Date: Fri, 24 Feb 2012 03:05:58 +0000 Subject: [PATCH] [BlackBerry] Upstream the BlackBerry change to platform/graphics/IntPoint.h https://bugs.webkit.org/show_bug.cgi?id=79094 Reviewed by Antonio Gomes. Add conversion convenience between WebCore::IntPoint and BlackBerry::Platform::IntPoint. The porting can't be built yet, no new tests. * platform/graphics/IntPoint.h: (Platform): (IntPoint): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108715 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 15 +++++++++++++++ Source/WebCore/platform/graphics/IntPoint.h | 9 +++++++++ 2 files changed, 24 insertions(+) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index ce5bc0e..e8f4073 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,18 @@ +2012-02-23 Leo Yang + + [BlackBerry] Upstream the BlackBerry change to platform/graphics/IntPoint.h + https://bugs.webkit.org/show_bug.cgi?id=79094 + + Reviewed by Antonio Gomes. + + Add conversion convenience between WebCore::IntPoint and BlackBerry::Platform::IntPoint. + + The porting can't be built yet, no new tests. + + * platform/graphics/IntPoint.h: + (Platform): + (IntPoint): + 2012-02-23 Justin Novosad [Chromium] Add profiling trace for deferred canvas rendering diff --git a/Source/WebCore/platform/graphics/IntPoint.h b/Source/WebCore/platform/graphics/IntPoint.h index 8d7fd7f..ddc41b4 100644 --- a/Source/WebCore/platform/graphics/IntPoint.h +++ b/Source/WebCore/platform/graphics/IntPoint.h @@ -55,6 +55,12 @@ class QPoint; QT_END_NAMESPACE #elif PLATFORM(GTK) typedef struct _GdkPoint GdkPoint; +#elif PLATFORM(BLACKBERRY) +namespace BlackBerry { +namespace Platform { +class IntPoint; +} +} #elif PLATFORM(EFL) typedef struct _Evas_Point Evas_Point; #endif @@ -136,6 +142,9 @@ public: #elif PLATFORM(GTK) IntPoint(const GdkPoint&); operator GdkPoint() const; +#elif PLATFORM(BLACKBERRY) + IntPoint(const BlackBerry::Platform::IntPoint&); + operator BlackBerry::Platform::IntPoint() const; #elif PLATFORM(EFL) explicit IntPoint(const Evas_Point&); operator Evas_Point() const; -- 2.7.4