Replicate whether a frame is in a document or shadow tree.

components/html_viewer/html_document.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/html_viewer/html_document.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop_proxy.h"
@@ skipping 165 matching lines @@
         WeakBindToRequest(new AxProviderImpl(web_view_), &request));
   }
 }
 
 void HTMLDocument::Load(URLResponsePtr response) {
   DCHECK(!web_view_);
   web_view_ = blink::WebView::create(this);
   touch_handler_.reset(new TouchHandler(web_view_));
   web_layer_tree_view_impl_->set_widget(web_view_);
   ConfigureSettings(web_view_->settings());
-  web_view_->setMainFrame(blink::WebLocalFrame::create(this));
+  web_view_->setMainFrame(
+      blink::WebLocalFrame::create(WebTreeScopeType::Document, this));

[dcheng, 2015/05/18 23:27:27]

I plan on adding assertions, but basically, a main frame should never be in a
shadow tree.

 
   GURL url(response->url);
 
   WebURLRequestExtraData* extra_data = new WebURLRequestExtraData;
   extra_data->synthetic_response = response.Pass();
 
   blink::WebURLRequest web_request;
   web_request.initialize();
   web_request.setURL(url);
   web_request.setExtraData(extra_data);
@@ skipping 72 matching lines @@
       setup_->web_media_player_factory()
           ? setup_->web_media_player_factory()->CreateMediaPlayer(
                 frame, url, client, GetMediaPermission(), GetCdmFactory(),
                 initial_cdm, shell_)
           : nullptr;
   return player;
 }
 
 blink::WebFrame* HTMLDocument::createChildFrame(
     blink::WebLocalFrame* parent,
+    blink::WebTreeScopeType scope,
     const blink::WebString& frameName,
     blink::WebSandboxFlags sandboxFlags) {
-  blink::WebLocalFrame* web_frame = blink::WebLocalFrame::create(this);
+  blink::WebLocalFrame* web_frame = blink::WebLocalFrame::create(scope, this);
   parent->appendChild(web_frame);
   return web_frame;
 }
 
 void HTMLDocument::frameDetached(blink::WebFrame* frame) {
   if (frame->parent())
     frame->parent()->removeChild(frame);
 
   // |frame| is invalid after here.
   frame->close();
@@ skipping 109 matching lines @@
   return media_permission_.get();
 }
 
 media::CdmFactory* HTMLDocument::GetCdmFactory() {
   if (!cdm_factory_)
     cdm_factory_.reset(new media::DefaultCdmFactory());
   return cdm_factory_.get();
 }
 
 }  // namespace html_viewer