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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 2741993003: Revert restartInput change off the M57 release branch. (Closed)
Patch Set: Rebase Created 3 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 unified diff | Download patch
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | content/renderer/render_widget.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <memory> 9 #include <memory>
10 10
(...skipping 1867 matching lines...) Expand 10 before | Expand all | Expand 10 after
1878 const blink::WebFloatPoint& positionInViewport, 1878 const blink::WebFloatPoint& positionInViewport,
1879 const blink::WebFloatSize& velocityInViewport) { 1879 const blink::WebFloatSize& velocityInViewport) {
1880 RenderWidget::didOverscroll(overscrollDelta, accumulatedOverscroll, 1880 RenderWidget::didOverscroll(overscrollDelta, accumulatedOverscroll,
1881 positionInViewport, velocityInViewport); 1881 positionInViewport, velocityInViewport);
1882 } 1882 }
1883 1883
1884 void RenderViewImpl::hasTouchEventHandlers(bool has_handlers) { 1884 void RenderViewImpl::hasTouchEventHandlers(bool has_handlers) {
1885 RenderWidget::hasTouchEventHandlers(has_handlers); 1885 RenderWidget::hasTouchEventHandlers(has_handlers);
1886 } 1886 }
1887 1887
1888 void RenderViewImpl::resetInputMethod() {
1889 RenderWidget::resetInputMethod();
1890 }
1891
1888 blink::WebRect RenderViewImpl::rootWindowRect() { 1892 blink::WebRect RenderViewImpl::rootWindowRect() {
1889 return RenderWidget::windowRect(); 1893 return RenderWidget::windowRect();
1890 } 1894 }
1891 1895
1892 blink::WebScreenInfo RenderViewImpl::screenInfo() { 1896 blink::WebScreenInfo RenderViewImpl::screenInfo() {
1893 return RenderWidget::screenInfo(); 1897 return RenderWidget::screenInfo();
1894 } 1898 }
1895 1899
1896 void RenderViewImpl::setToolTipText(const blink::WebString& text, 1900 void RenderViewImpl::setToolTipText(const blink::WebString& text,
1897 blink::WebTextDirection hint) { 1901 blink::WebTextDirection hint) {
(...skipping 834 matching lines...) Expand 10 before | Expand all | Expand 10 after
2732 INPUT_EVENT_ACK_STATE_NOT_CONSUMED); 2736 INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
2733 } 2737 }
2734 2738
2735 std::unique_ptr<InputEventAck> ack( 2739 std::unique_ptr<InputEventAck> ack(
2736 new InputEventAck(InputEventAckSource::MAIN_THREAD, input_event->type(), 2740 new InputEventAck(InputEventAckSource::MAIN_THREAD, input_event->type(),
2737 INPUT_EVENT_ACK_STATE_NOT_CONSUMED)); 2741 INPUT_EVENT_ACK_STATE_NOT_CONSUMED));
2738 OnInputEventAck(std::move(ack)); 2742 OnInputEventAck(std::move(ack));
2739 } 2743 }
2740 2744
2741 } // namespace content 2745 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | content/renderer/render_widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698