diff options
| author | sunil.ratnu@samsung.com <sunil.ratnu@samsung.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-22 16:12:41 +0000 |
|---|---|---|
| committer | sunil.ratnu@samsung.com <sunil.ratnu@samsung.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-22 16:12:41 +0000 |
| commit | e32701223a32f96981336ff424717a164ebce86b (patch) | |
| tree | ea2bfac60b0635b014b639bf69494ba4e0947cc4 /content/renderer/render_widget.h | |
| parent | d0094ffffa76ffb8356baeb0407f98544d654f6a (diff) | |
| download | chromium_src-e32701223a32f96981336ff424717a164ebce86b.zip chromium_src-e32701223a32f96981336ff424717a164ebce86b.tar.gz chromium_src-e32701223a32f96981336ff424717a164ebce86b.tar.bz2 | |
Remove Hack used for merging dependent chromium and blink patches
To merge the dependent patches https://codereview.chromium.org/137893025/ and https://codereview.chromium.org/138523003/ , older definition of the function didActivateCompositor() was also needed to be kept. But since both of these patches have landed now, we can land this patch. This patch removes the older definitions from the code.
BUG=None
TBR=jamesr@chromium.org
Review URL: https://codereview.chromium.org/218623016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265270 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/render_widget.h')
| -rw-r--r-- | content/renderer/render_widget.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h index 73de947..c37943f 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(); |