third_party/WebKit/Source/web/WebViewFrameWidget.h - Issue 2522353002: Remove the CHECK in RenderWidget::GetInputMethodController

Side by Side Diff: third_party/WebKit/Source/web/WebViewFrameWidget.h

Issue 2522353002: Remove the CHECK in RenderWidget::GetInputMethodController (Closed)

Patch Set: Removing the override from WebFrameWidget Created 4 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be found	2 // Use of this source code is governed by a BSD-style license that can be found

3 // in the LICENSE file.	3 // in the LICENSE file.

4	4

5 #ifndef WebViewFrameWidget_h	5 #ifndef WebViewFrameWidget_h

6 #define WebViewFrameWidget_h	6 #define WebViewFrameWidget_h

7	7

8 #include "platform/heap/Handle.h"	8 #include "platform/heap/Handle.h"

9 #include "web/WebFrameWidgetBase.h"	9 #include "web/WebFrameWidgetBase.h"

10 #include "web/WebInputMethodControllerImpl.h"	10 #include "web/WebInputMethodControllerImpl.h"

(...skipping 23 matching lines...) Expand all Loading...
34 // https://goo.gl/7yVrnb.	34 // https://goo.gl/7yVrnb.

35 class WebViewFrameWidget : public WebFrameWidgetBase {	35 class WebViewFrameWidget : public WebFrameWidgetBase {

36 WTF_MAKE_NONCOPYABLE(WebViewFrameWidget);	36 WTF_MAKE_NONCOPYABLE(WebViewFrameWidget);

37	37

38 public:	38 public:

39 explicit WebViewFrameWidget(WebWidgetClient*,	39 explicit WebViewFrameWidget(WebWidgetClient*,

40 WebViewImpl&,	40 WebViewImpl&,

41 WebLocalFrameImpl&);	41 WebLocalFrameImpl&);

42 virtual ~WebViewFrameWidget();	42 virtual ~WebViewFrameWidget();

43	43

	44 // WebWidget overrides:

	45 WebInputMethodControllerImpl* getActiveWebInputMethodController()

	46 const override;

	47

44 // WebFrameWidget overrides:	48 // WebFrameWidget overrides:

45 void close() override;	49 void close() override;

46 WebSize size() override;	50 WebSize size() override;

47 void resize(const WebSize&) override;	51 void resize(const WebSize&) override;

48 void resizeVisualViewport(const WebSize&) override;	52 void resizeVisualViewport(const WebSize&) override;

49 void didEnterFullscreen() override;	53 void didEnterFullscreen() override;

50 void didExitFullscreen() override;	54 void didExitFullscreen() override;

51 void beginFrame(double lastFrameTimeMonotonic) override;	55 void beginFrame(double lastFrameTimeMonotonic) override;

52 void updateAllLifecyclePhases() override;	56 void updateAllLifecyclePhases() override;

53 void paint(WebCanvas*, const WebRect& viewPort) override;	57 void paint(WebCanvas*, const WebRect& viewPort) override;

(...skipping 32 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
86 bool getCompositionCharacterBounds(WebVector<WebRect>& bounds) override;	90 bool getCompositionCharacterBounds(WebVector<WebRect>& bounds) override;

87 void applyReplacementRange(const WebRange&) override;	91 void applyReplacementRange(const WebRange&) override;

88 void updateBrowserControlsState(WebBrowserControlsState constraints,	92 void updateBrowserControlsState(WebBrowserControlsState constraints,

89 WebBrowserControlsState current,	93 WebBrowserControlsState current,

90 bool animate) override;	94 bool animate) override;

91 void setVisibilityState(WebPageVisibilityState) override;	95 void setVisibilityState(WebPageVisibilityState) override;

92 bool isTransparent() const override;	96 bool isTransparent() const override;

93 void setIsTransparent(bool) override;	97 void setIsTransparent(bool) override;

94 void setBaseBackgroundColor(WebColor) override;	98 void setBaseBackgroundColor(WebColor) override;

95 WebLocalFrameImpl* localRoot() const override;	99 WebLocalFrameImpl* localRoot() const override;

96 WebInputMethodControllerImpl* getActiveWebInputMethodController()

97 const override;

98	100

99 // WebFrameWidgetBase overrides:	101 // WebFrameWidgetBase overrides:

100 bool forSubframe() const override { return false; }	102 bool forSubframe() const override { return false; }

101 void scheduleAnimation() override;	103 void scheduleAnimation() override;

102 CompositorProxyClient* createCompositorProxyClient() override;	104 CompositorProxyClient* createCompositorProxyClient() override;

103 void setRootGraphicsLayer(GraphicsLayer*) override;	105 void setRootGraphicsLayer(GraphicsLayer*) override;

104 void setRootLayer(WebLayer*) override;	106 void setRootLayer(WebLayer*) override;

105 void attachCompositorAnimationTimeline(CompositorAnimationTimeline*) override;	107 void attachCompositorAnimationTimeline(CompositorAnimationTimeline*) override;

106 void detachCompositorAnimationTimeline(CompositorAnimationTimeline*) override;	108 void detachCompositorAnimationTimeline(CompositorAnimationTimeline*) override;

107 WebWidgetClient* client() const override { return m_client; }	109 WebWidgetClient* client() const override { return m_client; }

108 HitTestResult coreHitTestResultAt(const WebPoint&) override;	110 HitTestResult coreHitTestResultAt(const WebPoint&) override;

109	111

110 private:	112 private:

111 WebWidgetClient* m_client;	113 WebWidgetClient* m_client;

112 RefPtr<WebViewImpl> m_webView;	114 RefPtr<WebViewImpl> m_webView;

113 Persistent<WebLocalFrameImpl> m_mainFrame;	115 Persistent<WebLocalFrameImpl> m_mainFrame;

114 };	116 };

115	117

116 } // namespace blink	118 } // namespace blink

117	119

118 #endif // WebViewFrameWidget_h	120 #endif // WebViewFrameWidget_h

OLD	NEW