| Index: third_party/WebKit/public/web/WebView.h
|
| diff --git a/third_party/WebKit/public/web/WebView.h b/third_party/WebKit/public/web/WebView.h
|
| index dc25a387cd749060b27f5c72a40e419e5fff67f4..d25040cf7bcebc4c889663ece89737b0b2990b08 100644
|
| --- a/third_party/WebKit/public/web/WebView.h
|
| +++ b/third_party/WebKit/public/web/WebView.h
|
| @@ -69,7 +69,7 @@ struct WebPluginAction;
|
| struct WebPoint;
|
| struct WebWindowFeatures;
|
|
|
| -class WebView : public WebWidget {
|
| +class WebView : protected WebWidget {
|
| public:
|
| BLINK_EXPORT static const double textSizeMultiplierRatio;
|
| BLINK_EXPORT static const double minTextSizeMultiplier;
|
| @@ -80,6 +80,47 @@ public:
|
| InjectStyleInTopFrameOnly
|
| };
|
|
|
| + // WebWidget overrides.
|
| + using WebWidget::close;
|
| + using WebWidget::size;
|
| + using WebWidget::resize;
|
| + using WebWidget::resizeVisualViewport;
|
| + using WebWidget::didEnterFullScreen;
|
| + using WebWidget::didExitFullScreen;
|
| + using WebWidget::beginFrame;
|
| + using WebWidget::updateAllLifecyclePhases;
|
| + using WebWidget::paint;
|
| + using WebWidget::paintIgnoringCompositing;
|
| + using WebWidget::layoutAndPaintAsync;
|
| + using WebWidget::compositeAndReadbackAsync;
|
| + using WebWidget::themeChanged;
|
| + using WebWidget::handleInputEvent;
|
| + using WebWidget::setCursorVisibilityState;
|
| + using WebWidget::hasTouchEventHandlersAt;
|
| + using WebWidget::applyViewportDeltas;
|
| + using WebWidget::mouseCaptureLost;
|
| + using WebWidget::setFocus;
|
| + using WebWidget::setComposition;
|
| + using WebWidget::confirmComposition;
|
| + using WebWidget::compositionRange;
|
| + using WebWidget::textInputInfo;
|
| + using WebWidget::textInputType;
|
| + using WebWidget::selectionBounds;
|
| + using WebWidget::selectionTextDirection;
|
| + using WebWidget::isSelectionAnchorFirst;
|
| + using WebWidget::caretOrSelectionRange;
|
| + using WebWidget::setTextDirection;
|
| + using WebWidget::isAcceleratedCompositingActive;
|
| + using WebWidget::isWebView;
|
| + using WebWidget::isPagePopup;
|
| + using WebWidget::willCloseLayerTreeView;
|
| + using WebWidget::didAcquirePointerLock;
|
| + using WebWidget::didNotAcquirePointerLock;
|
| + using WebWidget::didLosePointerLock;
|
| + using WebWidget::didChangeWindowResizerRect;
|
| + using WebWidget::backgroundColor;
|
| + using WebWidget::pagePopup;
|
| + using WebWidget::updateTopControlsState;
|
|
|
| // Initialization ------------------------------------------------------
|
|
|
| @@ -488,6 +529,10 @@ public:
|
| // context's ability to deal with that failure gracefully can be tested.
|
| virtual void forceNextDrawingBufferCreationToFail() = 0;
|
|
|
| + // TODO(lfg): Remove this once the refactor of WebView/WebWidget is
|
| + // completed.
|
| + WebWidget* widget() { return this; }
|
| +
|
| protected:
|
| ~WebView() {}
|
| };
|
|
|