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

[xan at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit d81652c92c41b114c082f77ae03638c1a9cd0668
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 23 23:15:06 2010 +0000

    WebCore:
    
    2010-11-23  Xan Lopez  <xlopez at igalia.com>
    
            Reviewed by Martin Robinson.
    
            [GTK] Fix IFrame DOM bindings API
            https://bugs.webkit.org/show_bug.cgi?id=49980
    
            Fix IFrame API naming. It needs special casing because of the two
            consecutive capital letters.
    
            * bindings/scripts/CodeGeneratorGObject.pm:
    
    WebKit/gtk:
    
    2010-11-23  Xan Lopez  <xlopez at igalia.com>
    
            Reviewed by Martin Robinson.
    
            [GTK] Fix IFrame DOM bindings API
            https://bugs.webkit.org/show_bug.cgi?id=49980
    
            * tests/testdomdocument.c:
            (test_dom_document_garbage_collection): change to use the fixed
            IFrame APIs.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72634 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 683d301..83a96a3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-23  Xan Lopez  <xlopez at igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Fix IFrame DOM bindings API
+        https://bugs.webkit.org/show_bug.cgi?id=49980
+
+        Fix IFrame API naming. It needs special casing because of the two
+        consecutive capital letters.
+
+        * bindings/scripts/CodeGeneratorGObject.pm:
+
 2010-11-23  Shimeng (Simon) Wang  <swang at google.com>
 
         Reviewed by Steve Block.
diff --git a/WebCore/bindings/scripts/CodeGeneratorGObject.pm b/WebCore/bindings/scripts/CodeGeneratorGObject.pm
index dd5c05c..4c93899 100644
--- a/WebCore/bindings/scripts/CodeGeneratorGObject.pm
+++ b/WebCore/bindings/scripts/CodeGeneratorGObject.pm
@@ -110,6 +110,7 @@ sub FixUpDecamelizedName {
     # FIXME: try to merge this somehow with the fixes in ClassNameToGobjectType
     $classname =~ s/x_path/xpath/;
     $classname =~ s/web_kit/webkit/;
+    $classname =~ s/htmli_frame/html_iframe/;
 
     return $classname;
 }
@@ -118,8 +119,8 @@ sub ClassNameToGObjectType {
     my $className = shift;
     my $CLASS_NAME = uc(decamelize($className));
     # Fixup: with our prefix being 'WebKitDOM' decamelize can't get
-    # WebKitDOMCSS right, so we have to fix it manually (and there
-    # might be more like this in the future)
+    # WebKitDOMCSS and similar names right, so we have to fix it
+    # manually.
     $CLASS_NAME =~ s/DOMCSS/DOM_CSS/;
     $CLASS_NAME =~ s/DOMHTML/DOM_HTML/;
     $CLASS_NAME =~ s/DOMDOM/DOM_DOM/;
@@ -127,6 +128,7 @@ sub ClassNameToGObjectType {
     $CLASS_NAME =~ s/DOMX_PATH/DOM_XPATH/;
     $CLASS_NAME =~ s/DOM_WEB_KIT/DOM_WEBKIT/;
     $CLASS_NAME =~ s/DOMUI/DOM_UI/;
+    $CLASS_NAME =~ s/HTMLI_FRAME/HTML_IFRAME/;
     return $CLASS_NAME;
 }
 
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 6b1f293..b28ad7b 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-23  Xan Lopez  <xlopez at igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Fix IFrame DOM bindings API
+        https://bugs.webkit.org/show_bug.cgi?id=49980
+
+        * tests/testdomdocument.c:
+        (test_dom_document_garbage_collection): change to use the fixed
+        IFrame APIs.
+
 2010-11-23  Carlos Garcia Campos  <cgarcia at igalia.com>
 
         Reviewed by Martin Robinson.
diff --git a/WebKit/gtk/tests/testdomdocument.c b/WebKit/gtk/tests/testdomdocument.c
index 55fd55e..56e233f 100644
--- a/WebKit/gtk/tests/testdomdocument.c
+++ b/WebKit/gtk/tests/testdomdocument.c
@@ -263,13 +263,12 @@ static void test_dom_document_garbage_collection(DomDocumentFixture* fixture, gc
     WebKitDOMElement* iframe = webkit_dom_document_get_element_by_id(document, "iframe");
     g_assert(iframe);
 
-    /* FIXME: IFrame APIs have the 'i' in the wrong place */
     webkit_dom_element_set_attribute(iframe, "src", "data:<html><head></head></html>", NULL);
 
     while (g_main_context_pending(NULL))
         g_main_context_iteration(NULL, FALSE);
 
-    WebKitDOMDocument* iframeDocument = webkit_dom_htmli_frame_element_get_content_document(WEBKIT_DOM_HTMLI_FRAME_ELEMENT(iframe));
+    WebKitDOMDocument* iframeDocument = webkit_dom_html_iframe_element_get_content_document(WEBKIT_DOM_HTML_IFRAME_ELEMENT(iframe));
     g_assert(iframeDocument);
     head = webkit_dom_document_get_head(iframeDocument);
     g_assert(head);

-- 
WebKit Debian packaging