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

Unified Diff: content/renderer/render_widget.h

Issue 218623016: Remove Hack used for merging dependent chromium and blink patches (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 9 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 | « content/renderer/render_view_impl.cc ('k') | content/renderer/render_widget.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_widget.h
diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h
index b43cfe5acfdbd87afdf207ba0f5d0bd9daf93f60..5c5629fac22081a6bb7ae578313807e046eb3700 100644
--- a/content/renderer/render_widget.h
+++ b/content/renderer/render_widget.h
@@ -126,11 +126,6 @@ class CONTENT_EXPORT RenderWidget
virtual void didScrollRect(int dx, int dy,
const blink::WebRect& clipRect);
virtual void didAutoResize(const blink::WebSize& new_size);
- // FIXME: To be removed as soon as chromium and blink side changes land
- // didActivateCompositor with parameters is still kept in order to land
- // these changes s-chromium - https://codereview.chromium.org/137893025/.
- // s-blink - https://codereview.chromium.org/138523003/
- virtual void didActivateCompositor(int input_handler_identifier);
virtual void didActivateCompositor() OVERRIDE;
virtual void didDeactivateCompositor();
virtual void initializeLayerTreeView();
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | content/renderer/render_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698