Changeset 16703 in webkit

Timestamp:

Oct 1, 2006 6:02:49 PM (18 years ago)

Author:

ggaren

Message:

LayoutTests:

Added test for the viewource attribute, which applies to <frame> and
<iframe> elements.

• fast/frames/viewsource-attribute-expected.txt: Added.
• fast/frames/viewsource-attribute.html: Added.

• fast/frames/frameElement-widthheight.html: Removed stray character.

WebCore:

Reviewed by Maciej.

More frame/iframe merging.

• Removed needWidgetUpdate and related code. needWidgetUpdate is always false, so this was dead code.
• Removed FIXME about setInViewSourceMode inside openURL(). openURL(), rather than attach(), is the correct place for setInViewSourceMode, because openURL() is the function that creates our frame.
• Moved IFRAME insertedIntoDocument() code into FRAME, and removed FRAME code that did the same thing in other places.
• Made FRAME's attach() method suffuciently generic so that IFRAME could call up to it, rather than skipping its superclass and calling up directly to ELEMENT.
• Changed a few IFRAME up-calls to ELEMENT into up-calls to FRAME.
• Replaced ad hoc frame loading code in FRAME::attach() with call to openURL(), the designated frame loading function.

Layout tests pass. I added a layout test for viewsource mode, since I
broke it in the course of writing this patch.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/frames/frameElement-widthheight.html (modified) (1 diff)
• LayoutTests/fast/frames/viewsource-attribute-expected.txt (added)
• LayoutTests/fast/frames/viewsource-attribute.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/HTMLFrameElement.cpp (modified) (3 diffs)
• WebCore/html/HTMLFrameElement.h (modified) (3 diffs)
• WebCore/html/HTMLIFrameElement.cpp (modified) (7 diffs)
• WebCore/html/HTMLIFrameElement.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2006-09-30  Geoffrey Garen  <ggaren@apple.com>
+
+        Added test for the viewource attribute, which applies to <frame> and
+        <iframe> elements.
+
+        * fast/frames/viewsource-attribute-expected.txt: Added.
+        * fast/frames/viewsource-attribute.html: Added.
+
+        * fast/frames/frameElement-widthheight.html: Removed stray character.
+
 2006-09-30  David Harrison  <harrison@apple.com>
 

trunk/LayoutTests/fast/frames/frameElement-widthheight.html

@@ -26 +26 @@
       
       ref = top.frame2.frameElement;
-      top.frameset.removeChild(top.frame2.frameElement);
+      top.frameset.removeChild(top.frame2.frameElement);
       if (ref.width != 0 || ref.height != 0) {
         log('Incorrect deleted frame size: ' + ref.width + 'x' + ref.height);

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-10-01  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by Maciej.
+        
+        More frame/iframe merging.
+        
+        - Removed needWidgetUpdate and related code. needWidgetUpdate is always
+        false, so this was dead code.
+        - Removed FIXME about setInViewSourceMode inside openURL(). openURL(), rather
+        than attach(), is the correct place for setInViewSourceMode, because
+        openURL() is the function that creates our frame.
+        - Moved IFRAME insertedIntoDocument() code into FRAME, and removed FRAME
+        code that did the same thing in other places.
+        - Made FRAME's attach() method suffuciently generic so that IFRAME could
+        call up to it, rather than skipping its superclass and calling up directly 
+        to ELEMENT.
+        - Changed a few IFRAME up-calls to ELEMENT into up-calls to FRAME.
+        - Replaced ad hoc frame loading code in FRAME::attach() with call to
+        openURL(), the designated frame loading function.
+
+        Layout tests pass. I added a layout test for viewsource mode, since I
+        broke it in the course of writing this patch.
+
 2006-10-01  Anders Carlsson  <acarlsson@apple.com>
 

trunk/WebCore/html/HTMLFrameElement.cpp

@@ -118 +118 @@
     document()->frame()->requestFrame(this, m_URL, m_name);
 
-    // FIXME: This is a relic from how HTMLIFrameElement used to do things.
-    // It's probably unnecessary, since viewsource mode doesn't really work,
-    // and both parseMappedAttribute and attach include the same check.
     if (contentFrame())
         contentFrame()->setInViewSourceMode(viewSourceMode());
@@ -184 +181 @@
 }
 
-void HTMLFrameElement::attach()
-{
+void HTMLFrameElement::insertedIntoDocument()
+{
+    HTMLElement::insertedIntoDocument();
+    
     m_name = getAttribute(nameAttr);
     if (m_name.isNull())
         m_name = getAttribute(idAttr);
 
-    // inherit default settings from parent frameset
-    for (Node *node = parentNode(); node; node = node->parentNode())
-        if (node->hasTagName(framesetTag)) {
-            HTMLFrameSetElement* frameset = static_cast<HTMLFrameSetElement*>(node);
+    if (Frame* parentFrame = document()->frame())
+        m_name = parentFrame->tree()->uniqueChildName(m_name);
+}
+
+void HTMLFrameElement::attach()
+{
+    HTMLElement::attach();
+    
+    if (hasTagName(frameTag)) {
+        if (HTMLFrameSetElement* frameSetElement = containingFrameSetElement()) {
             if (!m_frameBorderSet)
-                m_frameBorder = frameset->frameBorder();
+                m_frameBorder = frameSetElement->frameBorder();
             if (!m_noResize)
-                m_noResize = frameset->noResize();
-            break;
+                m_noResize = frameSetElement->noResize();
         }
-
-    HTMLElement::attach();
-
-    if (!renderer())
-        return;
-
-    Frame* frame = document()->frame();
-
-    if (!frame)
-        return;
-
-    AtomicString relativeURL = m_URL;
-    if (relativeURL.isEmpty())
-        relativeURL = "about:blank";
-
-    m_name = frame->tree()->uniqueChildName(m_name);
-
-    // load the frame contents
-    frame->requestFrame(this, relativeURL, m_name);
-    
-    if (contentFrame())
-        contentFrame()->setInViewSourceMode(viewSourceMode());
+    }
+        
+    if (!contentFrame())
+        openURL();
 }
 
@@ -308 +294 @@
 }
 
+HTMLFrameSetElement* HTMLFrameElement::containingFrameSetElement() const
+{
+    for (Node* node = parentNode(); node; node = node->parentNode())
+        if (node->hasTagName(framesetTag))
+            return static_cast<HTMLFrameSetElement*>(node);
+
+    return 0;
+}
+
 bool HTMLFrameElement::isURLAttribute(Attribute *attr) const
 {

trunk/WebCore/html/HTMLFrameElement.h

@@ -33 +33 @@
 
 class Frame;
+class HTMLFrameSetElement;
 
 class HTMLFrameElement : public HTMLElement
@@ -50 +51 @@
   
     virtual void parseMappedAttribute(MappedAttribute*);
+
     virtual void attach();
-    void close();
-    virtual void willRemove();
     virtual void detach();
+
     virtual bool rendererIsNeeded(RenderStyle*);
     virtual RenderObject *createRenderer(RenderArena*, RenderStyle*);
+    
+    void insertedIntoDocument();
+    virtual void willRemove();
+
+    void close();
 
     bool noResize() { return m_noResize; }
@@ -66 +72 @@
     Frame* contentFrame() const;
     Document* contentDocument() const;
+    HTMLFrameSetElement* containingFrameSetElement() const;
     
     virtual bool isURLAttribute(Attribute*) const;

trunk/WebCore/html/HTMLIFrameElement.cpp

@@ -40 +40 @@
 HTMLIFrameElement::HTMLIFrameElement(Document* doc)
     : HTMLFrameElement(iframeTag, doc)
-    , needWidgetUpdate(false)
 {
     m_frameBorder = false;
@@ -61 +60 @@
     }
     
-    return HTMLElement::mapToEntry(attrName, result);
+    return HTMLFrameElement::mapToEntry(attrName, result);
 }
 
@@ -86 +85 @@
 void HTMLIFrameElement::insertedIntoDocument()
 {
+    HTMLFrameElement::insertedIntoDocument();
+    
     if (document()->isHTMLDocument()) {
         HTMLDocument *doc = static_cast<HTMLDocument *>(document());
@@ -91 +92 @@
     }
 
-    HTMLElement::insertedIntoDocument();
-    
-    // Load the frame
-    m_name = getAttribute(nameAttr);
-    if (m_name.isNull())
-        m_name = getAttribute(idAttr);
-    
-    if (Frame* parentFrame = document()->frame()) {
-        m_name = parentFrame->tree()->uniqueChildName(m_name);
-        
-        openURL();
-    }    
+    openURL();
 }
 
@@ -123 +113 @@
     }
 
-    HTMLElement::removedFromDocument();
+    HTMLFrameElement::removedFromDocument();
 }
 
@@ -139 +129 @@
 void HTMLIFrameElement::attach()
 {
-    HTMLElement::attach();
+    HTMLFrameElement::attach();
 
-    RenderPartObject* renderPart = static_cast<RenderPartObject*>(renderer());
-
-    if (renderPart) {        
-        if (!contentFrame())
-            openURL();
-
+    if (RenderPartObject* renderPart = static_cast<RenderPartObject*>(renderer())) {        
         if (contentFrame()) {
             renderPart->setWidget(contentFrame()->view());
             renderPart->updateWidget();
-            needWidgetUpdate = false;
         }
     }
@@ -158 +142 @@
 {
     HTMLElement::detach();
-}
-
-void HTMLIFrameElement::recalcStyle( StyleChange ch )
-{
-    if (needWidgetUpdate) {
-        if (renderer())
-            static_cast<RenderPartObject*>(renderer())->updateWidget();
-        needWidgetUpdate = false;
-    }
-    HTMLElement::recalcStyle( ch );
 }
 

trunk/WebCore/html/HTMLIFrameElement.h

@@ -51 +51 @@
     virtual bool rendererIsNeeded(RenderStyle*);
     virtual RenderObject *createRenderer(RenderArena*, RenderStyle*);
-    virtual void recalcStyle(StyleChange);
     
     virtual bool isURLAttribute(Attribute*) const;
@@ -64 +63 @@
     void setWidth(const String&);
 
-protected:
-    bool needWidgetUpdate;
-
- private:
+private:
     String oldNameAttr;
 };