Changeset 57892 in webkit

Timestamp:

Apr 20, 2010 8:06:28 AM (14 years ago)

Author:

Simon Fraser

Message:

2010-04-20 Simon Fraser <Simon Fraser>

Reviewed by Dan Bernstein.

Clean up RenderPart/RenderPartObject/RenderFrame/RenderEmbeddedObject
​https://bugs.webkit.org/show_bug.cgi?id=37741

Make Frame::ownerRenderer() return a RenderFrameBase* rather than a
RenderPart*, and add the necessary toRenderFrameBase() and isRenderFrameBase().

• WebCore.xcodeproj/project.pbxproj:
• editing/Editor.cpp: (WebCore::Editor::insideVisibleArea):
• page/Frame.cpp: (WebCore::Frame::ownerRenderer):
• page/Frame.h:
• page/FrameView.cpp: (WebCore::FrameView::~FrameView): (WebCore::FrameView::clear): (WebCore::FrameView::invalidateRect): (WebCore::FrameView::createScrollbar):
• rendering/RenderFrameBase.h: (WebCore::RenderFrameBase::isRenderFrameBase): (WebCore::toRenderFrameBase):
• rendering/RenderObject.h: (WebCore::RenderObject::isRenderFrameBase):

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (1 diff)
• WebCore/editing/Editor.cpp (modified) (3 diffs)
• WebCore/page/Frame.cpp (modified) (3 diffs)
• WebCore/page/Frame.h (modified) (2 diffs)
• WebCore/page/FrameView.cpp (modified) (5 diffs)
• WebCore/rendering/RenderFrameBase.h (modified) (1 diff)
• WebCore/rendering/RenderObject.h (modified) (1 diff)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebFrame.mm (modified) (2 diffs)
• WebKit/mac/WebView/WebFrameView.mm (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-20  Simon Fraser  <simon.fraser@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Clean up RenderPart/RenderPartObject/RenderFrame/RenderEmbeddedObject
+        https://bugs.webkit.org/show_bug.cgi?id=37741
+
+        Make Frame::ownerRenderer() return a RenderFrameBase* rather than a
+        RenderPart*, and add the necessary toRenderFrameBase() and isRenderFrameBase().
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * editing/Editor.cpp:
+        (WebCore::Editor::insideVisibleArea):
+        * page/Frame.cpp:
+        (WebCore::Frame::ownerRenderer):
+        * page/Frame.h:
+        * page/FrameView.cpp:
+        (WebCore::FrameView::~FrameView):
+        (WebCore::FrameView::clear):
+        (WebCore::FrameView::invalidateRect):
+        (WebCore::FrameView::createScrollbar):
+        * rendering/RenderFrameBase.h:
+        (WebCore::RenderFrameBase::isRenderFrameBase):
+        (WebCore::toRenderFrameBase):
+        * rendering/RenderObject.h:
+        (WebCore::RenderObject::isRenderFrameBase):
+
 2010-04-20  Jay Civelli  <jcivelli@chromium.org>
 

trunk/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -204 +204 @@
                 0FCF332F0F2B9A25004B6795 /* WebLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FCF332B0F2B9A25004B6795 /* WebLayer.h */; };
                 0FD3080E117CF7E700A791F7 /* RenderFrameBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FD3080C117CF7E700A791F7 /* RenderFrameBase.cpp */; };
-                0FD3080F117CF7E700A791F7 /* RenderFrameBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FD3080D117CF7E700A791F7 /* RenderFrameBase.h */; };
+                0FD3080F117CF7E700A791F7 /* RenderFrameBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FD3080D117CF7E700A791F7 /* RenderFrameBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 0FD308D5117D168500A791F7 /* RenderIFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FD308D3117D168400A791F7 /* RenderIFrame.cpp */; };
                 0FD308D6117D168500A791F7 /* RenderIFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FD308D4117D168400A791F7 /* RenderIFrame.h */; };

trunk/WebCore/editing/Editor.cpp

@@ -61 +61 @@
 #include "RemoveFormatCommand.h"
 #include "RenderBlock.h"
-#include "RenderPart.h"
+#include "RenderFrameBase.h"
 #include "ReplaceSelectionCommand.h"
 #include "Sound.h"
@@ -2748 +2748 @@
         return true;
     
-    RenderPart* renderer = frame->ownerRenderer();
+    RenderFrameBase* renderer = frame->ownerRenderer();
     if (!renderer)
         return false;
@@ -2777 +2777 @@
         return true;
     
-    RenderPart* renderer = frame->ownerRenderer();
+    RenderFrameBase* renderer = frame->ownerRenderer();
     if (!renderer)
         return false;

trunk/WebCore/page/Frame.cpp

@@ -65 +65 @@
 #include "PageGroup.h"
 #include "RegularExpression.h"
-#include "RenderPart.h"
+#include "RenderFrameBase.h"
 #include "RenderTableCell.h"
 #include "RenderTextControl.h"
@@ -1118 +1118 @@
 }
 
-RenderPart* Frame::ownerRenderer() const
+RenderFrameBase* Frame::ownerRenderer() const
 {
     HTMLFrameOwnerElement* ownerElement = m_ownerElement;
@@ -1130 +1130 @@
     // since m_ownerElement would be 0 when the load is canceled.
     // https://bugs.webkit.org/show_bug.cgi?id=18585
-    if (!object->isRenderPart())
+    if (!object->isRenderFrameBase())
         return 0;
-    return toRenderPart(object);
+    return toRenderFrameBase(object);
 }
 

trunk/WebCore/page/Frame.h

@@ -68 +68 @@
     class HTMLTableCellElement;
     class RegularExpression;
-    class RenderPart;
+    class RenderFrameBase;
     class TiledBackingStore;
 
@@ -112 +112 @@
 
         RenderView* contentRenderer() const; // root renderer for the document contained in this frame
-        RenderPart* ownerRenderer() const; // renderer for the element that contains this frame
+        RenderFrameBase* ownerRenderer() const; // renderer for the element that contains this frame
 
         bool isDisconnected() const;

trunk/WebCore/page/FrameView.cpp

@@ -48 +48 @@
 #include "OverflowEvent.h"
 #include "RenderEmbeddedObject.h"
-#include "RenderPart.h"
+#include "RenderFrameBase.h"
 #include "RenderScrollbar.h"
 #include "RenderScrollbarPart.h"
@@ -171 +171 @@
     if (m_frame) {
         ASSERT(m_frame->view() != this || !m_frame->contentRenderer());
-        RenderPart* renderer = m_frame->ownerRenderer();
+        RenderFrameBase* renderer = m_frame->ownerRenderer();
         if (renderer && renderer->widget() == this)
             renderer->setWidget(0);
@@ -281 +281 @@
 
     if (m_frame) {
-        if (RenderPart* renderer = m_frame->ownerRenderer())
+        if (RenderFrameBase* renderer = m_frame->ownerRenderer())
             renderer->viewCleared();
     }
@@ -304 +304 @@
         return;
 
-    RenderPart* renderer = m_frame->ownerRenderer();
+    RenderFrameBase* renderer = m_frame->ownerRenderer();
     if (!renderer)
         return;
@@ -376 +376 @@
         
     // If we have an owning iframe/frame element, then it can set the custom scrollbar also.
-    RenderPart* frameRenderer = m_frame->ownerRenderer();
+    RenderFrameBase* frameRenderer = m_frame->ownerRenderer();
     if (frameRenderer && frameRenderer->style()->hasPseudoStyle(SCROLLBAR))
         return RenderScrollbar::createCustomScrollbar(this, orientation, frameRenderer);

trunk/WebCore/rendering/RenderFrameBase.h

@@ -38 +38 @@
 public:
     void layoutWithFlattening(bool fixedWidth, bool fixedHeight);
+
+private:
+    virtual bool isRenderFrameBase() const { return true; }
 };
+
+inline RenderFrameBase* toRenderFrameBase(RenderObject* object)
+{
+    ASSERT(!object || object->isRenderFrameBase());
+    return static_cast<RenderFrameBase*>(object);
+}
+
+inline const RenderFrameBase* toRenderFrameBase(const RenderObject* object)
+{
+    ASSERT(!object || object->isRenderFrameBase());
+    return static_cast<const RenderFrameBase*>(object);
+}
+
+// This will catch anyone doing an unnecessary cast.
+void toRenderFrameBase(const RenderFrameBase*);
+
 
 } // namespace WebCore

trunk/WebCore/rendering/RenderObject.h

@@ -283 +283 @@
     virtual bool isRenderBlock() const { return false; }
     virtual bool isRenderButton() const { return false; }
+    virtual bool isRenderFrameBase() const { return false; }
     virtual bool isRenderImage() const { return false; }
     virtual bool isRenderInline() const { return false; }

trunk/WebKit/mac/ChangeLog

@@ +1 @@
+2010-04-20  Simon Fraser  <simon.fraser@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Clean up RenderPart/RenderPartObject/RenderFrame/RenderEmbeddedObject
+        https://bugs.webkit.org/show_bug.cgi?id=37741
+        
+        Make Frame::ownerRenderer() return a RenderFrameBase* rather than a
+        RenderPart*, and add the necessary toRenderFrameBase() and isRenderFrameBase().
+
+        * WebView/WebFrame.mm:
+        (-[WebFrame _getVisibleRect:]):
+        * WebView/WebFrameView.mm:
+        (-[WebFrameView _install]):
+
 2010-04-19  Dan Bernstein  <mitz@apple.com>
 

trunk/WebKit/mac/WebView/WebFrame.mm

@@ -77 +77 @@
 #import <WebCore/PrintContext.h>
 #import <WebCore/RenderLayer.h>
-#import <WebCore/RenderPart.h>
+#import <WebCore/RenderFrameBase.h>
 #import <WebCore/RenderView.h>
 #import <WebCore/ReplaceSelectionCommand.h>
@@ -600 +600 @@
 {
     ASSERT_ARG(rect, rect);
-    if (RenderPart* ownerRenderer = _private->coreFrame->ownerRenderer()) {
+    if (RenderFrameBase* ownerRenderer = _private->coreFrame->ownerRenderer()) {
         if (ownerRenderer->needsLayout())
             return NO;

trunk/WebKit/mac/WebView/WebFrameView.mm

@@ -63 +63 @@
 #import <WebCore/HistoryItem.h>
 #import <WebCore/Page.h>
-#import <WebCore/RenderPart.h>
+#import <WebCore/RenderFrameBase.h>
 #import <WebCore/ThreadCheck.h>
 #import <WebCore/WebCoreFrameView.h>
@@ -281 +281 @@
 
     // FIXME: Frame tries to do this too. Is this code needed?
-    if (RenderPart* owner = frame->ownerRenderer()) {
+    if (RenderFrameBase* owner = frame->ownerRenderer()) {
         owner->setWidget(view);
         // Now the render part owns the view, so we don't any more.