Merge 95471 - [Chromium] Crash after magic iframe transfer for Pepper/NaCl plugins.

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 24 matching lines @@
     void setLocation(const String&);
 
     virtual ScrollbarMode scrollingMode() const { return m_scrolling; }
     
     int marginWidth() const { return m_marginWidth; }
     int marginHeight() const { return m_marginHeight; }
 
     int width();
     int height();
 
+    bool canRemainAliveOnRemovalFromTree();
     void setRemainsAliveOnRemovalFromTree(bool);
 #if ENABLE(FULLSCREEN_API)
     virtual bool allowFullScreen() const;
 #endif
 
     virtual bool canContainRangeEndPoint() const { return false; }
 
 protected:
     HTMLFrameElementBase(const QualifiedName&, Document*);
 
@@ skipping 39 matching lines @@
     // From HTML5: http://www.whatwg.org/specs/web-apps/current-work/multipage/the-iframe-element.html#the-iframe-element
     Timer<HTMLFrameElementBase> m_checkInDocumentTimer;
 
     bool m_viewSource;
     bool m_remainsAliveOnRemovalFromTree;
 };
 
 } // namespace WebCore
 
 #endif // HTMLFrameElementBase_h