| Index: third_party/WebKit/Source/web/WebViewImpl.h
|
| diff --git a/third_party/WebKit/Source/web/WebViewImpl.h b/third_party/WebKit/Source/web/WebViewImpl.h
|
| index bb234c4f41a4e5151ea24e288cd03b1a661efe8c..6ee58586e77fa821080fdf49868093f7637f074b 100644
|
| --- a/third_party/WebKit/Source/web/WebViewImpl.h
|
| +++ b/third_party/WebKit/Source/web/WebViewImpl.h
|
| @@ -362,7 +362,7 @@ public:
|
| // Keyboard event to the Right Mouse button down event.
|
| WebInputEventResult sendContextMenuEvent(const WebKeyboardEvent&);
|
|
|
| - void showContextMenuAtPoint(float x, float y, PassRefPtrWillBeRawPtr<ContextMenuProvider>);
|
| + void showContextMenuAtPoint(float x, float y, RawPtr<ContextMenuProvider>);
|
|
|
| void showContextMenuForElement(WebElement);
|
|
|
| @@ -458,7 +458,7 @@ public:
|
| void computeScaleAndScrollForBlockRect(const WebPoint& hitPoint, const WebRect& blockRect, float padding, float defaultScaleWhenAlreadyLegible, float& scale, WebPoint& scroll);
|
| Node* bestTapNode(const GestureEventWithHitTestResults& targetedTapEvent);
|
| void enableTapHighlightAtPoint(const GestureEventWithHitTestResults& targetedTapEvent);
|
| - void enableTapHighlights(WillBeHeapVector<RawPtrWillBeMember<Node>>&);
|
| + void enableTapHighlights(HeapVector<Member<Node>>&);
|
| void computeScaleAndScrollForFocusedNode(Node* focusedNode, bool zoomInToLegibleScale, float& scale, IntPoint& scroll, bool& needAnimation);
|
|
|
| void animateDoubleTapZoom(const IntPoint&);
|
| @@ -626,7 +626,7 @@ private:
|
| WebViewClient* m_client; // Can be 0 (e.g. unittests, shared workers, etc.)
|
| WebSpellCheckClient* m_spellCheckClient;
|
|
|
| - OwnPtrWillBePersistent<ChromeClientImpl> m_chromeClientImpl;
|
| + Persistent<ChromeClientImpl> m_chromeClientImpl;
|
| ContextMenuClientImpl m_contextMenuClientImpl;
|
| DragClientImpl m_dragClientImpl;
|
| EditorClientImpl m_editorClientImpl;
|
| @@ -641,7 +641,7 @@ private:
|
| // The upper bound on the size when auto-resizing.
|
| IntSize m_maxAutoSize;
|
|
|
| - OwnPtrWillBePersistent<Page> m_page;
|
| + Persistent<Page> m_page;
|
|
|
| // An object that can be used to manipulate m_page->settings() without linking
|
| // against WebCore. This is lazily allocated the first time GetWebSettings()
|
| @@ -714,7 +714,7 @@ private:
|
| // The popup associated with an input/select element.
|
| RefPtr<WebPagePopupImpl> m_pagePopup;
|
|
|
| - OwnPtrWillBePersistent<DevToolsEmulator> m_devToolsEmulator;
|
| + Persistent<DevToolsEmulator> m_devToolsEmulator;
|
| OwnPtr<PageOverlay> m_pageColorOverlay;
|
|
|
| // Whether the webview is rendering transparently.
|
| @@ -724,7 +724,7 @@ private:
|
| bool m_tabsToLinks;
|
|
|
| // If set, the (plugin) node which has mouse capture.
|
| - RefPtrWillBePersistent<Node> m_mouseCaptureNode;
|
| + Persistent<Node> m_mouseCaptureNode;
|
| RefPtr<UserGestureToken> m_mouseCaptureGestureToken;
|
|
|
| RefPtr<UserGestureToken> m_pointerLockGestureToken;
|
| @@ -743,7 +743,7 @@ private:
|
| WebGestureDevice m_flingSourceDevice;
|
| Vector<OwnPtr<LinkHighlightImpl>> m_linkHighlights;
|
| OwnPtr<CompositorAnimationTimeline> m_linkHighlightsTimeline;
|
| - OwnPtrWillBePersistent<FullscreenController> m_fullscreenController;
|
| + Persistent<FullscreenController> m_fullscreenController;
|
|
|
| bool m_showFPSCounter;
|
| WebColor m_baseBackgroundColor;
|
| @@ -758,7 +758,7 @@ private:
|
|
|
| FloatSize m_elasticOverscroll;
|
|
|
| - RefPtrWillBePersistent<EventListener> m_popupMouseWheelEventListener;
|
| + Persistent<EventListener> m_popupMouseWheelEventListener;
|
|
|
| WebPageImportanceSignals m_pageImportanceSignals;
|
|
|
|
|