[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 77b61ae5c64f85e90620cc21448278d9c7f0f006
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 12 01:20:01 2010 +0000

    2010-03-11  Leandro Pereira  <leandro at profusion.mobi>
    
            Reviewed by Holger Freyther.
    
            Add EFL port files to platform/efl.
            http://webkit.org/b/35889
    
            * platform/efl/SystemTimeEfl.cpp: Added.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55869 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bfb3996..aead5ef 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-03-11  Leandro Pereira  <leandro at profusion.mobi>
+
+        Reviewed by Holger Freyther.
+
+        Add EFL port files to platform/efl.
+        http://webkit.org/b/35889
+
+        * platform/efl/SystemTimeEfl.cpp: Added.
+
 2010-03-11  Mark Rowe  <mrowe at apple.com>
 
         Reviewed by Tim Hatcher.
diff --git a/WebCore/platform/efl/SystemTimeEfl.cpp b/WebCore/platform/efl/SystemTimeEfl.cpp
new file mode 100644
index 0000000..de8c87c
--- /dev/null
+++ b/WebCore/platform/efl/SystemTimeEfl.cpp
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2008 INdT. All rights reserved.
+ * Copyright (C) 2009-2010 ProFUSION embedded systems
+ * Copyright (C) 2009-2010 Samsung Electronics
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "SystemTime.h"
+
+#include <Ecore.h>
+
+namespace WebCore {
+
+double currentTime()
+{
+    return ecore_time_get();
+}
+
+}

-- 
WebKit Debian packaging