Revert "Compositor bindings for mojo html_viewer"

mojo/services/html_viewer/html_document_view.h

 // 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.
 
 #ifndef MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_VIEW_H_
 #define MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_VIEW_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "mojo/public/cpp/application/lazy_interface_ptr.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"
 #include "mojo/services/public/cpp/view_manager/view_observer.h"
 #include "mojo/services/public/interfaces/content_handler/content_handler.mojom.h"
 #include "mojo/services/public/interfaces/navigation/navigation.mojom.h"
 #include "mojo/services/public/interfaces/network/url_loader.mojom.h"
 #include "third_party/WebKit/public/web/WebFrameClient.h"
 #include "third_party/WebKit/public/web/WebViewClient.h"
 
-namespace base {
-class MessageLoopProxy;
-}
-
 namespace mojo {
 
 class ViewManager;
 class View;
-class WebLayerTreeViewImpl;
 
 // A view for a single HTML document.
 class HTMLDocumentView : public blink::WebViewClient,
                          public blink::WebFrameClient,
                          public ViewManagerDelegate,
                          public ViewObserver {
  public:
   // Load a new HTMLDocument with |response|.
   //
   // |service_provider_request| should be used to implement a
   // ServiceProvider which exposes services to the connecting application.
   // Commonly, the connecting application is the ViewManager and it will
   // request ViewManagerClient.
   //
   // |shell| is the Shell connection for this mojo::Application.
   HTMLDocumentView(URLResponsePtr response,
                    InterfaceRequest<ServiceProvider> service_provider_request,
-                   Shell* shell,
-                   scoped_refptr<base::MessageLoopProxy> compositor_thread);
+                   Shell* shell);
   virtual ~HTMLDocumentView();
 
  private:
   // WebViewClient methods:
   virtual blink::WebStorageNamespace* createSessionStorageNamespace();
 
   // WebWidgetClient methods:
-  virtual void initializeLayerTreeView();
-  virtual blink::WebLayerTreeView* layerTreeView();
+  virtual void didInvalidateRect(const blink::WebRect& rect);
+  virtual bool allowsBrokenNullLayerTreeView() const;
 
   // WebFrameClient methods:
   virtual blink::WebFrame* createChildFrame(blink::WebLocalFrame* parent,
                                             const blink::WebString& frameName);
   virtual void frameDetached(blink::WebFrame*);
   virtual blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame);
   virtual blink::WebNavigationPolicy decidePolicyForNavigation(
       blink::WebLocalFrame* frame, blink::WebDataSource::ExtraData* data,
       const blink::WebURLRequest& request, blink::WebNavigationType nav_type,
       blink::WebNavigationPolicy default_policy, bool isRedirect);
@@ skipping 16 matching lines @@
   virtual void OnViewManagerDisconnected(ViewManager* view_manager) OVERRIDE;
 
   // ViewObserver methods:
   virtual void OnViewBoundsChanged(View* view,
                                    const gfx::Rect& old_bounds,
                                    const gfx::Rect& new_bounds) OVERRIDE;
   virtual void OnViewDestroyed(View* view) OVERRIDE;
   virtual void OnViewInputEvent(View* view, const EventPtr& event) OVERRIDE;
 
   void Load(URLResponsePtr response);
+  void Repaint();
 
   URLResponsePtr response_;
   scoped_ptr<ServiceProvider> embedder_service_provider_;
   Shell* shell_;
   LazyInterfacePtr<NavigatorHost> navigator_host_;
   blink::WebView* web_view_;
   View* root_;
   ViewManagerClientFactory view_manager_client_factory_;
-  scoped_ptr<WebLayerTreeViewImpl> web_layer_tree_view_impl_;
-  scoped_refptr<base::MessageLoopProxy> compositor_thread_;
+  bool repaint_pending_;
 
   base::WeakPtrFactory<HTMLDocumentView> weak_factory_;
   DISALLOW_COPY_AND_ASSIGN(HTMLDocumentView);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_VIEW_H_