Changeset 57892 in webkit
- Timestamp:
- Apr 20, 2010 8:06:28 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r57891 r57892 1 2010-04-20 Simon Fraser <simon.fraser@apple.com> 2 3 Reviewed by Dan Bernstein. 4 5 Clean up RenderPart/RenderPartObject/RenderFrame/RenderEmbeddedObject 6 https://bugs.webkit.org/show_bug.cgi?id=37741 7 8 Make Frame::ownerRenderer() return a RenderFrameBase* rather than a 9 RenderPart*, and add the necessary toRenderFrameBase() and isRenderFrameBase(). 10 11 * WebCore.xcodeproj/project.pbxproj: 12 * editing/Editor.cpp: 13 (WebCore::Editor::insideVisibleArea): 14 * page/Frame.cpp: 15 (WebCore::Frame::ownerRenderer): 16 * page/Frame.h: 17 * page/FrameView.cpp: 18 (WebCore::FrameView::~FrameView): 19 (WebCore::FrameView::clear): 20 (WebCore::FrameView::invalidateRect): 21 (WebCore::FrameView::createScrollbar): 22 * rendering/RenderFrameBase.h: 23 (WebCore::RenderFrameBase::isRenderFrameBase): 24 (WebCore::toRenderFrameBase): 25 * rendering/RenderObject.h: 26 (WebCore::RenderObject::isRenderFrameBase): 27 1 28 2010-04-20 Jay Civelli <jcivelli@chromium.org> 2 29 -
trunk/WebCore/WebCore.xcodeproj/project.pbxproj
r57886 r57892 204 204 0FCF332F0F2B9A25004B6795 /* WebLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FCF332B0F2B9A25004B6795 /* WebLayer.h */; }; 205 205 0FD3080E117CF7E700A791F7 /* RenderFrameBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FD3080C117CF7E700A791F7 /* RenderFrameBase.cpp */; }; 206 0FD3080F117CF7E700A791F7 /* RenderFrameBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FD3080D117CF7E700A791F7 /* RenderFrameBase.h */; };206 0FD3080F117CF7E700A791F7 /* RenderFrameBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FD3080D117CF7E700A791F7 /* RenderFrameBase.h */; settings = {ATTRIBUTES = (Private, ); }; }; 207 207 0FD308D5117D168500A791F7 /* RenderIFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FD308D3117D168400A791F7 /* RenderIFrame.cpp */; }; 208 208 0FD308D6117D168500A791F7 /* RenderIFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FD308D4117D168400A791F7 /* RenderIFrame.h */; }; -
trunk/WebCore/editing/Editor.cpp
r54368 r57892 61 61 #include "RemoveFormatCommand.h" 62 62 #include "RenderBlock.h" 63 #include "Render Part.h"63 #include "RenderFrameBase.h" 64 64 #include "ReplaceSelectionCommand.h" 65 65 #include "Sound.h" … … 2748 2748 return true; 2749 2749 2750 Render Part* renderer = frame->ownerRenderer();2750 RenderFrameBase* renderer = frame->ownerRenderer(); 2751 2751 if (!renderer) 2752 2752 return false; … … 2777 2777 return true; 2778 2778 2779 Render Part* renderer = frame->ownerRenderer();2779 RenderFrameBase* renderer = frame->ownerRenderer(); 2780 2780 if (!renderer) 2781 2781 return false; -
trunk/WebCore/page/Frame.cpp
r57277 r57892 65 65 #include "PageGroup.h" 66 66 #include "RegularExpression.h" 67 #include "Render Part.h"67 #include "RenderFrameBase.h" 68 68 #include "RenderTableCell.h" 69 69 #include "RenderTextControl.h" … … 1118 1118 } 1119 1119 1120 Render Part* Frame::ownerRenderer() const1120 RenderFrameBase* Frame::ownerRenderer() const 1121 1121 { 1122 1122 HTMLFrameOwnerElement* ownerElement = m_ownerElement; … … 1130 1130 // since m_ownerElement would be 0 when the load is canceled. 1131 1131 // https://bugs.webkit.org/show_bug.cgi?id=18585 1132 if (!object->isRender Part())1132 if (!object->isRenderFrameBase()) 1133 1133 return 0; 1134 return toRender Part(object);1134 return toRenderFrameBase(object); 1135 1135 } 1136 1136 -
trunk/WebCore/page/Frame.h
r57277 r57892 68 68 class HTMLTableCellElement; 69 69 class RegularExpression; 70 class Render Part;70 class RenderFrameBase; 71 71 class TiledBackingStore; 72 72 … … 112 112 113 113 RenderView* contentRenderer() const; // root renderer for the document contained in this frame 114 Render Part* ownerRenderer() const; // renderer for the element that contains this frame114 RenderFrameBase* ownerRenderer() const; // renderer for the element that contains this frame 115 115 116 116 bool isDisconnected() const; -
trunk/WebCore/page/FrameView.cpp
r57165 r57892 48 48 #include "OverflowEvent.h" 49 49 #include "RenderEmbeddedObject.h" 50 #include "Render Part.h"50 #include "RenderFrameBase.h" 51 51 #include "RenderScrollbar.h" 52 52 #include "RenderScrollbarPart.h" … … 171 171 if (m_frame) { 172 172 ASSERT(m_frame->view() != this || !m_frame->contentRenderer()); 173 Render Part* renderer = m_frame->ownerRenderer();173 RenderFrameBase* renderer = m_frame->ownerRenderer(); 174 174 if (renderer && renderer->widget() == this) 175 175 renderer->setWidget(0); … … 281 281 282 282 if (m_frame) { 283 if (Render Part* renderer = m_frame->ownerRenderer())283 if (RenderFrameBase* renderer = m_frame->ownerRenderer()) 284 284 renderer->viewCleared(); 285 285 } … … 304 304 return; 305 305 306 Render Part* renderer = m_frame->ownerRenderer();306 RenderFrameBase* renderer = m_frame->ownerRenderer(); 307 307 if (!renderer) 308 308 return; … … 376 376 377 377 // If we have an owning iframe/frame element, then it can set the custom scrollbar also. 378 Render Part* frameRenderer = m_frame->ownerRenderer();378 RenderFrameBase* frameRenderer = m_frame->ownerRenderer(); 379 379 if (frameRenderer && frameRenderer->style()->hasPseudoStyle(SCROLLBAR)) 380 380 return RenderScrollbar::createCustomScrollbar(this, orientation, frameRenderer); -
trunk/WebCore/rendering/RenderFrameBase.h
r57866 r57892 38 38 public: 39 39 void layoutWithFlattening(bool fixedWidth, bool fixedHeight); 40 41 private: 42 virtual bool isRenderFrameBase() const { return true; } 40 43 }; 44 45 inline RenderFrameBase* toRenderFrameBase(RenderObject* object) 46 { 47 ASSERT(!object || object->isRenderFrameBase()); 48 return static_cast<RenderFrameBase*>(object); 49 } 50 51 inline const RenderFrameBase* toRenderFrameBase(const RenderObject* object) 52 { 53 ASSERT(!object || object->isRenderFrameBase()); 54 return static_cast<const RenderFrameBase*>(object); 55 } 56 57 // This will catch anyone doing an unnecessary cast. 58 void toRenderFrameBase(const RenderFrameBase*); 59 41 60 42 61 } // namespace WebCore -
trunk/WebCore/rendering/RenderObject.h
r57511 r57892 283 283 virtual bool isRenderBlock() const { return false; } 284 284 virtual bool isRenderButton() const { return false; } 285 virtual bool isRenderFrameBase() const { return false; } 285 286 virtual bool isRenderImage() const { return false; } 286 287 virtual bool isRenderInline() const { return false; } -
trunk/WebKit/mac/ChangeLog
r57856 r57892 1 2010-04-20 Simon Fraser <simon.fraser@apple.com> 2 3 Reviewed by Dan Bernstein. 4 5 Clean up RenderPart/RenderPartObject/RenderFrame/RenderEmbeddedObject 6 https://bugs.webkit.org/show_bug.cgi?id=37741 7 8 Make Frame::ownerRenderer() return a RenderFrameBase* rather than a 9 RenderPart*, and add the necessary toRenderFrameBase() and isRenderFrameBase(). 10 11 * WebView/WebFrame.mm: 12 (-[WebFrame _getVisibleRect:]): 13 * WebView/WebFrameView.mm: 14 (-[WebFrameView _install]): 15 1 16 2010-04-19 Dan Bernstein <mitz@apple.com> 2 17 -
trunk/WebKit/mac/WebView/WebFrame.mm
r57738 r57892 77 77 #import <WebCore/PrintContext.h> 78 78 #import <WebCore/RenderLayer.h> 79 #import <WebCore/Render Part.h>79 #import <WebCore/RenderFrameBase.h> 80 80 #import <WebCore/RenderView.h> 81 81 #import <WebCore/ReplaceSelectionCommand.h> … … 600 600 { 601 601 ASSERT_ARG(rect, rect); 602 if (Render Part* ownerRenderer = _private->coreFrame->ownerRenderer()) {602 if (RenderFrameBase* ownerRenderer = _private->coreFrame->ownerRenderer()) { 603 603 if (ownerRenderer->needsLayout()) 604 604 return NO; -
trunk/WebKit/mac/WebView/WebFrameView.mm
r56008 r57892 63 63 #import <WebCore/HistoryItem.h> 64 64 #import <WebCore/Page.h> 65 #import <WebCore/Render Part.h>65 #import <WebCore/RenderFrameBase.h> 66 66 #import <WebCore/ThreadCheck.h> 67 67 #import <WebCore/WebCoreFrameView.h> … … 281 281 282 282 // FIXME: Frame tries to do this too. Is this code needed? 283 if (Render Part* owner = frame->ownerRenderer()) {283 if (RenderFrameBase* owner = frame->ownerRenderer()) { 284 284 owner->setWidget(view); 285 285 // Now the render part owns the view, so we don't any more.
Note: See TracChangeset
for help on using the changeset viewer.