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

[simon.fraser at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit d6a3be24b2fa9b7317a889b43c83a4bd08396700
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 7 21:47:46 2010 +0000

    2010-01-07  Simon Fraser  <simon.fraser at apple.com>
    
            Reviewed by Darin Adler.
    
            https://bugs.webkit.org/show_bug.cgi?id=33338
            Create a renderer for <object> and <embed>
    
            First part of this change: renderPartObject->updateWidget() is a no-op for iframe elements,
            so we don't need to call it here, and can thus remove the attach() override entirely.
    
            * html/HTMLIFrameElement.cpp:
            * html/HTMLIFrameElement.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52946 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 263f570..c01fc63 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-07  Simon Fraser  <simon.fraser at apple.com>
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=33338
+        Create a renderer for <object> and <embed>
+
+        First part of this change: renderPartObject->updateWidget() is a no-op for iframe elements,
+        so we don't need to call it here, and can thus remove the attach() override entirely.
+
+        * html/HTMLIFrameElement.cpp:
+        * html/HTMLIFrameElement.h:
+
 2009-01-07  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Timothy Hatcher.
diff --git a/WebCore/html/HTMLIFrameElement.cpp b/WebCore/html/HTMLIFrameElement.cpp
index a2f287e..359bdb7 100644
--- a/WebCore/html/HTMLIFrameElement.cpp
+++ b/WebCore/html/HTMLIFrameElement.cpp
@@ -155,14 +155,6 @@ void HTMLIFrameElement::removedFromDocument()
     HTMLFrameElementBase::removedFromDocument();
 }
 
-void HTMLIFrameElement::attach()
-{
-    HTMLFrameElementBase::attach();
-
-    if (RenderPartObject* renderPartObject = toRenderPartObject(renderer()))
-        renderPartObject->updateWidget(false);
-}
-
 bool HTMLIFrameElement::isURLAttribute(Attribute* attr) const
 {
     return attr->name() == srcAttr;
diff --git a/WebCore/html/HTMLIFrameElement.h b/WebCore/html/HTMLIFrameElement.h
index f1c6a35..c708456 100644
--- a/WebCore/html/HTMLIFrameElement.h
+++ b/WebCore/html/HTMLIFrameElement.h
@@ -44,8 +44,6 @@ private:
     virtual void insertedIntoDocument();
     virtual void removedFromDocument();
     
-    virtual void attach();
-
     virtual bool rendererIsNeeded(RenderStyle*);
     virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
     

-- 
WebKit Debian packaging