Changeset 57895 in webkit


Ignore:
Timestamp:
Apr 20, 2010 9:09:52 AM (14 years ago)
Author:
Simon Fraser
Message:

2010-04-20 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r57892.
​http://trac.webkit.org/changeset/57892
​https://bugs.webkit.org/show_bug.cgi?id=37864

Caused an assertion in Mac builds (Requested by smfr on
#webkit).

  • 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:
  • rendering/RenderObject.h:

2010-04-20 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r57892.
​http://trac.webkit.org/changeset/57892
​https://bugs.webkit.org/show_bug.cgi?id=37864

Caused an assertion in Mac builds (Requested by smfr on
#webkit).

  • WebView/WebFrame.mm: (-[WebFrame _getVisibleRect:]):
  • WebView/WebFrameView.mm: (-[WebFrameView _install]):
Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r57893 r57895  
     12010-04-20  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r57892.
     4        http://trac.webkit.org/changeset/57892
     5        https://bugs.webkit.org/show_bug.cgi?id=37864
     6
     7        Caused an assertion in Mac builds (Requested by smfr on
     8        #webkit).
     9
     10        * WebCore.xcodeproj/project.pbxproj:
     11        * editing/Editor.cpp:
     12        (WebCore::Editor::insideVisibleArea):
     13        * page/Frame.cpp:
     14        (WebCore::Frame::ownerRenderer):
     15        * page/Frame.h:
     16        * page/FrameView.cpp:
     17        (WebCore::FrameView::~FrameView):
     18        (WebCore::FrameView::clear):
     19        (WebCore::FrameView::invalidateRect):
     20        (WebCore::FrameView::createScrollbar):
     21        * rendering/RenderFrameBase.h:
     22        * rendering/RenderObject.h:
     23
    1242010-04-20  Jakub Wieczorek  <jwieczorek@webkit.org>
    225

  • trunk/WebCore/WebCore.xcodeproj/project.pbxproj

    r57892 r57895  
    204204                0FCF332F0F2B9A25004B6795 /* WebLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FCF332B0F2B9A25004B6795 /* WebLayer.h */; };
    205205                0FD3080E117CF7E700A791F7 /* RenderFrameBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FD3080C117CF7E700A791F7 /* RenderFrameBase.cpp */; };
    206                 0FD3080F117CF7E700A791F7 /* RenderFrameBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FD3080D117CF7E700A791F7 /* RenderFrameBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
     206                0FD3080F117CF7E700A791F7 /* RenderFrameBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FD3080D117CF7E700A791F7 /* RenderFrameBase.h */; };
    207207                0FD308D5117D168500A791F7 /* RenderIFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FD308D3117D168400A791F7 /* RenderIFrame.cpp */; };
    208208                0FD308D6117D168500A791F7 /* RenderIFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FD308D4117D168400A791F7 /* RenderIFrame.h */; };

  • trunk/WebCore/editing/Editor.cpp

    r57892 r57895  
    6161#include "RemoveFormatCommand.h"
    6262#include "RenderBlock.h"
    63 #include "RenderFrameBase.h"
     63#include "RenderPart.h"
    6464#include "ReplaceSelectionCommand.h"
    6565#include "Sound.h"
    … …  
    27482748        return true;
    27492749   
    2750     RenderFrameBase* renderer = frame->ownerRenderer();
     2750    RenderPart* renderer = frame->ownerRenderer();
    27512751    if (!renderer)
    27522752        return false;
    … …  
    27772777        return true;
    27782778   
    2779     RenderFrameBase* renderer = frame->ownerRenderer();
     2779    RenderPart* renderer = frame->ownerRenderer();
    27802780    if (!renderer)
    27812781        return false;

  • trunk/WebCore/page/Frame.cpp

    r57892 r57895  
    6565#include "PageGroup.h"
    6666#include "RegularExpression.h"
    67 #include "RenderFrameBase.h"
     67#include "RenderPart.h"
    6868#include "RenderTableCell.h"
    6969#include "RenderTextControl.h"
    … …  
    11181118}
    11191119
    1120 RenderFrameBase* Frame::ownerRenderer() const
     1120RenderPart* Frame::ownerRenderer() const
    11211121{
    11221122    HTMLFrameOwnerElement* ownerElement = m_ownerElement;
    … …  
    11301130    // since m_ownerElement would be 0 when the load is canceled.
    11311131    // https://bugs.webkit.org/show_bug.cgi?id=18585
    1132     if (!object->isRenderFrameBase())
     1132    if (!object->isRenderPart())
    11331133        return 0;
    1134     return toRenderFrameBase(object);
     1134    return toRenderPart(object);
    11351135}
    11361136

  • trunk/WebCore/page/Frame.h

    r57892 r57895  
    6868    class HTMLTableCellElement;
    6969    class RegularExpression;
    70     class RenderFrameBase;
     70    class RenderPart;
    7171    class TiledBackingStore;
    7272
    … …  
    112112
    113113        RenderView* contentRenderer() const; // root renderer for the document contained in this frame
    114         RenderFrameBase* ownerRenderer() const; // renderer for the element that contains this frame
     114        RenderPart* ownerRenderer() const; // renderer for the element that contains this frame
    115115
    116116        bool isDisconnected() const;

  • trunk/WebCore/page/FrameView.cpp

    r57892 r57895  
    4848#include "OverflowEvent.h"
    4949#include "RenderEmbeddedObject.h"
    50 #include "RenderFrameBase.h"
     50#include "RenderPart.h"
    5151#include "RenderScrollbar.h"
    5252#include "RenderScrollbarPart.h"
    … …  
    171171    if (m_frame) {
    172172        ASSERT(m_frame->view() != this || !m_frame->contentRenderer());
    173         RenderFrameBase* renderer = m_frame->ownerRenderer();
     173        RenderPart* renderer = m_frame->ownerRenderer();
    174174        if (renderer && renderer->widget() == this)
    175175            renderer->setWidget(0);
    … …  
    281281
    282282    if (m_frame) {
    283         if (RenderFrameBase* renderer = m_frame->ownerRenderer())
     283        if (RenderPart* renderer = m_frame->ownerRenderer())
    284284            renderer->viewCleared();
    285285    }
    … …  
    304304        return;
    305305
    306     RenderFrameBase* renderer = m_frame->ownerRenderer();
     306    RenderPart* renderer = m_frame->ownerRenderer();
    307307    if (!renderer)
    308308        return;
    … …  
    376376       
    377377    // If we have an owning iframe/frame element, then it can set the custom scrollbar also.
    378     RenderFrameBase* frameRenderer = m_frame->ownerRenderer();
     378    RenderPart* frameRenderer = m_frame->ownerRenderer();
    379379    if (frameRenderer && frameRenderer->style()->hasPseudoStyle(SCROLLBAR))
    380380        return RenderScrollbar::createCustomScrollbar(this, orientation, frameRenderer);

  • trunk/WebCore/rendering/RenderFrameBase.h

    r57892 r57895  
    3838public:
    3939    void layoutWithFlattening(bool fixedWidth, bool fixedHeight);
    40 
    41 private:
    42     virtual bool isRenderFrameBase() const { return true; }
    4340};
    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 
    6041
    6142} // namespace WebCore

  • trunk/WebCore/rendering/RenderObject.h

    r57892 r57895  
    283283    virtual bool isRenderBlock() const { return false; }
    284284    virtual bool isRenderButton() const { return false; }
    285     virtual bool isRenderFrameBase() const { return false; }
    286285    virtual bool isRenderImage() const { return false; }
    287286    virtual bool isRenderInline() const { return false; }

  • trunk/WebKit/mac/ChangeLog

    r57892 r57895  
     12010-04-20  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r57892.
     4        http://trac.webkit.org/changeset/57892
     5        https://bugs.webkit.org/show_bug.cgi?id=37864
     6
     7        Caused an assertion in Mac builds (Requested by smfr on
     8        #webkit).
     9
     10        * WebView/WebFrame.mm:
     11        (-[WebFrame _getVisibleRect:]):
     12        * WebView/WebFrameView.mm:
     13        (-[WebFrameView _install]):
     14
    1152010-04-20  Simon Fraser  <simon.fraser@apple.com>
    216

  • trunk/WebKit/mac/WebView/WebFrame.mm

    r57892 r57895  
    7777#import <WebCore/PrintContext.h>
    7878#import <WebCore/RenderLayer.h>
    79 #import <WebCore/RenderFrameBase.h>
     79#import <WebCore/RenderPart.h>
    8080#import <WebCore/RenderView.h>
    8181#import <WebCore/ReplaceSelectionCommand.h>
    … …  
    600600{
    601601    ASSERT_ARG(rect, rect);
    602     if (RenderFrameBase* ownerRenderer = _private->coreFrame->ownerRenderer()) {
     602    if (RenderPart* ownerRenderer = _private->coreFrame->ownerRenderer()) {
    603603        if (ownerRenderer->needsLayout())
    604604            return NO;

  • trunk/WebKit/mac/WebView/WebFrameView.mm

    r57892 r57895  
    6363#import <WebCore/HistoryItem.h>
    6464#import <WebCore/Page.h>
    65 #import <WebCore/RenderFrameBase.h>
     65#import <WebCore/RenderPart.h>
    6666#import <WebCore/ThreadCheck.h>
    6767#import <WebCore/WebCoreFrameView.h>
    … …  
    281281
    282282    // FIXME: Frame tries to do this too. Is this code needed?
    283     if (RenderFrameBase* owner = frame->ownerRenderer()) {
     283    if (RenderPart* owner = frame->ownerRenderer()) {
    284284        owner->setWidget(view);
    285285        // Now the render part owns the view, so we don't any more.
Note: See TracChangeset for help on using the changeset viewer.