Merge 70681

WebCore/rendering/RenderView.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2006 Apple Computer, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 28 matching lines @@
 public:
     RenderView(Node*, FrameView*);
     virtual ~RenderView();
 
     virtual const char* renderName() const { return "RenderView"; }
 
     virtual bool isRenderView() const { return true; }
 
     virtual bool requiresLayer() const { return true; }
 
+    virtual bool isChildAllowed(RenderObject*, RenderStyle*) const;
+
     virtual void layout();
     virtual void calcWidth();
     virtual void calcHeight();
     virtual void calcPrefWidths();
 
     // The same as the FrameView's layoutHeight/layoutWidth but with null check guards.
     int viewHeight() const;
     int viewWidth() const;
 
     float zoomFactor() const;
@@ skipping 217 matching lines @@
 private:
     RenderView* m_view;
     bool m_disabled : 1;        // true if the offset and clip part of layoutState is disabled
     bool m_didStart : 1;        // true if we did a push or disable
     bool m_didEnd : 1;          // true if we popped or re-enabled
 };
 
 } // namespace WebCore
 
 #endif // RenderView_h