Changeset 159889 in webkit

Timestamp:

Nov 30, 2013 11:14:13 AM (10 years ago)

Author:

weinig@apple.com

Message:

[CTTE] WebPageProxy should store the PageClient as a reference
​https://bugs.webkit.org/show_bug.cgi?id=125030

Reviewed by Dan Bernstein.

• UIProcess/API/gtk/WebKitWebViewBase.cpp:

(webkitWebViewBaseCreateWebPage):

• UIProcess/API/ios/WKContentView.mm:

(-[WKContentView _commonInitializationWithContextRef:pageGroupRef:relatedToPage:]):

• UIProcess/API/mac/WKView.mm:

(-[WKView initWithFrame:contextRef:pageGroupRef:relatedToPage:]):

• UIProcess/CoordinatedGraphics/WebPageProxyCoordinatedGraphics.cpp:

(WebKit::WebPageProxy::didFindZoomableArea):

• UIProcess/CoordinatedGraphics/WebView.cpp:

(WebKit::WebView::WebView):

• UIProcess/WebContext.cpp:

(WebKit::WebContext::createWebPage):

• UIProcess/WebContext.h:
• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::create):
(WebKit::WebPageProxy::WebPageProxy):
(WebKit::WebPageProxy::reattachToWebProcess):
(WebKit::WebPageProxy::initializeWebPage):
(WebKit::WebPageProxy::close):
(WebKit::WebPageProxy::setViewNeedsDisplay):
(WebKit::WebPageProxy::displayView):
(WebKit::WebPageProxy::canScrollView):
(WebKit::WebPageProxy::scrollView):
(WebKit::WebPageProxy::updateViewState):
(WebKit::WebPageProxy::viewStateDidChange):
(WebKit::WebPageProxy::viewSize):
(WebKit::WebPageProxy::startDrag):
(WebKit::WebPageProxy::handleTouchEvent):
(WebKit::WebPageProxy::preferencesDidChange):
(WebKit::WebPageProxy::didCommitLoadForFrame):
(WebKit::WebPageProxy::closePage):
(WebKit::WebPageProxy::setWindowFrame):
(WebKit::WebPageProxy::getWindowFrame):
(WebKit::WebPageProxy::screenToWindow):
(WebKit::WebPageProxy::windowToScreen):
(WebKit::WebPageProxy::pageDidRequestScroll):
(WebKit::WebPageProxy::pageTransitionViewportReady):
(WebKit::WebPageProxy::didRenderFrame):
(WebKit::WebPageProxy::didChangeViewportProperties):
(WebKit::WebPageProxy::handleDownloadRequest):
(WebKit::WebPageProxy::didChangeContentSize):
(WebKit::WebPageProxy::showColorPicker):
(WebKit::WebPageProxy::editorStateChanged):
(WebKit::WebPageProxy::canUndoRedo):
(WebKit::WebPageProxy::executeUndoRedo):
(WebKit::WebPageProxy::clearAllEditCommands):
(WebKit::WebPageProxy::setFindIndicator):
(WebKit::WebPageProxy::showPopupMenu):
(WebKit::WebPageProxy::internalShowContextMenu):
(WebKit::WebPageProxy::registerEditCommand):
(WebKit::WebPageProxy::setToolTip):
(WebKit::WebPageProxy::setCursor):
(WebKit::WebPageProxy::setCursorHiddenUntilMouseMoves):
(WebKit::WebPageProxy::didReceiveEvent):
(WebKit::WebPageProxy::processDidCrash):
(WebKit::WebPageProxy::resetStateAfterProcessExited):
(WebKit::WebPageProxy::initializeCreationParameters):
(WebKit::WebPageProxy::enterAcceleratedCompositingMode):
(WebKit::WebPageProxy::exitAcceleratedCompositingMode):
(WebKit::WebPageProxy::updateAcceleratedCompositingMode):
(WebKit::WebPageProxy::requestGeolocationPermissionForFrame):
(WebKit::WebPageProxy::recommendedScrollbarStyleDidChange):
(WebKit::WebPageProxy::updateBackingStoreDiscardableState):
(WebKit::WebPageProxy::showCorrectionPanel):
(WebKit::WebPageProxy::dismissCorrectionPanel):
(WebKit::WebPageProxy::dismissCorrectionPanelSoon):
(WebKit::WebPageProxy::recordAutocorrectionResponse):
(WebKit::WebPageProxy::showDictationAlternativeUI):
(WebKit::WebPageProxy::removeDictationAlternatives):
(WebKit::WebPageProxy::dictationAlternatives):

• UIProcess/WebPageProxy.h:
• UIProcess/WebProcessProxy.cpp:

(WebKit::WebProcessProxy::createWebPage):

• UIProcess/WebProcessProxy.h:
• UIProcess/gtk/WebPageProxyGtk.cpp:

(WebKit::WebPageProxy::getEditorCommandsForKeyEvent):

• UIProcess/ios/WebPageProxyIOS.mm:

(WebKit::WebPageProxy::interpretKeyEvent):
(WebKit::WebPageProxy::mainDocumentDidReceiveMobileDocType):
(WebKit::WebPageProxy::didGetTapHighlightGeometries):
(WebKit::WebPageProxy::didChangeViewportArguments):
(WebKit::WebPageProxy::startAssistingNode):
(WebKit::WebPageProxy::stopAssistingNode):
(WebKit::WebPageProxy::setAcceleratedCompositingRootLayer):

• UIProcess/mac/WebPageProxyMac.mm:

(WebKit::WebPageProxy::windowAndViewFramesChanged):
(WebKit::WebPageProxy::insertDictatedText):
(WebKit::WebPageProxy::setDragImage):
(WebKit::WebPageProxy::setPromisedData):
(WebKit::WebPageProxy::interpretQueuedKeyEvent):
(WebKit::WebPageProxy::didPerformDictionaryLookup):
(WebKit::WebPageProxy::registerWebProcessAccessibilityToken):
(WebKit::WebPageProxy::makeFirstResponder):
(WebKit::WebPageProxy::colorSpace):
(WebKit::WebPageProxy::pluginFocusOrWindowFocusChanged):
(WebKit::WebPageProxy::setPluginComplexTextInputState):
(WebKit::WebPageProxy::executeSavedCommandBySelector):
(WebKit::WebPageProxy::wkView):
(WebKit::WebPageProxy::intrinsicContentSizeDidChange):
(WebKit::WebPageProxy::setAcceleratedCompositingRootLayer):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/WebKitWebViewBase.cpp (modified) (1 diff)
• UIProcess/API/ios/WKContentView.mm (modified) (1 diff)
• UIProcess/API/mac/WKView.mm (modified) (1 diff)
• UIProcess/CoordinatedGraphics/WebPageProxyCoordinatedGraphics.cpp (modified) (1 diff)
• UIProcess/CoordinatedGraphics/WebView.cpp (modified) (1 diff)
• UIProcess/WebContext.cpp (modified) (1 diff)
• UIProcess/WebContext.h (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (44 diffs)
• UIProcess/WebPageProxy.h (modified) (3 diffs)
• UIProcess/WebProcessProxy.cpp (modified) (1 diff)
• UIProcess/WebProcessProxy.h (modified) (1 diff)
• UIProcess/gtk/WebPageProxyGtk.cpp (modified) (1 diff)
• UIProcess/ios/WebPageProxyIOS.mm (modified) (3 diffs)
• UIProcess/mac/WebPageProxyMac.mm (modified) (10 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-11-30  Sam Weinig  <sam@webkit.org>
+
+        [CTTE] WebPageProxy should store the PageClient as a reference
+        https://bugs.webkit.org/show_bug.cgi?id=125030
+
+        Reviewed by Dan Bernstein.
+
+        * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+        (webkitWebViewBaseCreateWebPage):
+        * UIProcess/API/ios/WKContentView.mm:
+        (-[WKContentView _commonInitializationWithContextRef:pageGroupRef:relatedToPage:]):
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView initWithFrame:contextRef:pageGroupRef:relatedToPage:]):
+        * UIProcess/CoordinatedGraphics/WebPageProxyCoordinatedGraphics.cpp:
+        (WebKit::WebPageProxy::didFindZoomableArea):
+        * UIProcess/CoordinatedGraphics/WebView.cpp:
+        (WebKit::WebView::WebView):
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::createWebPage):
+        * UIProcess/WebContext.h:
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::create):
+        (WebKit::WebPageProxy::WebPageProxy):
+        (WebKit::WebPageProxy::reattachToWebProcess):
+        (WebKit::WebPageProxy::initializeWebPage):
+        (WebKit::WebPageProxy::close):
+        (WebKit::WebPageProxy::setViewNeedsDisplay):
+        (WebKit::WebPageProxy::displayView):
+        (WebKit::WebPageProxy::canScrollView):
+        (WebKit::WebPageProxy::scrollView):
+        (WebKit::WebPageProxy::updateViewState):
+        (WebKit::WebPageProxy::viewStateDidChange):
+        (WebKit::WebPageProxy::viewSize):
+        (WebKit::WebPageProxy::startDrag):
+        (WebKit::WebPageProxy::handleTouchEvent):
+        (WebKit::WebPageProxy::preferencesDidChange):
+        (WebKit::WebPageProxy::didCommitLoadForFrame):
+        (WebKit::WebPageProxy::closePage):
+        (WebKit::WebPageProxy::setWindowFrame):
+        (WebKit::WebPageProxy::getWindowFrame):
+        (WebKit::WebPageProxy::screenToWindow):
+        (WebKit::WebPageProxy::windowToScreen):
+        (WebKit::WebPageProxy::pageDidRequestScroll):
+        (WebKit::WebPageProxy::pageTransitionViewportReady):
+        (WebKit::WebPageProxy::didRenderFrame):
+        (WebKit::WebPageProxy::didChangeViewportProperties):
+        (WebKit::WebPageProxy::handleDownloadRequest):
+        (WebKit::WebPageProxy::didChangeContentSize):
+        (WebKit::WebPageProxy::showColorPicker):
+        (WebKit::WebPageProxy::editorStateChanged):
+        (WebKit::WebPageProxy::canUndoRedo):
+        (WebKit::WebPageProxy::executeUndoRedo):
+        (WebKit::WebPageProxy::clearAllEditCommands):
+        (WebKit::WebPageProxy::setFindIndicator):
+        (WebKit::WebPageProxy::showPopupMenu):
+        (WebKit::WebPageProxy::internalShowContextMenu):
+        (WebKit::WebPageProxy::registerEditCommand):
+        (WebKit::WebPageProxy::setToolTip):
+        (WebKit::WebPageProxy::setCursor):
+        (WebKit::WebPageProxy::setCursorHiddenUntilMouseMoves):
+        (WebKit::WebPageProxy::didReceiveEvent):
+        (WebKit::WebPageProxy::processDidCrash):
+        (WebKit::WebPageProxy::resetStateAfterProcessExited):
+        (WebKit::WebPageProxy::initializeCreationParameters):
+        (WebKit::WebPageProxy::enterAcceleratedCompositingMode):
+        (WebKit::WebPageProxy::exitAcceleratedCompositingMode):
+        (WebKit::WebPageProxy::updateAcceleratedCompositingMode):
+        (WebKit::WebPageProxy::requestGeolocationPermissionForFrame):
+        (WebKit::WebPageProxy::recommendedScrollbarStyleDidChange):
+        (WebKit::WebPageProxy::updateBackingStoreDiscardableState):
+        (WebKit::WebPageProxy::showCorrectionPanel):
+        (WebKit::WebPageProxy::dismissCorrectionPanel):
+        (WebKit::WebPageProxy::dismissCorrectionPanelSoon):
+        (WebKit::WebPageProxy::recordAutocorrectionResponse):
+        (WebKit::WebPageProxy::showDictationAlternativeUI):
+        (WebKit::WebPageProxy::removeDictationAlternatives):
+        (WebKit::WebPageProxy::dictationAlternatives):
+        * UIProcess/WebPageProxy.h:
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::createWebPage):
+        * UIProcess/WebProcessProxy.h:
+        * UIProcess/gtk/WebPageProxyGtk.cpp:
+        (WebKit::WebPageProxy::getEditorCommandsForKeyEvent):
+        * UIProcess/ios/WebPageProxyIOS.mm:
+        (WebKit::WebPageProxy::interpretKeyEvent):
+        (WebKit::WebPageProxy::mainDocumentDidReceiveMobileDocType):
+        (WebKit::WebPageProxy::didGetTapHighlightGeometries):
+        (WebKit::WebPageProxy::didChangeViewportArguments):
+        (WebKit::WebPageProxy::startAssistingNode):
+        (WebKit::WebPageProxy::stopAssistingNode):
+        (WebKit::WebPageProxy::setAcceleratedCompositingRootLayer):
+        * UIProcess/mac/WebPageProxyMac.mm:
+        (WebKit::WebPageProxy::windowAndViewFramesChanged):
+        (WebKit::WebPageProxy::insertDictatedText):
+        (WebKit::WebPageProxy::setDragImage):
+        (WebKit::WebPageProxy::setPromisedData):
+        (WebKit::WebPageProxy::interpretQueuedKeyEvent):
+        (WebKit::WebPageProxy::didPerformDictionaryLookup):
+        (WebKit::WebPageProxy::registerWebProcessAccessibilityToken):
+        (WebKit::WebPageProxy::makeFirstResponder):
+        (WebKit::WebPageProxy::colorSpace):
+        (WebKit::WebPageProxy::pluginFocusOrWindowFocusChanged):
+        (WebKit::WebPageProxy::setPluginComplexTextInputState):
+        (WebKit::WebPageProxy::executeSavedCommandBySelector):
+        (WebKit::WebPageProxy::wkView):
+        (WebKit::WebPageProxy::intrinsicContentSizeDidChange):
+        (WebKit::WebPageProxy::setAcceleratedCompositingRootLayer):
+
 2013-11-30  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp

@@ -932 +932 @@
     WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv;
 
-    priv->pageProxy = context->createWebPage(priv->pageClient.get(), pageGroup);
+    priv->pageProxy = context->createWebPage(*priv->pageClient, pageGroup);
     priv->pageProxy->initializeWebPage();
 

trunk/Source/WebKit2/UIProcess/API/ios/WKContentView.mm

@@ -148 +148 @@
 
     _pageClient = std::make_unique<PageClientImpl>(self);
-    _page = toImpl(contextRef)->createWebPage(_pageClient.get(), toImpl(pageGroupRef), toImpl(relatedPage));
+    _page = toImpl(contextRef)->createWebPage(*_pageClient, toImpl(pageGroupRef), toImpl(relatedPage));
     _page->initializeWebPage();
     _page->setIntrinsicDeviceScaleFactor([UIScreen mainScreen].scale);

trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm

@@ -2909 +2909 @@
 
     _data->_pageClient = std::make_unique<PageClientImpl>(self);
-    _data->_page = toImpl(contextRef)->createWebPage(_data->_pageClient.get(), toImpl(pageGroupRef), toImpl(relatedPage));
+    _data->_page = toImpl(contextRef)->createWebPage(*_data->_pageClient, toImpl(pageGroupRef), toImpl(relatedPage));
     _data->_page->setIntrinsicDeviceScaleFactor([self _intrinsicDeviceScaleFactor]);
     _data->_page->initializeWebPage();

trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebPageProxyCoordinatedGraphics.cpp

@@ -48 +48 @@
 void WebPageProxy::didFindZoomableArea(const IntPoint& target, const IntRect& area)
 {
-    m_pageClient->didFindZoomableArea(target, area);
+    m_pageClient.didFindZoomableArea(target, area);
 }
 

trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp

@@ -53 +53 @@
 {
     // Need to call createWebPage after other data members, specifically m_visible, are initialized.
-    m_page = context->createWebPage(this, pageGroup);
+    m_page = context->createWebPage(*this, pageGroup);
 
     m_page->pageGroup()->preferences()->setAcceleratedCompositingEnabled(true);

trunk/Source/WebKit2/UIProcess/WebContext.cpp

@@ -741 +741 @@
 }
 
-PassRefPtr<WebPageProxy> WebContext::createWebPage(PageClient* pageClient, WebPageGroup* pageGroup, WebPageProxy* relatedPage)
+PassRefPtr<WebPageProxy> WebContext::createWebPage(PageClient& pageClient, WebPageGroup* pageGroup, WebPageProxy* relatedPage)
 {
     RefPtr<WebProcessProxy> process;

trunk/Source/WebKit2/UIProcess/WebContext.h

@@ -159 +159 @@
     StorageManager& storageManager() const { return *m_storageManager; }
 
-    PassRefPtr<WebPageProxy> createWebPage(PageClient*, WebPageGroup*, WebPageProxy* relatedPage = 0);
+    PassRefPtr<WebPageProxy> createWebPage(PageClient&, WebPageGroup*, WebPageProxy* relatedPage = 0);
 
     const String& injectedBundlePath() const { return m_injectedBundlePath; }

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -223 +223 @@
 #endif // !LOG_DISABLED
 
-PassRefPtr<WebPageProxy> WebPageProxy::create(PageClient* pageClient, PassRefPtr<WebProcessProxy> process, WebPageGroup* pageGroup, uint64_t pageID)
+PassRefPtr<WebPageProxy> WebPageProxy::create(PageClient& pageClient, PassRefPtr<WebProcessProxy> process, WebPageGroup* pageGroup, uint64_t pageID)
 {
     return adoptRef(new WebPageProxy(pageClient, process, pageGroup, pageID));
 }
 
-WebPageProxy::WebPageProxy(PageClient* pageClient, PassRefPtr<WebProcessProxy> process, WebPageGroup* pageGroup, uint64_t pageID)
+WebPageProxy::WebPageProxy(PageClient& pageClient, PassRefPtr<WebProcessProxy> process, WebPageGroup* pageGroup, uint64_t pageID)
     : m_pageClient(pageClient)
     , m_process(process)
@@ -491 +491 @@
     initializeWebPage();
 
-    m_pageClient->didRelaunchProcess();
+    m_pageClient.didRelaunchProcess();
     m_drawingArea->waitForBackingStoreUpdateOnNextPaint();
 }
@@ -517 +517 @@
         m_process->registerNewWebBackForwardListItem(items[i].get());
 
-    m_drawingArea = m_pageClient->createDrawingAreaProxy();
+    m_drawingArea = m_pageClient.createDrawingAreaProxy();
     ASSERT(m_drawingArea);
 
@@ -547 +547 @@
 
     m_backForwardList->pageClosed();
-    m_pageClient->pageClosed();
+    m_pageClient.pageClosed();
 
     m_process->disconnectFramesFromPage(this);
@@ -911 +911 @@
 void WebPageProxy::setViewNeedsDisplay(const IntRect& rect)
 {
-    m_pageClient->setViewNeedsDisplay(rect);
+    m_pageClient.setViewNeedsDisplay(rect);
 }
 
 void WebPageProxy::displayView()
 {
-    m_pageClient->displayView();
+    m_pageClient.displayView();
 }
 
 bool WebPageProxy::canScrollView()
 {
-    return m_pageClient->canScrollView();
+    return m_pageClient.canScrollView();
 }
 
 void WebPageProxy::scrollView(const IntRect& scrollRect, const IntSize& scrollOffset)
 {
-    m_pageClient->scrollView(scrollRect, scrollOffset);
+    m_pageClient.scrollView(scrollRect, scrollOffset);
 }
 
@@ -932 +932 @@
 {
     m_viewState &= ~flagsToUpdate;
-    if (flagsToUpdate & ViewState::WindowIsVisible && m_pageClient->isWindowVisible())
+    if (flagsToUpdate & ViewState::WindowIsVisible && m_pageClient.isWindowVisible())
         m_viewState |= ViewState::WindowIsVisible;
-    if (flagsToUpdate & ViewState::IsFocused && m_pageClient->isViewFocused())
+    if (flagsToUpdate & ViewState::IsFocused && m_pageClient.isViewFocused())
         m_viewState |= ViewState::IsFocused;
-    if (flagsToUpdate & ViewState::WindowIsActive && m_pageClient->isViewWindowActive())
+    if (flagsToUpdate & ViewState::WindowIsActive && m_pageClient.isViewWindowActive())
         m_viewState |= ViewState::WindowIsActive;
-    if (flagsToUpdate & ViewState::IsVisible && m_pageClient->isViewVisible())
+    if (flagsToUpdate & ViewState::IsVisible && m_pageClient.isViewVisible())
         m_viewState |= ViewState::IsVisible;
-    if (flagsToUpdate & ViewState::IsInWindow && m_pageClient->isViewInWindow())
+    if (flagsToUpdate & ViewState::IsInWindow && m_pageClient.isViewInWindow())
         m_viewState |= ViewState::IsInWindow;
 }
@@ -979 +979 @@
     if (mayHaveChanged & ViewState::IsInWindow) {
         if (m_viewState & ViewState::IsInWindow) {
-            LayerHostingMode layerHostingMode = m_pageClient->viewLayerHostingMode();
+            LayerHostingMode layerHostingMode = m_pageClient.viewLayerHostingMode();
             if (m_layerHostingMode != layerHostingMode) {
                 m_layerHostingMode = layerHostingMode;
@@ -1016 +1016 @@
 IntSize WebPageProxy::viewSize() const
 {
-    return m_pageClient->viewSize();
+    return m_pageClient.viewSize();
 }
 
@@ -1132 +1132 @@
     }
 
-    m_pageClient->startDrag(dragData, dragImage.release());
+    m_pageClient.startDrag(dragData, dragImage.release());
 }
 #endif
@@ -1377 +1377 @@
         if (m_touchEventQueue.isEmpty()) {
             bool isEventHandled = false;
-            m_pageClient->doneWithTouchEvent(event, isEventHandled);
+            m_pageClient.doneWithTouchEvent(event, isEventHandled);
         } else {
             // We attach the incoming events to the newest queued event so that all
@@ -2011 +2011 @@
     m_process->pagePreferencesChanged(this);
 
-    m_pageClient->preferencesDidChange();
+    m_pageClient.preferencesDidChange();
 
     // FIXME: It probably makes more sense to send individual preference changes.
@@ -2161 +2161 @@
     if (frame->isMainFrame()) {
         m_pageLoadState.didCommitLoad();
-        m_pageClient->didCommitLoadForMainFrame();
+        m_pageClient.didCommitLoadForMainFrame();
     }
 
@@ -2167 +2167 @@
     // FIXME (bug 59111): didCommitLoadForFrame comes too late when restoring a page from b/f cache, making us disable secure event mode in password fields.
     // FIXME: A load going on in one frame shouldn't affect text editing in other frames on the page.
-    m_pageClient->resetSecureInputState();
+    m_pageClient.resetSecureInputState();
     dismissCorrectionPanel(ReasonForDismissingAlternativeTextIgnored);
-    m_pageClient->dismissDictionaryLookupPanel();
+    m_pageClient.dismissDictionaryLookupPanel();
 #endif
 
@@ -2530 +2530 @@
         m_process->responsivenessTimer()->stop();
 
-    m_pageClient->clearAllEditCommands();
+    m_pageClient.clearAllEditCommands();
     m_uiClient.close(this);
 }
@@ -2680 +2680 @@
 void WebPageProxy::setWindowFrame(const FloatRect& newWindowFrame)
 {
-    m_uiClient.setWindowFrame(this, m_pageClient->convertToDeviceSpace(newWindowFrame));
+    m_uiClient.setWindowFrame(this, m_pageClient.convertToDeviceSpace(newWindowFrame));
 }
 
 void WebPageProxy::getWindowFrame(FloatRect& newWindowFrame)
 {
-    newWindowFrame = m_pageClient->convertToUserSpace(m_uiClient.windowFrame(this));
+    newWindowFrame = m_pageClient.convertToUserSpace(m_uiClient.windowFrame(this));
 }
     
 void WebPageProxy::screenToWindow(const IntPoint& screenPoint, IntPoint& windowPoint)
 {
-    windowPoint = m_pageClient->screenToWindow(screenPoint);
+    windowPoint = m_pageClient.screenToWindow(screenPoint);
 }
     
 void WebPageProxy::windowToScreen(const IntRect& viewRect, IntRect& result)
 {
-    result = m_pageClient->windowToScreen(viewRect);
+    result = m_pageClient.windowToScreen(viewRect);
 }
     
@@ -2712 +2712 @@
 void WebPageProxy::pageDidRequestScroll(const IntPoint& point)
 {
-    m_pageClient->pageDidRequestScroll(point);
+    m_pageClient.pageDidRequestScroll(point);
 }
 
 void WebPageProxy::pageTransitionViewportReady()
 {
-    m_pageClient->pageTransitionViewportReady();
+    m_pageClient.pageTransitionViewportReady();
 }
 
 void WebPageProxy::didRenderFrame(const WebCore::IntSize& contentsSize, const WebCore::IntRect& coveredRect)
 {
-    m_pageClient->didRenderFrame(contentsSize, coveredRect);
+    m_pageClient.didRenderFrame(contentsSize, coveredRect);
 }
 
@@ -2729 +2729 @@
 void WebPageProxy::didChangeViewportProperties(const ViewportAttributes& attr)
 {
-    m_pageClient->didChangeViewportProperties(attr);
+    m_pageClient.didChangeViewportProperties(attr);
 }
 
@@ -2808 +2808 @@
 void WebPageProxy::handleDownloadRequest(DownloadProxy* download)
 {
-    m_pageClient->handleDownloadRequest(download);
+    m_pageClient.handleDownloadRequest(download);
 }
 #endif // PLATFORM(EFL) || PLATFORM(GTK)
@@ -2815 +2815 @@
 void WebPageProxy::didChangeContentSize(const IntSize& size)
 {
-    m_pageClient->didChangeContentSize(size);
+    m_pageClient.didChangeContentSize(size);
 }
 #endif
@@ -2835 +2835 @@
 #endif
     if (!m_colorPicker)
-        m_colorPicker = m_pageClient->createColorPicker(this, initialColor, elementRect);
+        m_colorPicker = m_pageClient.createColorPicker(this, initialColor, elementRect);
     m_colorPicker->showColorPicker(initialColor);
 }
@@ -2948 +2948 @@
     // Selection being none is a temporary state when editing. Flipping secure input state too quickly was causing trouble (not fully understood).
     if (couldChangeSecureInputState && !editorState.selectionIsNone)
-        m_pageClient->updateSecureInputState();
+        m_pageClient.updateSecureInputState();
 
     if (editorState.shouldIgnoreCompositionSelectionChange)
@@ -2954 +2954 @@
 
     if (closedComposition)
-        m_pageClient->notifyInputContextAboutDiscardedComposition();
+        m_pageClient.notifyInputContextAboutDiscardedComposition();
     if (editorState.hasComposition) {
         // Abandon the current inline input session if selection changed for any other reason but an input method changing the composition.
         // FIXME: This logic should be in WebCore, no need to round-trip to UI process to cancel the composition.
         cancelComposition();
-        m_pageClient->notifyInputContextAboutDiscardedComposition();
+        m_pageClient.notifyInputContextAboutDiscardedComposition();
     }
 #if PLATFORM(IOS)
     else {
         // We need to notify the client on iOS to make sure the selection is redrawn.
-        m_pageClient->selectionDidChange();
+        m_pageClient.selectionDidChange();
     }
 #endif
 #elif PLATFORM(EFL) || PLATFORM(GTK)
-    m_pageClient->updateTextInputState();
+    m_pageClient.updateTextInputState();
 #endif
 }
@@ -2981 +2981 @@
 void WebPageProxy::canUndoRedo(uint32_t action, bool& result)
 {
-    result = m_pageClient->canUndoRedo(static_cast<UndoOrRedo>(action));
+    result = m_pageClient.canUndoRedo(static_cast<UndoOrRedo>(action));
 }
 
 void WebPageProxy::executeUndoRedo(uint32_t action, bool& result)
 {
-    m_pageClient->executeUndoRedo(static_cast<UndoOrRedo>(action));
+    m_pageClient.executeUndoRedo(static_cast<UndoOrRedo>(action));
     result = true;
 }
@@ -2992 +2992 @@
 void WebPageProxy::clearAllEditCommands()
 {
-    m_pageClient->clearAllEditCommands();
+    m_pageClient.clearAllEditCommands();
 }
 
@@ -3008 +3008 @@
 {
     RefPtr<FindIndicator> findIndicator = FindIndicator::create(selectionRectInWindowCoordinates, textRectsInSelectionRectCoordinates, contentImageScaleFactor, contentImageHandle);
-    m_pageClient->setFindIndicator(findIndicator.release(), fadeOut, animate);
+    m_pageClient.setFindIndicator(findIndicator.release(), fadeOut, animate);
 }
 
@@ -3078 +3078 @@
     }
 
-    m_activePopupMenu = m_pageClient->createPopupMenuProxy(this);
+    m_activePopupMenu = m_pageClient.createPopupMenuProxy(this);
 
     if (!m_activePopupMenu)
@@ -3138 +3138 @@
     }
 
-    m_activeContextMenu = m_pageClient->createContextMenuProxy(this);
+    m_activeContextMenu = m_pageClient.createContextMenuProxy(this);
     if (!m_activeContextMenu)
         return;
@@ -3281 +3281 @@
 void WebPageProxy::registerEditCommand(PassRefPtr<WebEditCommandProxy> commandProxy, UndoOrRedo undoOrRedo)
 {
-    m_pageClient->registerEditCommand(commandProxy, undoOrRedo);
+    m_pageClient.registerEditCommand(commandProxy, undoOrRedo);
 }
 
@@ -3399 +3399 @@
     String oldToolTip = m_toolTip;
     m_toolTip = toolTip;
-    m_pageClient->toolTipChanged(oldToolTip, m_toolTip);
+    m_pageClient.toolTipChanged(oldToolTip, m_toolTip);
 }
 
@@ -3406 +3406 @@
     // The Web process may have asked to change the cursor when the view was in an active window, but
     // if it is no longer in a window or the window is not active, then the cursor should not change.
-    if (m_pageClient->isViewWindowActive())
-        m_pageClient->setCursor(cursor);
+    if (m_pageClient.isViewWindowActive())
+        m_pageClient.setCursor(cursor);
 }
 
 void WebPageProxy::setCursorHiddenUntilMouseMoves(bool hiddenUntilMouseMoves)
 {
-    m_pageClient->setCursorHiddenUntilMouseMoves(hiddenUntilMouseMoves);
+    m_pageClient.setCursorHiddenUntilMouseMoves(hiddenUntilMouseMoves);
 }
 
@@ -3485 +3485 @@
             m_process->send(Messages::WebPage::KeyEvent(m_keyEventQueue.first()), m_pageID);
 
-        m_pageClient->doneWithKeyEvent(event, handled);
+        m_pageClient.doneWithKeyEvent(event, handled);
         if (handled)
             break;
@@ -3502 +3502 @@
         m_touchEventQueue.removeFirst();
 
-        m_pageClient->doneWithTouchEvent(queuedEvents.forwardedEvent, handled);
+        m_pageClient.doneWithTouchEvent(queuedEvents.forwardedEvent, handled);
         for (size_t i = 0; i < queuedEvents.deferredTouchEvents.size(); ++i) {
             bool isEventHandled = false;
-            m_pageClient->doneWithTouchEvent(queuedEvents.deferredTouchEvents.at(i), isEventHandled);
+            m_pageClient.doneWithTouchEvent(queuedEvents.deferredTouchEvents.at(i), isEventHandled);
         }
         break;
@@ -3680 +3680 @@
     m_pageLoadState.reset();
 
-    m_pageClient->processDidCrash();
+    m_pageClient.processDidCrash();
     m_loaderClient.processDidCrash(this);
 }
@@ -3770 +3770 @@
         return;
 
-    ASSERT(m_pageClient);
     m_process->removeMessageReceiver(Messages::WebPageProxy::messageReceiverName(), m_pageID);
 
@@ -3784 +3783 @@
     resetState();
 
-    m_pageClient->clearAllEditCommands();
+    m_pageClient.clearAllEditCommands();
     m_pendingLearnOrIgnoreWordMessageCount = 0;
 
@@ -3808 +3807 @@
 #if !PLATFORM(IOS) && PLATFORM(MAC)
     dismissCorrectionPanel(ReasonForDismissingAlternativeTextIgnored);
-    m_pageClient->dismissDictionaryLookupPanel();
+    m_pageClient.dismissDictionaryLookupPanel();
 #endif
 }
@@ -3814 +3813 @@
 void WebPageProxy::initializeCreationParameters()
 {
-    m_creationParameters.viewSize = m_pageClient->viewSize();
+    m_creationParameters.viewSize = m_pageClient.viewSize();
     m_creationParameters.viewState = m_viewState;
     m_creationParameters.drawingAreaType = m_drawingArea->type();
@@ -3845 +3844 @@
     m_creationParameters.layerHostingMode = m_layerHostingMode;
 #if !PLATFORM(IOS)
-    m_creationParameters.colorSpace = m_pageClient->colorSpace();
+    m_creationParameters.colorSpace = m_pageClient.colorSpace();
 #endif // !PLATFORM(IOS)
 #endif
@@ -3853 +3852 @@
 void WebPageProxy::enterAcceleratedCompositingMode(const LayerTreeContext& layerTreeContext)
 {
-    m_pageClient->enterAcceleratedCompositingMode(layerTreeContext);
+    m_pageClient.enterAcceleratedCompositingMode(layerTreeContext);
 }
 
 void WebPageProxy::exitAcceleratedCompositingMode()
 {
-    m_pageClient->exitAcceleratedCompositingMode();
+    m_pageClient.exitAcceleratedCompositingMode();
 }
 
 void WebPageProxy::updateAcceleratedCompositingMode(const LayerTreeContext& layerTreeContext)
 {
-    m_pageClient->updateAcceleratedCompositingMode(layerTreeContext);
+    m_pageClient.updateAcceleratedCompositingMode(layerTreeContext);
 }
 #endif // USE(ACCELERATED_COMPOSITING)
@@ -3937 +3936 @@
         return;
 
-    if (m_pageClient->decidePolicyForGeolocationPermissionRequest(*frame, *origin, *request))
+    if (m_pageClient.decidePolicyForGeolocationPermissionRequest(*frame, *origin, *request))
         return;
 
@@ -4025 +4024 @@
 {
 #if USE(APPKIT)
-    m_pageClient->recommendedScrollbarStyleDidChange(newStyle);
+    m_pageClient.recommendedScrollbarStyleDidChange(newStyle);
 #else
     UNUSED_PARAM(newStyle);
@@ -4186 +4185 @@
         isDiscardable = false;
     else
-        isDiscardable = !m_pageClient->isViewWindowActive() || !isViewVisible();
+        isDiscardable = !m_pageClient.isViewWindowActive() || !isViewVisible();
 
     m_drawingArea->setBackingStoreIsDiscardable(isDiscardable);
@@ -4252 +4251 @@
 void WebPageProxy::showCorrectionPanel(int32_t panelType, const FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacementString, const Vector<String>& alternativeReplacementStrings)
 {
-    m_pageClient->showCorrectionPanel((AlternativeTextType)panelType, boundingBoxOfReplacedString, replacedString, replacementString, alternativeReplacementStrings);
+    m_pageClient.showCorrectionPanel((AlternativeTextType)panelType, boundingBoxOfReplacedString, replacedString, replacementString, alternativeReplacementStrings);
 }
 
 void WebPageProxy::dismissCorrectionPanel(int32_t reason)
 {
-    m_pageClient->dismissCorrectionPanel((ReasonForDismissingAlternativeText)reason);
+    m_pageClient.dismissCorrectionPanel((ReasonForDismissingAlternativeText)reason);
 }
 
 void WebPageProxy::dismissCorrectionPanelSoon(int32_t reason, String& result)
 {
-    result = m_pageClient->dismissCorrectionPanelSoon((ReasonForDismissingAlternativeText)reason);
+    result = m_pageClient.dismissCorrectionPanelSoon((ReasonForDismissingAlternativeText)reason);
 }
 
 void WebPageProxy::recordAutocorrectionResponse(int32_t responseType, const String& replacedString, const String& replacementString)
 {
-    m_pageClient->recordAutocorrectionResponse((AutocorrectionResponseType)responseType, replacedString, replacementString);
+    m_pageClient.recordAutocorrectionResponse((AutocorrectionResponseType)responseType, replacedString, replacementString);
 }
 
@@ -4279 +4278 @@
 void WebPageProxy::showDictationAlternativeUI(const WebCore::FloatRect& boundingBoxOfDictatedText, uint64_t dictationContext)
 {
-    m_pageClient->showDictationAlternativeUI(boundingBoxOfDictatedText, dictationContext);
+    m_pageClient.showDictationAlternativeUI(boundingBoxOfDictatedText, dictationContext);
 }
 
 void WebPageProxy::removeDictationAlternatives(uint64_t dictationContext)
 {
-    m_pageClient->removeDictationAlternatives(dictationContext);
+    m_pageClient.removeDictationAlternatives(dictationContext);
 }
 
 void WebPageProxy::dictationAlternatives(uint64_t dictationContext, Vector<String>& result)
 {
-    result = m_pageClient->dictationAlternatives(dictationContext);
+    result = m_pageClient.dictationAlternatives(dictationContext);
 }
 #endif

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -323 +323 @@
 public:
 
-    static PassRefPtr<WebPageProxy> create(PageClient*, PassRefPtr<WebProcessProxy>, WebPageGroup*, uint64_t pageID);
+    static PassRefPtr<WebPageProxy> create(PageClient&, PassRefPtr<WebProcessProxy>, WebPageGroup*, uint64_t pageID);
     virtual ~WebPageProxy();
 
@@ -848 +848 @@
         
 private:
-    WebPageProxy(PageClient*, PassRefPtr<WebProcessProxy>, WebPageGroup*, uint64_t pageID);
+    WebPageProxy(PageClient&, PassRefPtr<WebProcessProxy>, WebPageGroup*, uint64_t pageID);
     void platformInitialize();
     void initializeCreationParameters();
@@ -1139 +1139 @@
 #endif
 
-    PageClient* m_pageClient;
+    PageClient& m_pageClient;
     WebLoaderClient m_loaderClient;
     WebPolicyClient m_policyClient;

trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp

@@ -161 +161 @@
 }
 
-PassRefPtr<WebPageProxy> WebProcessProxy::createWebPage(PageClient* pageClient, WebContext*, WebPageGroup* pageGroup)
+PassRefPtr<WebPageProxy> WebProcessProxy::createWebPage(PageClient& pageClient, WebContext*, WebPageGroup* pageGroup)
 {
     uint64_t pageID = generatePageID();

trunk/Source/WebKit2/UIProcess/WebProcessProxy.h

@@ -78 +78 @@
 
     static WebPageProxy* webPage(uint64_t pageID);
-    PassRefPtr<WebPageProxy> createWebPage(PageClient*, WebContext*, WebPageGroup*);
+    PassRefPtr<WebPageProxy> createWebPage(PageClient&, WebContext*, WebPageGroup*);
     void addExistingWebPage(WebPageProxy*, uint64_t pageID);
     void removeWebPage(uint64_t pageID);

trunk/Source/WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp

@@ -58 +58 @@
     // it will arrive without a GdkEvent associated, so the keyEventQueue will be empty.
     if (!m_keyEventQueue.isEmpty())
-        m_pageClient->getEditorCommandsForKeyEvent(m_keyEventQueue.first(), eventType, commandsList);
+        m_pageClient.getEditorCommandsForKeyEvent(m_keyEventQueue.first(), eventType, commandsList);
 }
 

trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm

@@ -276 +276 @@
 {
     m_editorState = state;
-    handled = m_pageClient->interpretKeyEvent(m_keyEventQueue.first(), isCharEvent);
+    handled = m_pageClient.interpretKeyEvent(m_keyEventQueue.first(), isCharEvent);
 }
 
@@ -357 +357 @@
 void WebPageProxy::mainDocumentDidReceiveMobileDocType()
 {
-    m_pageClient->mainDocumentDidReceiveMobileDocType();
+    m_pageClient.mainDocumentDidReceiveMobileDocType();
 }
 
 void WebPageProxy::didGetTapHighlightGeometries(uint64_t requestID, const WebCore::Color& color, const Vector<WebCore::FloatQuad>& highlightedQuads, const WebCore::IntSize& topLeftRadius, const WebCore::IntSize& topRightRadius, const WebCore::IntSize& bottomLeftRadius, const WebCore::IntSize& bottomRightRadius)
 {
-    m_pageClient->didGetTapHighlightGeometries(requestID, color, highlightedQuads, topLeftRadius, topRightRadius, bottomLeftRadius, bottomRightRadius);
+    m_pageClient.didGetTapHighlightGeometries(requestID, color, highlightedQuads, topLeftRadius, topRightRadius, bottomLeftRadius, bottomRightRadius);
 }
 
 void WebPageProxy::didChangeViewportArguments(const WebCore::ViewportArguments& viewportArguments)
 {
-    m_pageClient->didChangeViewportArguments(viewportArguments);
+    m_pageClient.didChangeViewportArguments(viewportArguments);
 }
 
 void WebPageProxy::startAssistingNode(const WebCore::IntRect& scrollRect, bool hasNextFocusable, bool hasPreviousFocusable)
 {
-    m_pageClient->startAssistingNode(scrollRect, hasNextFocusable, hasPreviousFocusable);
+    m_pageClient.startAssistingNode(scrollRect, hasNextFocusable, hasPreviousFocusable);
 }
 
 void WebPageProxy::stopAssistingNode()
 {
-    m_pageClient->stopAssistingNode();
+    m_pageClient.stopAssistingNode();
 }
 
@@ -402 +402 @@
 void WebPageProxy::setAcceleratedCompositingRootLayer(PlatformLayer* rootLayer)
 {
-    m_pageClient->setAcceleratedCompositingRootLayer(rootLayer);
+    m_pageClient.setAcceleratedCompositingRootLayer(rootLayer);
 }
 

trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm

@@ -151 +151 @@
     // In case the UI client overrides getWindowFrame(), we call it here to make sure we send the appropriate window frame.
     FloatRect windowFrameInScreenCoordinates = m_uiClient.windowFrame(this);
-    FloatRect windowFrameInUnflippedScreenCoordinates = m_pageClient->convertToUserSpace(windowFrameInScreenCoordinates);
+    FloatRect windowFrameInUnflippedScreenCoordinates = m_pageClient.convertToUserSpace(windowFrameInScreenCoordinates);
 
     process()->send(Messages::WebPage::WindowAndViewFramesChanged(windowFrameInScreenCoordinates, windowFrameInUnflippedScreenCoordinates, viewFrameInWindowCoordinates, accessibilityViewCoordinates), m_pageID);
@@ -241 +241 @@
     for (size_t i = 0; i < dictationAlternativesWithRange.size(); ++i) {
         const TextAlternativeWithRange& alternativeWithRange = dictationAlternativesWithRange[i];
-        uint64_t dictationContext = m_pageClient->addDictationAlternatives(alternativeWithRange.alternatives);
+        uint64_t dictationContext = m_pageClient.addDictationAlternatives(alternativeWithRange.alternatives);
         if (dictationContext)
             dictationAlternatives.append(DictationAlternative(alternativeWithRange.range.location, alternativeWithRange.range.length, dictationContext));
@@ -360 +360 @@
         return;
     
-    m_pageClient->setDragImage(clientPosition, dragImage.release(), isLinkDrag);
+    m_pageClient.setDragImage(clientPosition, dragImage.release(), isLinkDrag);
 }
 
@@ -374 +374 @@
         archiveBuffer = SharedBuffer::create(static_cast<unsigned char*>(sharedMemoryArchive->data()), archiveSize);
     }
-    m_pageClient->setPromisedData(pasteboardName, imageBuffer, filename, extension, title, url, visibleURL, archiveBuffer);
+    m_pageClient.setPromisedData(pasteboardName, imageBuffer, filename, extension, title, url, visibleURL, archiveBuffer);
 }
 #endif
@@ -389 +389 @@
 {
     m_editorState = state;
-    handled = m_pageClient->interpretKeyEvent(m_keyEventQueue.first(), commands);
+    handled = m_pageClient.interpretKeyEvent(m_keyEventQueue.first(), commands);
 }
 
@@ -428 +428 @@
 void WebPageProxy::didPerformDictionaryLookup(const AttributedString& text, const DictionaryPopupInfo& dictionaryPopupInfo)
 {
-    m_pageClient->didPerformDictionaryLookup(text, dictionaryPopupInfo);
+    m_pageClient.didPerformDictionaryLookup(text, dictionaryPopupInfo);
 }
     
 void WebPageProxy::registerWebProcessAccessibilityToken(const CoreIPC::DataReference& data)
 {
-    m_pageClient->accessibilityWebProcessTokenReceived(data);
+    m_pageClient.accessibilityWebProcessTokenReceived(data);
 }    
     
 void WebPageProxy::makeFirstResponder()
 {
-    m_pageClient->makeFirstResponder();
+    m_pageClient.makeFirstResponder();
 }
 
 ColorSpaceData WebPageProxy::colorSpace()
 {
-    return m_pageClient->colorSpace();
+    return m_pageClient.colorSpace();
 }
 
@@ -456 +456 @@
 void WebPageProxy::pluginFocusOrWindowFocusChanged(uint64_t pluginComplexTextInputIdentifier, bool pluginHasFocusAndWindowHasFocus)
 {
-    m_pageClient->pluginFocusOrWindowFocusChanged(pluginComplexTextInputIdentifier, pluginHasFocusAndWindowHasFocus);
+    m_pageClient.pluginFocusOrWindowFocusChanged(pluginComplexTextInputIdentifier, pluginHasFocusAndWindowHasFocus);
 }
 
@@ -463 +463 @@
     MESSAGE_CHECK(isValidPluginComplexTextInputState(pluginComplexTextInputState));
 
-    m_pageClient->setPluginComplexTextInputState(pluginComplexTextInputIdentifier, static_cast<PluginComplexTextInputState>(pluginComplexTextInputState));
+    m_pageClient.setPluginComplexTextInputState(pluginComplexTextInputIdentifier, static_cast<PluginComplexTextInputState>(pluginComplexTextInputState));
 }
 
@@ -470 +470 @@
     MESSAGE_CHECK(isValidKeypressCommandName(selector));
 
-    handled = m_pageClient->executeSavedCommandBySelector(selector);
+    handled = m_pageClient.executeSavedCommandBySelector(selector);
 }
 
@@ -497 +497 @@
 WKView* WebPageProxy::wkView() const
 {
-    return m_pageClient->wkView();
+    return m_pageClient.wkView();
 }
 
 void WebPageProxy::intrinsicContentSizeDidChange(const IntSize& intrinsicContentSize)
 {
-    m_pageClient->intrinsicContentSizeDidChange(intrinsicContentSize);
+    m_pageClient.intrinsicContentSizeDidChange(intrinsicContentSize);
 }
 
 void WebPageProxy::setAcceleratedCompositingRootLayer(PlatformLayer* rootLayer)
 {
-    m_pageClient->setAcceleratedCompositingRootLayer(rootLayer);
+    m_pageClient.setAcceleratedCompositingRootLayer(rootLayer);
 }