summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2010-11-04 15:05:50 -0700
committerJohn Reck <jreck@google.com>2010-11-09 11:38:15 -0800
commit3a36f97f22980239c7e03a1d5c046cc387c481ae (patch)
tree970bf9939b054e775894b098df05a5f4c49ef8c1
parent436279d5475a90e02375897510d4d49ff6252cdd (diff)
downloadexternal_webkit-3a36f97f22980239c7e03a1d5c046cc387c481ae.zip
external_webkit-3a36f97f22980239c7e03a1d5c046cc387c481ae.tar.gz
external_webkit-3a36f97f22980239c7e03a1d5c046cc387c481ae.tar.bz2
Merge Webkit at r70949: moved stub to right namespace
Cherry pick of http://trac.webkit.org/changeset/71346 Change-Id: Id64a084c3e0e74e5b9ec7c0c22141b46b044097d
-rw-r--r--WebCore/platform/android/TemporaryLinkStubs.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/WebCore/platform/android/TemporaryLinkStubs.cpp b/WebCore/platform/android/TemporaryLinkStubs.cpp
index 53640b6..cf8aacf 100644
--- a/WebCore/platform/android/TemporaryLinkStubs.cpp
+++ b/WebCore/platform/android/TemporaryLinkStubs.cpp
@@ -488,9 +488,13 @@ OpaqueJSClassContextData::~OpaqueJSClassContextData()
notImplemented();
}
+#endif
+
+namespace WebCore {
+
void setCookieStoragePrivateBrowsingEnabled(bool)
{
notImplemented();
}
-#endif
+} // namespace WebCore