2 files changed, 42 insertions, 1 deletions
diff --git a/WebCore/platform/graphics/efl/ImageEfl.cpp b/WebCore/platform/graphics/efl/ImageEfl.cpp
index 112770f..a86ba4e 100644
--- a/WebCore/platform/graphics/efl/ImageEfl.cpp
+++ b/WebCore/platform/graphics/efl/ImageEfl.cpp
@@ -32,6 +32,7 @@
 #include "BitmapImage.h"
 #include "SharedBuffer.h"
 
+#include <wtf/text/StringConcatenate.h>
 #include <cairo.h>
 
 namespace WebCore {
@@ -51,7 +52,7 @@ static PassRefPtr<SharedBuffer> loadResourceSharedBufferFallback()
 
 static PassRefPtr<SharedBuffer> loadResourceSharedBuffer(const char* name)
 {
-    RefPtr<SharedBuffer> buffer = SharedBuffer::createWithContentsOfFile(String::format(DATA_DIR "/webkit-1.0/images/%s.png", name));
+    RefPtr<SharedBuffer> buffer = SharedBuffer::createWithContentsOfFile(makeString(DATA_DIR "/webkit-1.0/images/", name, ".png"));    
     if (buffer)
         return buffer.release();
     return loadResourceSharedBufferFallback();
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@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;
+}
+
+}