Merge 126131

Source/WebCore/html/HTMLFrameElementBase.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Simon Hausmann <hausmann@kde.org>
  * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved.
  *
  * 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.
@@ skipping 33 matching lines @@
 
     virtual bool canContainRangeEndPoint() const { return false; }
 
 protected:
     HTMLFrameElementBase(const QualifiedName&, Document*);
 
     bool isURLAllowed() const;
 
     virtual void parseAttribute(const Attribute&) OVERRIDE;
     virtual InsertionNotificationRequest insertedInto(ContainerNode*) OVERRIDE;
-    virtual void didNotifyDescendantInsertions(ContainerNode*) OVERRIDE;
+    virtual void didNotifySubtreeInsertions(ContainerNode*) OVERRIDE;
     virtual void attach();
 
 private:
     virtual bool supportsFocus() const;
     virtual void setFocus(bool);
     
     virtual bool isURLAttribute(const Attribute&) const OVERRIDE;
     virtual bool isFrameElementBase() const { return true; }
 
     bool viewSourceMode() const { return m_viewSource; }
 
     void setNameAndOpenURL();
     void openURL(bool lockHistory = true, bool lockBackForwardList = true);
 
     AtomicString m_URL;
     AtomicString m_frameName;
 
     ScrollbarMode m_scrolling;
 
     int m_marginWidth;
     int m_marginHeight;
 
     bool m_viewSource;
 };
 
 } // namespace WebCore
 
 #endif // HTMLFrameElementBase_h