projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 9.38.198.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
WebKit
/
Source
/
platform
/
exported
/
WebPrerender.cpp
diff --git
a/src/third_party/WebKit/Source/platform/exported/WebPrerender.cpp
b/src/third_party/WebKit/Source/platform/exported/WebPrerender.cpp
index
847a338
..
2851209
100644
(file)
--- a/
src/third_party/WebKit/Source/platform/exported/WebPrerender.cpp
+++ b/
src/third_party/WebKit/Source/platform/exported/WebPrerender.cpp
@@
-38,7
+38,7
@@
namespace blink {
namespace {
namespace {
-class ExtraDataContainer : public
WebCore::
Prerender::ExtraData {
+class ExtraDataContainer : public Prerender::ExtraData {
public:
static PassRefPtr<ExtraDataContainer> create(WebPrerender::ExtraData* extraData) { return adoptRef(new ExtraDataContainer(extraData)); }
public:
static PassRefPtr<ExtraDataContainer> create(WebPrerender::ExtraData* extraData) { return adoptRef(new ExtraDataContainer(extraData)); }
@@
-57,12
+57,12
@@
private:
} // anon namespace
} // anon namespace
-WebPrerender::WebPrerender(PassRefPtr<
WebCore::
Prerender> prerender)
+WebPrerender::WebPrerender(PassRefPtr<Prerender> prerender)
: m_private(prerender)
{
}
: m_private(prerender)
{
}
-const
WebCore::
Prerender* WebPrerender::toPrerender() const
+const Prerender* WebPrerender::toPrerender() const
{
return m_private.get();
}
{
return m_private.get();
}
@@
-109,7
+109,7
@@
void WebPrerender::setExtraData(WebPrerender::ExtraData* extraData)
const WebPrerender::ExtraData* WebPrerender::extraData() const
{
const WebPrerender::ExtraData* WebPrerender::extraData() const
{
- RefPtr<
WebCore::
Prerender::ExtraData> webcoreExtraData = m_private->extraData();
+ RefPtr<Prerender::ExtraData> webcoreExtraData = m_private->extraData();
if (!webcoreExtraData)
return 0;
return static_cast<ExtraDataContainer*>(webcoreExtraData.get())->extraData();
if (!webcoreExtraData)
return 0;
return static_cast<ExtraDataContainer*>(webcoreExtraData.get())->extraData();