Title: [109259] trunk/Source/WebCore
- Revision
- 109259
- Author
- [email protected]
- Date
- 2012-02-29 14:11:06 -0800 (Wed, 29 Feb 2012)
Log Message
[BlackBerry] Upstream the BlackBerry change to platform/graphics/FloatSize.h
https://bugs.webkit.org/show_bug.cgi?id=79893
Reviewed by Antonio Gomes.
Add conversion convenience between WebCore::FloatSize and BlackBerry::Platform::FloatSize.
The porting can't be built yet, no new tests.
* platform/graphics/FloatSize.h:
(Platform):
(FloatSize):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (109258 => 109259)
--- trunk/Source/WebCore/ChangeLog 2012-02-29 22:05:18 UTC (rev 109258)
+++ trunk/Source/WebCore/ChangeLog 2012-02-29 22:11:06 UTC (rev 109259)
@@ -1,5 +1,20 @@
2012-02-29 Leo Yang <[email protected]>
+ [BlackBerry] Upstream the BlackBerry change to platform/graphics/FloatSize.h
+ https://bugs.webkit.org/show_bug.cgi?id=79893
+
+ Reviewed by Antonio Gomes.
+
+ Add conversion convenience between WebCore::FloatSize and BlackBerry::Platform::FloatSize.
+
+ The porting can't be built yet, no new tests.
+
+ * platform/graphics/FloatSize.h:
+ (Platform):
+ (FloatSize):
+
+2012-02-29 Leo Yang <[email protected]>
+
[BlackBerry] Upstream the BlackBerry change to platform/graphics/FloatRect.h
https://bugs.webkit.org/show_bug.cgi?id=79891
Modified: trunk/Source/WebCore/platform/graphics/FloatSize.h (109258 => 109259)
--- trunk/Source/WebCore/platform/graphics/FloatSize.h 2012-02-29 22:05:18 UTC (rev 109258)
+++ trunk/Source/WebCore/platform/graphics/FloatSize.h 2012-02-29 22:11:06 UTC (rev 109259)
@@ -31,6 +31,14 @@
#include "IntPoint.h"
#include <wtf/MathExtras.h>
+#if PLATFORM(BLACKBERRY)
+namespace BlackBerry {
+namespace Platform {
+class FloatSize;
+}
+}
+#endif
+
#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROMIUM)
typedef struct CGSize CGSize;
#endif
@@ -106,6 +114,11 @@
return FloatSize(m_height, m_width);
}
+#if PLATFORM(BLACKBERRY)
+ FloatSize(const BlackBerry::Platform::FloatSize&);
+ operator BlackBerry::Platform::FloatSize() const;
+#endif
+
#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROMIUM)
explicit FloatSize(const CGSize&); // don't do this implicitly since it's lossy
operator CGSize() const;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
