Rename Node to View in the View Manager mojom & client lib. Service TBD.

mojo/services/html_viewer/html_document_view.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 "mojo/services/html_viewer/html_document_view.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_util.h"
 #include "base/thread_task_runner_handle.h"
 #include "mojo/public/cpp/system/data_pipe.h"
 #include "mojo/services/html_viewer/blink_input_events_type_converters.h"
 #include "mojo/services/html_viewer/webstoragenamespace_impl.h"
 #include "mojo/services/html_viewer/weburlloader_impl.h"
-#include "mojo/services/public/cpp/view_manager/node.h"
+#include "mojo/services/public/cpp/view_manager/view.h"
 #include "skia/ext/refptr.h"
 #include "third_party/WebKit/public/platform/Platform.h"
 #include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h"
 #include "third_party/WebKit/public/web/WebConsoleMessage.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebElement.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebScriptSource.h"
 #include "third_party/WebKit/public/web/WebSettings.h"
@@ skipping 137 matching lines @@
       weak_factory_(this) {
 }
 
 HTMLDocumentView::~HTMLDocumentView() {
   if (web_view_)
     web_view_->close();
   if (root_)
     root_->RemoveObserver(this);
 }
 
-void HTMLDocumentView::AttachToNode(Node* node) {
-  root_ = node;
+void HTMLDocumentView::AttachToView(View* view) {
+  root_ = view;
   root_->SetColor(SK_ColorCYAN);  // Dummy background color.
 
   web_view_ = blink::WebView::create(this);
   ConfigureSettings(web_view_->settings());
   web_view_->setMainFrame(blink::WebLocalFrame::create(this));
   web_view_->resize(root_->bounds().size());
 
   root_->AddObserver(this);
 }
 
@@ skipping 73 matching lines @@
     const blink::WebString& stack_trace) {
 }
 
 void HTMLDocumentView::didNavigateWithinPage(
     blink::WebLocalFrame* frame, const blink::WebHistoryItem& history_item,
     blink::WebHistoryCommitType commit_type) {
   navigator_host_->DidNavigateLocally(root_->id(),
                                       history_item.urlString().utf8());
 }
 
-void HTMLDocumentView::OnNodeBoundsChanged(Node* node,
+void HTMLDocumentView::OnViewBoundsChanged(View* view,
                                            const gfx::Rect& old_bounds,
                                            const gfx::Rect& new_bounds) {
-  DCHECK_EQ(node, root_);
-  web_view_->resize(node->bounds().size());
+  DCHECK_EQ(view, root_);
+  web_view_->resize(view->bounds().size());
 }
 
-void HTMLDocumentView::OnNodeDestroyed(Node* node) {
-  DCHECK_EQ(node, root_);
-  node->RemoveObserver(this);
+void HTMLDocumentView::OnViewDestroyed(View* view) {
+  DCHECK_EQ(view, root_);
+  view->RemoveObserver(this);
   root_ = NULL;
 }
 
-void HTMLDocumentView::OnNodeInputEvent(Node* node, const EventPtr& event) {
+void HTMLDocumentView::OnViewInputEvent(View* view, const EventPtr& event) {
   scoped_ptr<blink::WebInputEvent> web_event =
       TypeConverter<EventPtr, scoped_ptr<blink::WebInputEvent> >::ConvertTo(
           event);
   if (web_event)
     web_view_->handleInputEvent(*web_event);
 }
 
 void HTMLDocumentView::Repaint() {
   repaint_pending_ = false;
 
   web_view_->animate(0.0);
   web_view_->layout();
 
   int width = web_view_->size().width;
   int height = web_view_->size().height;
 
   skia::RefPtr<SkCanvas> canvas = skia::AdoptRef(SkCanvas::NewRaster(
       SkImageInfo::MakeN32(width, height, kOpaque_SkAlphaType)));
 
   web_view_->paint(canvas.get(), gfx::Rect(0, 0, width, height));
 
   root_->SetContents(canvas->getDevice()->accessBitmap(false));
 }
 
 }  // namespace mojo