[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 2046735dd6ab49e787b8779ffb5dedbb70cce4ca
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 8 13:24:13 2010 +0000

    2010-10-08  Gyuyoung Kim  <gyuyoung.kim at samsung.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [EFL] Implement IntRectEfl.cpp
            https://bugs.webkit.org/show_bug.cgi?id=47403
    
            Implement IntRect for Efl Port using Eina_Rectangle.
    
            * platform/graphics/IntRect.h:
            * platform/graphics/efl/IntRectEfl.cpp:
            (WebCore::IntRect::IntRect):
            (WebCore::IntRect::operator Eina_Rectangle):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69394 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 381a9e9..4c67a0c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-08  Gyuyoung Kim  <gyuyoung.kim at samsung.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [EFL] Implement IntRectEfl.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=47403
+
+        Implement IntRect for Efl Port using Eina_Rectangle.
+
+        * platform/graphics/IntRect.h:
+        * platform/graphics/efl/IntRectEfl.cpp:
+        (WebCore::IntRect::IntRect):
+        (WebCore::IntRect::operator Eina_Rectangle):
+
 2010-10-08  Andreas Kling  <andreas.kling at nokia.com>
 
         Reviewed by Nikolas Zimmermann.
diff --git a/WebCore/platform/graphics/IntRect.h b/WebCore/platform/graphics/IntRect.h
index c5990ef..c8d7c71 100644
--- a/WebCore/platform/graphics/IntRect.h
+++ b/WebCore/platform/graphics/IntRect.h
@@ -56,6 +56,8 @@ typedef cairo_rectangle_int_t GdkRectangle;
 #endif
 #elif PLATFORM(HAIKU)
 class BRect;
+#elif PLATFORM(EFL)
+typedef struct _Eina_Rectangle Eina_Rectangle;
 #endif
 
 #if PLATFORM(WX)
@@ -158,6 +160,9 @@ public:
 #elif PLATFORM(HAIKU)
     explicit IntRect(const BRect&);
     operator BRect() const;
+#elif PLATFORM(EFL)
+    explicit IntRect(const Eina_Rectangle&);
+    operator Eina_Rectangle() const;
 #endif
 
 #if PLATFORM(CG)
diff --git a/WebCore/platform/graphics/efl/IntRectEfl.cpp b/WebCore/platform/graphics/efl/IntRectEfl.cpp
new file mode 100644
index 0000000..0c92f63
--- /dev/null
+++ b/WebCore/platform/graphics/efl/IntRectEfl.cpp
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2007 Alp Toker <alp at atoker.com>
+ * Copyright (C) 2010 Samsung Electronics
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "config.h"
+#include "IntRect.h"
+
+#include <Eina.h>
+
+namespace WebCore {
+
+IntRect::IntRect(const Eina_Rectangle& r)
+    : m_location(IntPoint(r.x, r.y))
+    , m_size(r.w, r.h)
+{
+}
+
+IntRect::operator Eina_Rectangle() const
+{
+    Eina_Rectangle r = {x(), y(), width(), height()};
+    return r;
+}
+
+}

-- 
WebKit Debian packaging