Commit bb24ee22 authored by weinig@apple.com's avatar weinig@apple.com
Browse files

[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):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@159889 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent ee955427
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>
[RTTE] The PermissionRequestManagerProxies should use WebPageProxy references.
......
......@@ -931,7 +931,7 @@ void webkitWebViewBaseCreateWebPage(WebKitWebViewBase* webkitWebViewBase, WebCon
{
WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv;
priv->pageProxy = context->createWebPage(priv->pageClient.get(), pageGroup);
priv->pageProxy = context->createWebPage(*priv->pageClient, pageGroup);
priv->pageProxy->initializeWebPage();
#if ENABLE(FULLSCREEN_API)
......
......@@ -147,7 +147,7 @@ using namespace WebKit;
RunLoop::initializeMainRunLoop();
_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);
_page->setUseFixedLayout(true);
......
......@@ -2908,7 +2908,7 @@ static NSString *pathWithUniqueFilenameForPath(NSString *path)
_data = [[WKViewData alloc] init];
_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();
#if ENABLE(FULLSCREEN_API)
......
......@@ -47,7 +47,7 @@ void WebPageProxy::findZoomableAreaForPoint(const IntPoint& point, const IntSize
void WebPageProxy::didFindZoomableArea(const IntPoint& target, const IntRect& area)
{
m_pageClient->didFindZoomableArea(target, area);
m_pageClient.didFindZoomableArea(target, area);
}
} // namespace WebKit
......
......@@ -52,7 +52,7 @@ WebView::WebView(WebContext* context, WebPageGroup* pageGroup)
, m_opacity(1.0)
{
// 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);
m_page->pageGroup()->preferences()->setForceCompositingMode(true);
......
......@@ -740,7 +740,7 @@ WebProcessProxy* WebContext::createNewWebProcessRespectingProcessCountLimit()
return result;
}
PassRefPtr<WebPageProxy> WebContext::createWebPage(PageClient* pageClient, WebPageGroup* pageGroup, WebPageProxy* relatedPage)
PassRefPtr<WebPageProxy> WebContext::createWebPage(PageClient& pageClient, WebPageGroup* pageGroup, WebPageProxy* relatedPage)
{
RefPtr<WebProcessProxy> process;
if (m_processModel == ProcessModelSharedSecondaryProcess) {
......
......@@ -158,7 +158,7 @@ public:
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; }
......
This diff is collapsed.
......@@ -322,7 +322,7 @@ class WebPageProxy
, public CoreIPC::MessageReceiver {
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();
uint64_t pageID() const { return m_pageID; }
......@@ -847,7 +847,7 @@ public:
WebCore::ScrollPinningBehavior scrollPinningBehavior() { return m_scrollPinningBehavior; }
private:
WebPageProxy(PageClient*, PassRefPtr<WebProcessProxy>, WebPageGroup*, uint64_t pageID);
WebPageProxy(PageClient&, PassRefPtr<WebProcessProxy>, WebPageGroup*, uint64_t pageID);
void platformInitialize();
void initializeCreationParameters();
......@@ -1138,7 +1138,7 @@ private:
void findPlugin(const String& mimeType, uint32_t processType, const String& urlString, const String& frameURLString, const String& pageURLString, bool allowOnlyApplicationPlugins, uint64_t& pluginProcessToken, String& newMIMEType, uint32_t& pluginLoadPolicy, String& unavailabilityDescription);
#endif
PageClient* m_pageClient;
PageClient& m_pageClient;
WebLoaderClient m_loaderClient;
WebPolicyClient m_policyClient;
WebFormClient m_formClient;
......
......@@ -160,7 +160,7 @@ WebPageProxy* WebProcessProxy::webPage(uint64_t pageID)
return globalPageMap().get(pageID);
}
PassRefPtr<WebPageProxy> WebProcessProxy::createWebPage(PageClient* pageClient, WebContext*, WebPageGroup* pageGroup)
PassRefPtr<WebPageProxy> WebProcessProxy::createWebPage(PageClient& pageClient, WebContext*, WebPageGroup* pageGroup)
{
uint64_t pageID = generatePageID();
RefPtr<WebPageProxy> webPage = WebPageProxy::create(pageClient, this, pageGroup, pageID);
......
......@@ -77,7 +77,7 @@ public:
WebContext* context() const { return m_context.get(); }
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);
Vector<WebPageProxy*> pages() const;
......
......@@ -57,7 +57,7 @@ void WebPageProxy::getEditorCommandsForKeyEvent(const AtomicString& eventType, V
// When the keyboard event is started in the WebProcess side (e.g. from the Inspector)
// 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);
}
void WebPageProxy::bindAccessibilityTree(const String& plugID)
......
......@@ -275,7 +275,7 @@ void WebPageProxy::interpretQueuedKeyEvent(const EditorState&, bool&, Vector<Web
void WebPageProxy::interpretKeyEvent(const EditorState& state, bool isCharEvent, bool& handled)
{
m_editorState = state;
handled = m_pageClient->interpretKeyEvent(m_keyEventQueue.first(), isCharEvent);
handled = m_pageClient.interpretKeyEvent(m_keyEventQueue.first(), isCharEvent);
}
// Complex text input support for plug-ins.
......@@ -356,27 +356,27 @@ void WebPageProxy::blurAssistedNode()
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();
}
void WebPageProxy::didPerformDictionaryLookup(const AttributedString&, const DictionaryPopupInfo&)
......@@ -401,7 +401,7 @@ void WebPageProxy::openPDFFromTemporaryFolderWithNativeApplication(const String&
void WebPageProxy::setAcceleratedCompositingRootLayer(PlatformLayer* rootLayer)
{
m_pageClient->setAcceleratedCompositingRootLayer(rootLayer);
m_pageClient.setAcceleratedCompositingRootLayer(rootLayer);
}
} // namespace WebKit
......@@ -150,7 +150,7 @@ void WebPageProxy::windowAndViewFramesChanged(const FloatRect& viewFrameInWindow
// 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);
}
......@@ -240,7 +240,7 @@ bool WebPageProxy::insertDictatedText(const String& text, uint64_t replacementRa
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));
}
......@@ -359,7 +359,7 @@ void WebPageProxy::setDragImage(const WebCore::IntPoint& clientPosition, const S
if (!dragImage)
return;
m_pageClient->setDragImage(clientPosition, dragImage.release(), isLinkDrag);
m_pageClient.setDragImage(clientPosition, dragImage.release(), isLinkDrag);
}
void WebPageProxy::setPromisedData(const String& pasteboardName, const SharedMemory::Handle& imageHandle, uint64_t imageSize, const String& filename, const String& extension,
......@@ -373,7 +373,7 @@ void WebPageProxy::setPromisedData(const String& pasteboardName, const SharedMem
RefPtr<SharedMemory> sharedMemoryArchive = SharedMemory::create(archiveHandle, SharedMemory::ReadOnly);;
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
......@@ -388,7 +388,7 @@ void WebPageProxy::performDictionaryLookupAtLocation(const WebCore::FloatPoint&
void WebPageProxy::interpretQueuedKeyEvent(const EditorState& state, bool& handled, Vector<WebCore::KeypressCommand>& commands)
{
m_editorState = state;
handled = m_pageClient->interpretKeyEvent(m_keyEventQueue.first(), commands);
handled = m_pageClient.interpretKeyEvent(m_keyEventQueue.first(), commands);
}
// Complex text input support for plug-ins.
......@@ -427,22 +427,22 @@ void WebPageProxy::setSmartInsertDeleteEnabled(bool isSmartInsertDeleteEnabled)
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();
}
void WebPageProxy::registerUIProcessAccessibilityTokens(const CoreIPC::DataReference& elementToken, const CoreIPC::DataReference& windowToken)
......@@ -455,21 +455,21 @@ void WebPageProxy::registerUIProcessAccessibilityTokens(const CoreIPC::DataRefer
void WebPageProxy::pluginFocusOrWindowFocusChanged(uint64_t pluginComplexTextInputIdentifier, bool pluginHasFocusAndWindowHasFocus)
{
m_pageClient->pluginFocusOrWindowFocusChanged(pluginComplexTextInputIdentifier, pluginHasFocusAndWindowHasFocus);
m_pageClient.pluginFocusOrWindowFocusChanged(pluginComplexTextInputIdentifier, pluginHasFocusAndWindowHasFocus);
}
void WebPageProxy::setPluginComplexTextInputState(uint64_t pluginComplexTextInputIdentifier, uint64_t pluginComplexTextInputState)
{
MESSAGE_CHECK(isValidPluginComplexTextInputState(pluginComplexTextInputState));
m_pageClient->setPluginComplexTextInputState(pluginComplexTextInputIdentifier, static_cast<PluginComplexTextInputState>(pluginComplexTextInputState));
m_pageClient.setPluginComplexTextInputState(pluginComplexTextInputIdentifier, static_cast<PluginComplexTextInputState>(pluginComplexTextInputState));
}
void WebPageProxy::executeSavedCommandBySelector(const String& selector, bool& handled)
{
MESSAGE_CHECK(isValidKeypressCommandName(selector));
handled = m_pageClient->executeSavedCommandBySelector(selector);
handled = m_pageClient.executeSavedCommandBySelector(selector);
}
bool WebPageProxy::shouldDelayWindowOrderingForEvent(const WebKit::WebMouseEvent& event)
......@@ -496,17 +496,17 @@ bool WebPageProxy::acceptsFirstMouse(int eventNumber, const WebKit::WebMouseEven
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);
}
static NSString *temporaryPDFDirectoryPath()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment