diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-07-09 11:03:29 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2010-07-09 11:03:29 -0700 |
| commit | b34d9d688a0b9fc74c04ac9aba0ad7d6cbe10010 (patch) | |
| tree | 6d690a438fdc2718935a09e4bbf8c7324af06e90 | |
| parent | 939d1819c550af9e179aa2fa46668206333e1ebc (diff) | |
| parent | b940ad181c917c781eaab144ed645b7c85dbc94e (diff) | |
| download | external_webkit-b34d9d688a0b9fc74c04ac9aba0ad7d6cbe10010.zip external_webkit-b34d9d688a0b9fc74c04ac9aba0ad7d6cbe10010.tar.gz external_webkit-b34d9d688a0b9fc74c04ac9aba0ad7d6cbe10010.tar.bz2 | |
merge from open-source master
Change-Id: Ib725f9df8c1d3a5105a126bf9475ec060ac0a98a
| -rw-r--r-- | WebCore/page/Connection.cpp | 2 | ||||
| -rw-r--r-- | WebCore/platform/android/PackageNotifier.h | 2 | ||||
| -rw-r--r-- | WebKit/android/WebCoreSupport/CachedFramePlatformDataAndroid.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/page/Connection.cpp b/WebCore/page/Connection.cpp index ffbb838..1031df3 100644 --- a/WebCore/page/Connection.cpp +++ b/WebCore/page/Connection.cpp @@ -36,4 +36,4 @@ Connection::ConnectionType Connection::type() const return networkStateNotifier().type(); } -};
\ No newline at end of file +}; diff --git a/WebCore/platform/android/PackageNotifier.h b/WebCore/platform/android/PackageNotifier.h index ad44bc7..d9b4fd4 100644 --- a/WebCore/platform/android/PackageNotifier.h +++ b/WebCore/platform/android/PackageNotifier.h @@ -66,4 +66,4 @@ PackageNotifier& packageNotifier(); #endif -#endif // PackageNotifier_h
\ No newline at end of file +#endif // PackageNotifier_h diff --git a/WebKit/android/WebCoreSupport/CachedFramePlatformDataAndroid.h b/WebKit/android/WebCoreSupport/CachedFramePlatformDataAndroid.h index ac22d05..20c7be4 100644 --- a/WebKit/android/WebCoreSupport/CachedFramePlatformDataAndroid.h +++ b/WebKit/android/WebCoreSupport/CachedFramePlatformDataAndroid.h @@ -60,4 +60,4 @@ private: } -#endif
\ No newline at end of file +#endif |