summaryrefslogtreecommitdiff
path: root/Source/WebKit2/UIProcess/WebContextUserMessageCoders.h
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-08-12 09:27:39 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2012-08-12 09:27:39 +0200
commit3749d61e1f7a59f5ec5067e560af1eb610c82015 (patch)
tree73dc228333948738bbe02976cacca8cd382bc978 /Source/WebKit2/UIProcess/WebContextUserMessageCoders.h
parentb32b4dcd9a51ab8de6afc53d9e17f8707e1f7a5e (diff)
downloadqtwebkit-3749d61e1f7a59f5ec5067e560af1eb610c82015.tar.gz
Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 (http://svn.webkit.org/repository/webkit/trunk@125365)
New snapshot with build fixes for latest API changes in Qt and all WK1 Win MSVC fixes upstream
Diffstat (limited to 'Source/WebKit2/UIProcess/WebContextUserMessageCoders.h')
-rw-r--r--Source/WebKit2/UIProcess/WebContextUserMessageCoders.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/WebKit2/UIProcess/WebContextUserMessageCoders.h b/Source/WebKit2/UIProcess/WebContextUserMessageCoders.h
index bb2ba39a1..5693751e0 100644
--- a/Source/WebKit2/UIProcess/WebContextUserMessageCoders.h
+++ b/Source/WebKit2/UIProcess/WebContextUserMessageCoders.h
@@ -84,15 +84,15 @@ class WebContextUserMessageDecoder : public UserMessageDecoder<WebContextUserMes
public:
typedef UserMessageDecoder<WebContextUserMessageDecoder> Base;
- WebContextUserMessageDecoder(RefPtr<APIObject>& root, WebContext* context)
+ WebContextUserMessageDecoder(RefPtr<APIObject>& root, WebProcessProxy* process)
: Base(root)
- , m_context(context)
+ , m_process(process)
{
}
WebContextUserMessageDecoder(WebContextUserMessageDecoder& userMessageDecoder, RefPtr<APIObject>& root)
: Base(root)
- , m_context(userMessageDecoder.m_context)
+ , m_process(userMessageDecoder.m_process)
{
}
@@ -110,14 +110,14 @@ public:
uint64_t pageID;
if (!decoder->decode(pageID))
return false;
- coder.m_root = coder.m_context->process()->webPage(pageID);
+ coder.m_root = coder.m_process->webPage(pageID);
break;
}
case APIObject::TypeBundleFrame: {
uint64_t frameID;
if (!decoder->decode(frameID))
return false;
- coder.m_root = coder.m_context->process()->webFrame(frameID);
+ coder.m_root = coder.m_process->webFrame(frameID);
break;
}
case APIObject::TypeBundlePageGroup: {
@@ -135,7 +135,7 @@ public:
}
private:
- WebContext* m_context;
+ WebProcessProxy* m_process;
};
} // namespace WebKit