[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 030b422c7ee351e0a26aaa2298cb22bfa775080f
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 23 01:31:48 2010 +0000

    2010-09-22  Rafael Antognolli  <antognolli at profusion.mobi>
    
            Unreviewed build fix.
    
            [EFL] Fix build due to latest EFL (Edje) changes.
            https://bugs.webkit.org/show_bug.cgi?id=46317
    
            Make the change int -> Edje_Load_Error (enum).
    
            No new functionality, so no new tests.
    
            * platform/efl/RenderThemeEfl.cpp:
            (WebCore::RenderThemeEfl::themePartCacheEntryReset):
            (WebCore::RenderThemeEfl::createEdje):
            (WebCore::RenderThemeEfl::applyPartDescriptions):
            * platform/efl/ScrollbarEfl.cpp:
            (ScrollbarEfl::setParent):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68110 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3d688fb..db58959 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2010-09-22  Rafael Antognolli  <antognolli at profusion.mobi>
+
+        Unreviewed build fix.
+
+        [EFL] Fix build due to latest EFL (Edje) changes.
+        https://bugs.webkit.org/show_bug.cgi?id=46317
+
+        Make the change int -> Edje_Load_Error (enum).
+
+        No new functionality, so no new tests.
+
+        * platform/efl/RenderThemeEfl.cpp:
+        (WebCore::RenderThemeEfl::themePartCacheEntryReset):
+        (WebCore::RenderThemeEfl::createEdje):
+        (WebCore::RenderThemeEfl::applyPartDescriptions):
+        * platform/efl/ScrollbarEfl.cpp:
+        (ScrollbarEfl::setParent):
+
 2010-09-22  Chris Fleizach  <cfleizach at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/platform/efl/RenderThemeEfl.cpp b/WebCore/platform/efl/RenderThemeEfl.cpp
index 102f754..53997be 100644
--- a/WebCore/platform/efl/RenderThemeEfl.cpp
+++ b/WebCore/platform/efl/RenderThemeEfl.cpp
@@ -78,7 +78,7 @@ bool RenderThemeEfl::themePartCacheEntryReset(struct ThemePartCacheEntry* ce, Fo
     ASSERT(group);
 
     if (!edje_object_file_set(ce->o, file, group)) {
-        int err = edje_object_load_error_get(ce->o);
+        Edje_Load_Error err = edje_object_load_error_get(ce->o);
         const char *errmsg = edje_load_error_str(err);
         EINA_LOG_ERR("Could not load '%s' from theme %s: %s",
                      group, file, errmsg);
@@ -421,7 +421,7 @@ void RenderThemeEfl::createEdje()
         if (!m_edje)
             EINA_LOG_ERR("Could not create base edje object.");
         else if (!edje_object_file_set(m_edje, theme.utf8().data(), "webkit/base")) {
-            int err = edje_object_load_error_get(m_edje);
+            Edje_Load_Error err = edje_object_load_error_get(m_edje);
             const char* errmsg = edje_load_error_str(err);
             EINA_LOG_ERR("Could not load 'webkit/base' from theme %s: %s",
                          theme.utf8().data(), errmsg);
@@ -600,7 +600,7 @@ void RenderThemeEfl::applyPartDescriptions()
         const char* group = edjeGroupFromFormType(type);
         m_partDescs[i].type = type;
         if (!edje_object_file_set(o, file, group)) {
-            int err = edje_object_load_error_get(o);
+            Edje_Load_Error err = edje_object_load_error_get(o);
             const char* errmsg = edje_load_error_str(err);
             EINA_LOG_ERR("Could not set theme group '%s' of file '%s': %s",
                          group, file, errmsg);
diff --git a/WebCore/platform/efl/ScrollbarEfl.cpp b/WebCore/platform/efl/ScrollbarEfl.cpp
index 6b00a37..282ca7c 100644
--- a/WebCore/platform/efl/ScrollbarEfl.cpp
+++ b/WebCore/platform/efl/ScrollbarEfl.cpp
@@ -122,7 +122,7 @@ void ScrollbarEfl::setParent(ScrollView* view)
     }
 
     if (!edje_object_file_set(o, theme.utf8().data(), group)) {
-        int err = edje_object_load_error_get(o);
+        Edje_Load_Error err = edje_object_load_error_get(o);
         const char* errmsg = edje_load_error_str(err);
         EINA_LOG_ERR("Could not load theme '%s' from file '%s': #%d '%s'",
                      group, theme.utf8().data(), err, errmsg);

-- 
WebKit Debian packaging