Chromium Code Reviews| Index: content/renderer/render_view_impl.h |
| diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h |
| index 9a9d98688ea08783ad088bdc281acba758000c12..067bd90dbe78b310882adcbfc5e84dd49c9590dc 100644 |
| --- a/content/renderer/render_view_impl.h |
| +++ b/content/renderer/render_view_impl.h |
| @@ -490,7 +490,7 @@ class CONTENT_EXPORT RenderViewImpl |
| void GetSelectionBounds(gfx::Rect* start, gfx::Rect* end) override; |
| void FocusChangeComplete() override; |
| void GetCompositionCharacterBounds( |
| - std::vector<gfx::Rect>* character_bounds) override; |
| + std::vector<gfx::Rect>* character_bounds_in_window) override; |
| void GetCompositionRange(gfx::Range* range) override; |
| bool CanComposeInline() override; |
| void DidCommitCompositorFrame() override; |
| @@ -564,6 +564,9 @@ class CONTENT_EXPORT RenderViewImpl |
| FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, PaintAfterSwapOut); |
| FRIEND_TEST_ALL_PREFIXES(RenderViewImplScaleFactorTest, |
| ConverViewportToScreenWithZoomForDSF); |
| + FRIEND_TEST_ALL_PREFIXES(RenderViewImplScaleFactorTest, |
| + GetCompositionCharacterBoundsTest); |
| + // FRIEND_TEST_ALL_PREFIXES(RenderViewImplScaleFactorTest, AutoResize); |
|
bokan
2015/12/09 22:06:32
Uncomment? Or remove?
oshima
2015/12/09 22:20:15
Removed. Thank you for the catch!
|
| typedef std::map<GURL, double> HostZoomLevels; |