Make the embedder responsible for creating the WebFrame

Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 252 matching lines @@
     if (webInputEventKeyState & WebInputEvent::MetaKey)
         platformEventKeyState = platformEventKeyState | WebCore::PlatformEvent::MetaKey;
     return platformEventKeyState;
 }
 
 // WebView ----------------------------------------------------------------
 
 WebView* WebView::create(WebViewClient* client)
 {
     // Pass the WebViewImpl's self-reference to the caller.
+    return WebViewImpl::create(client);
+}
+
+WebViewImpl* WebViewImpl::create(WebViewClient* client)
+{
+    // Pass the WebViewImpl's self-reference to the caller.
     return adoptRef(new WebViewImpl(client)).leakRef();
 }
 
 void WebView::setUseExternalPopupMenus(bool useExternalPopupMenus)
 {
     shouldUseExternalPopupMenus = useExternalPopupMenus;
 }
 
 void WebView::updateVisitedLinkState(unsigned long long linkHash)
 {
@@ skipping 23 matching lines @@
 }
 
 void WebView::didExitModalLoop()
 {
     ASSERT(pageGroupLoadDeferrerStack().size());
 
     delete pageGroupLoadDeferrerStack().last();
     pageGroupLoadDeferrerStack().removeLast();
 }
 
+void WebViewImpl::setMainFrame(WebFrame* frame)
+{
+    // NOTE: The WebFrameImpl takes a reference to itself within InitMainFrame

[darin (slow to review), 2013/09/19 22:36:19]

nit: InitMainFrame -> initializeAsMainFrame.

[awong, 2013/09/20 00:36:24]

Done.

+    // and releases that reference once the corresponding Frame is destroyed.
+    static_cast<WebFrameImpl*>(frame)->initializeAsMainFrame(page());
+}
+
 void WebViewImpl::initializeMainFrame(WebFrameClient* frameClient)
 {
-    // NOTE: The WebFrameImpl takes a reference to itself within InitMainFrame
-    // and releases that reference once the corresponding Frame is destroyed.
-    RefPtr<WebFrameImpl> frame = WebFrameImpl::create(frameClient);
-
-    frame->initializeAsMainFrame(page());
-}
-
-void WebViewImpl::initializeHelperPluginFrame(WebFrameClient* client)
-{
-    RefPtr<WebFrameImpl> frame = WebFrameImpl::create(client);
+    // NOTE: Previously, WebViewImpl was responsible for allocating its own
+    // mainframe. This code is for supporting clients that have yet to move
+    // to setMainFrame(). Though the setMainFrame() accepts a raw pointer, it
+    // implicitly takes a refcount on the frame. Dropping our RefPtr here
+    // will effectively pass ownership to m_page. New users of WebViewImpl
+    // should call WebFrameImpl::create() to construct their own mainframe,
+    // pass it into WebViewImpl::setMainFrame(), keep a pointer to the
+    // mainframe, and call WebFrameImpl::close() on it when closing the
+    // WebViewImpl.
+    RefPtr<WebFrameImpl> frame = adoptRef(WebFrameImpl::create(frameClient));
+    setMainFrame(frame.get());
 }
 
 void WebViewImpl::setAutofillClient(WebAutofillClient* autofillClient)
 {
     m_autofillClient = autofillClient;
 }
 
 void WebViewImpl::setDevToolsAgentClient(WebDevToolsAgentClient* devToolsClient)
 {
     if (devToolsClient)
@@ skipping 3833 matching lines @@
     //    the initial viewport width.
     // 2. The author has disabled viewport zoom.
 
     const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefinedConstraints();
 
     return fixedLayoutSize().width == m_size.width
         || (constraints.minimumScale == constraints.maximumScale && constraints.minimumScale != -1);
 }
 
 } // namespace WebKit