diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-23 17:03:15 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-23 17:03:15 +0200 |
| commit | a73d1c176f2f3e0458861de8590dc20321a501ae (patch) | |
| tree | d897fc5974797c3cb300d7f5916f258df765401f /Source/WebKit2/UIProcess/WebPageProxy.cpp | |
| parent | c311cf639cc1d6570d67b0a80a8ba04dc992a658 (diff) | |
| download | qtwebkit-a73d1c176f2f3e0458861de8590dc20321a501ae.tar.gz | |
Imported WebKit commit a5ae8a56a48e44ebfb9b81aaa5488affaffdb175 (http://svn.webkit.org/repository/webkit/trunk@126420)
New snapshot with OS X 10.6 build fix
Diffstat (limited to 'Source/WebKit2/UIProcess/WebPageProxy.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/WebPageProxy.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Source/WebKit2/UIProcess/WebPageProxy.cpp b/Source/WebKit2/UIProcess/WebPageProxy.cpp index 8d5cc32df..c88c6655a 100644 --- a/Source/WebKit2/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit2/UIProcess/WebPageProxy.cpp @@ -34,6 +34,7 @@ #include "DrawingAreaProxy.h" #include "EventDispatcherMessages.h" #include "FindIndicator.h" +#include "InjectedBundleMessageKinds.h" #include "Logging.h" #include "MessageID.h" #include "NativeWebKeyboardEvent.h" @@ -182,7 +183,7 @@ WebPageProxy::WebPageProxy(PageClient* pageClient, PassRefPtr<WebProcessProxy> p , m_drawsTransparentBackground(false) , m_areMemoryCacheClientCallsEnabled(true) , m_useFixedLayout(false) - , m_paginationMode(Page::Pagination::Unpaginated) + , m_paginationMode(Pagination::Unpaginated) , m_paginationBehavesLikeColumns(false) , m_pageLength(0) , m_gapBetweenPages(0) @@ -1501,7 +1502,7 @@ void WebPageProxy::setFixedLayoutSize(const IntSize& size) m_process->send(Messages::WebPage::SetFixedLayoutSize(size), m_pageID); } -void WebPageProxy::setPaginationMode(WebCore::Page::Pagination::Mode mode) +void WebPageProxy::setPaginationMode(WebCore::Pagination::Mode mode) { if (mode == m_paginationMode) return; @@ -2887,6 +2888,12 @@ NativeWebMouseEvent* WebPageProxy::currentlyProcessedMouseDownEvent() return m_currentlyProcessedMouseDownEvent.get(); } +void WebPageProxy::postMessageToInjectedBundle(const String& messageName, APIObject* messageBody) +{ + // FIXME: We should consider returning false from this function if the messageBody cannot be encoded. + process()->deprecatedSend(InjectedBundleMessage::PostMessageToPage, m_pageID, CoreIPC::In(messageName, WebContextUserMessageEncoder(messageBody))); +} + #if PLATFORM(GTK) void WebPageProxy::failedToShowPopupMenu() { |