summaryrefslogtreecommitdiffstats
path: root/WebKit/android
diff options
context:
space:
mode:
authorBart Sears <bsears@google.com>2011-03-23 13:05:05 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-03-23 13:05:05 -0700
commit9d3427742106914aa11f06f5cf967a0d538f8d24 (patch)
tree48d37c9e9d8fc144daa6f18e3b97364fc4426c33 /WebKit/android
parentf32b2ce68c45663b1193cfe45a10d2889fd61c81 (diff)
parentafc9dcd507336ec34e08df536c7cdf206f405545 (diff)
downloadexternal_webkit-9d3427742106914aa11f06f5cf967a0d538f8d24.zip
external_webkit-9d3427742106914aa11f06f5cf967a0d538f8d24.tar.gz
external_webkit-9d3427742106914aa11f06f5cf967a0d538f8d24.tar.bz2
Merge "Possible fix for bug 4155219 IPv6 support: DNS is not reset when switching from IPv4/IPv6 network to IPv4 network" into honeycomb-mr1
Diffstat (limited to 'WebKit/android')
-rw-r--r--WebKit/android/WebCoreSupport/ChromiumInit.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/WebKit/android/WebCoreSupport/ChromiumInit.cpp b/WebKit/android/WebCoreSupport/ChromiumInit.cpp
index 221704b..1872fb9 100644
--- a/WebKit/android/WebCoreSupport/ChromiumInit.cpp
+++ b/WebKit/android/WebCoreSupport/ChromiumInit.cpp
@@ -54,6 +54,10 @@ bool logMessageHandler(int severity, const char* file, int line, size_t message_
return false;
}
+namespace {
+ scoped_ptr<net::NetworkChangeNotifier> networkChangeNotifier;
+}
+
void initChromium()
{
static Lock lock;
@@ -61,6 +65,7 @@ void initChromium()
static bool initCalled = false;
if (!initCalled) {
logging::SetLogMessageHandler(logMessageHandler);
+ networkChangeNotifier.reset(net::NetworkChangeNotifier::Create());
net::HttpNetworkLayer::EnableSpdy("npn");
initCalled = true;
}