[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 c8d35e84ff2a676e9cf05d3cc12fe399413a3daa
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 15 00:34:36 2010 +0000

    2010-09-14  Ryuan Choi  <ryuan.choi at samsung.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [EFL] ewk_frame_view_create_for_view set null as theme.
            https://bugs.webkit.org/show_bug.cgi?id=45741
    
            Add theme in ewk_view to use instead of frame's theme which is null in
            ewk_frame_view_create_for_view.
    
            * ewk/ewk_frame.cpp:
            (ewk_frame_view_create_for_view):
            * ewk/ewk_view.cpp:
            (ewk_view_theme_set):
            (ewk_view_theme_get):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67519 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/efl/ChangeLog b/WebKit/efl/ChangeLog
index 1d42b5b..6715c3e 100644
--- a/WebKit/efl/ChangeLog
+++ b/WebKit/efl/ChangeLog
@@ -1,3 +1,19 @@
+2010-09-14  Ryuan Choi  <ryuan.choi at samsung.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [EFL] ewk_frame_view_create_for_view set null as theme.
+        https://bugs.webkit.org/show_bug.cgi?id=45741
+
+        Add theme in ewk_view to use instead of frame's theme which is null in
+        ewk_frame_view_create_for_view.
+
+        * ewk/ewk_frame.cpp:
+        (ewk_frame_view_create_for_view):
+        * ewk/ewk_view.cpp:
+        (ewk_view_theme_set):
+        (ewk_view_theme_get):
+
 2010-09-14  Leandro Pereira  <leandro at profusion.mobi>
 
         [EFL] Unreviewed build fix: remove "virtual" keyword from
diff --git a/WebKit/efl/ewk/ewk_frame.cpp b/WebKit/efl/ewk/ewk_frame.cpp
index a2937b7..313ed00 100644
--- a/WebKit/efl/ewk/ewk_frame.cpp
+++ b/WebKit/efl/ewk/ewk_frame.cpp
@@ -1962,7 +1962,9 @@ void ewk_frame_view_create_for_view(Evas_Object* o, Evas_Object* view)
     sd->frame->createView(size, bg, !a, WebCore::IntSize(), false);
     if (!sd->frame->view())
         return;
-    sd->frame->view()->setEdjeTheme(sd->theme);
+
+    const char* theme = ewk_view_theme_get(view);
+    sd->frame->view()->setEdjeTheme(theme);
     sd->frame->view()->setEvasObject(o);
 }
 
diff --git a/WebKit/efl/ewk/ewk_view.cpp b/WebKit/efl/ewk/ewk_view.cpp
index 6bc11dd..82102c8 100644
--- a/WebKit/efl/ewk/ewk_view.cpp
+++ b/WebKit/efl/ewk/ewk_view.cpp
@@ -90,6 +90,7 @@ struct _Ewk_View_Private_Data {
         const char* encoding_default;
         const char* encoding_custom;
         const char* cache_directory;
+        const char* theme;
         int font_minimum_size;
         int font_minimum_logical_size;
         int font_default_size;
@@ -1113,6 +1114,9 @@ void ewk_view_fixed_layout_size_get(Evas_Object* o, Evas_Coord* w, Evas_Coord* h
 void ewk_view_theme_set(Evas_Object* o, const char* path)
 {
     EWK_VIEW_SD_GET_OR_RETURN(o, sd);
+    EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv);
+    if (!eina_stringshare_replace(&priv->settings.theme, path))
+        return;
     ewk_frame_theme_set(sd->main_frame, path);
 }
 
@@ -1128,7 +1132,8 @@ void ewk_view_theme_set(Evas_Object* o, const char* path)
 const char* ewk_view_theme_get(Evas_Object* o)
 {
     EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
-    return ewk_frame_theme_get(sd->main_frame);
+    EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, 0);
+    return priv->settings.theme;
 }
 
 /**

-- 
WebKit Debian packaging