Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(360)

Unified Diff: mojo/services/html_viewer/html_document_view.h

Issue 570623002: Revert "Compositor bindings for mojo html_viewer" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/services/html_viewer/blink_platform_impl.cc ('k') | mojo/services/html_viewer/html_document_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/html_viewer/html_document_view.h
diff --git a/mojo/services/html_viewer/html_document_view.h b/mojo/services/html_viewer/html_document_view.h
index d033368bd5df8b28f05aee76860d946cc012af91..3efd707d19dda37ea2e1ad719741a82a6cf255fe 100644
--- a/mojo/services/html_viewer/html_document_view.h
+++ b/mojo/services/html_viewer/html_document_view.h
@@ -17,15 +17,10 @@
#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,
@@ -43,8 +38,7 @@ class HTMLDocumentView : public blink::WebViewClient,
// |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:
@@ -52,8 +46,8 @@ class HTMLDocumentView : public blink::WebViewClient,
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,
@@ -90,6 +84,7 @@ class HTMLDocumentView : public blink::WebViewClient,
virtual void OnViewInputEvent(View* view, const EventPtr& event) OVERRIDE;
void Load(URLResponsePtr response);
+ void Repaint();
URLResponsePtr response_;
scoped_ptr<ServiceProvider> embedder_service_provider_;
@@ -98,8 +93,7 @@ class HTMLDocumentView : public blink::WebViewClient,
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);
« no previous file with comments | « mojo/services/html_viewer/blink_platform_impl.cc ('k') | mojo/services/html_viewer/html_document_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698