[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
andersca at apple.com
andersca at apple.com
Wed Dec 22 13:09:46 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit ebb108c557e01d6fa52bab0de4a9e52870637301
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Sep 7 23:51:45 2010 +0000
Fix clang++ build.
Reviewed by Sam Weinig.
* UIProcess/API/C/WKAPICast.h:
Move all functions into the WebKit namespace.
* UIProcess/API/C/cf/WKStringCF.cpp:
Add using namespace WebKit.
* WebProcess/InjectedBundle/API/c/WKBundleAPICast.h:
Move all functions into the WebKit namespace.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66933 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index b804967..d5fcd31 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,20 @@
2010-09-07 Anders Carlsson <andersca at apple.com>
+ Reviewed by Sam Weinig.
+
+ Fix clang++ build.
+
+ * UIProcess/API/C/WKAPICast.h:
+ Move all functions into the WebKit namespace.
+
+ * UIProcess/API/C/cf/WKStringCF.cpp:
+ Add using namespace WebKit.
+
+ * WebProcess/InjectedBundle/API/c/WKBundleAPICast.h:
+ Move all functions into the WebKit namespace.
+
+2010-09-07 Anders Carlsson <andersca at apple.com>
+
Reviewed by Darin Adler.
<rdar://problem/8381749> -Wcast-align warning emitted when building with clang
diff --git a/WebKit2/UIProcess/API/C/WKAPICast.h b/WebKit2/UIProcess/API/C/WKAPICast.h
index ae3bc5c..9993e2e 100644
--- a/WebKit2/UIProcess/API/C/WKAPICast.h
+++ b/WebKit2/UIProcess/API/C/WKAPICast.h
@@ -120,12 +120,10 @@ private:
RefPtr<ImplType> m_impl;
};
-} // namespace WebKit
-
/* Opaque typing convenience methods */
template<typename T>
-inline typename WebKit::APITypeInfo<T>::ImplType toWK(T t)
+inline typename APITypeInfo<T>::ImplType toWK(T t)
{
// An example of the conversions that take place:
// const struct OpaqueWKArray* -> const struct OpaqueWKArray -> struct OpaqueWKArray -> struct OpaqueWKArray* -> ImmutableArray*
@@ -133,40 +131,40 @@ inline typename WebKit::APITypeInfo<T>::ImplType toWK(T t)
typedef typename WTF::RemovePointer<T>::Type PotentiallyConstValueType;
typedef typename WTF::RemoveConst<PotentiallyConstValueType>::Type NonConstValueType;
- return reinterpret_cast<typename WebKit::APITypeInfo<T>::ImplType>(const_cast<NonConstValueType*>(t));
+ return reinterpret_cast<typename APITypeInfo<T>::ImplType>(const_cast<NonConstValueType*>(t));
}
template<typename T>
-inline typename WebKit::ImplTypeInfo<T>::APIType toRef(T t)
+inline typename ImplTypeInfo<T>::APIType toRef(T t)
{
- return reinterpret_cast<typename WebKit::ImplTypeInfo<T>::APIType>(t);
+ return reinterpret_cast<typename ImplTypeInfo<T>::APIType>(t);
}
/* Special cases. */
-inline WebKit::ProxyingRefPtr<WebKit::WebString> toRef(WTF::StringImpl* string)
+inline ProxyingRefPtr<WebString> toRef(WTF::StringImpl* string)
{
WTF::StringImpl* impl = string ? string : WTF::StringImpl::empty();
- return WebKit::ProxyingRefPtr<WebKit::WebString>(WebKit::WebString::create(WTF::String(impl)));
+ return ProxyingRefPtr<WebString>(WebString::create(WTF::String(impl)));
}
-inline WebKit::ProxyingRefPtr<WebKit::WebURL> toURLRef(WTF::StringImpl* string)
+inline ProxyingRefPtr<WebURL> toURLRef(WTF::StringImpl* string)
{
WTF::StringImpl* impl = string ? string : WTF::StringImpl::empty();
- return WebKit::ProxyingRefPtr<WebKit::WebURL>(WebKit::WebURL::create(WTF::String(impl)));
+ return ProxyingRefPtr<WebURL>(WebURL::create(WTF::String(impl)));
}
inline WKStringRef toCopiedRef(const WTF::String& string)
{
WTF::StringImpl* impl = string.impl() ? string.impl() : WTF::StringImpl::empty();
- RefPtr<WebKit::WebString> webString = WebKit::WebString::create(WTF::String(impl));
+ RefPtr<WebString> webString = WebString::create(WTF::String(impl));
return toRef(webString.release().releaseRef());
}
inline WKURLRef toCopiedURLRef(const WTF::String& string)
{
WTF::StringImpl* impl = string.impl() ? string.impl() : WTF::StringImpl::empty();
- RefPtr<WebKit::WebURL> webURL = WebKit::WebURL::create(WTF::String(impl));
+ RefPtr<WebURL> webURL = WebURL::create(WTF::String(impl));
return toRef(webURL.release().releaseRef());
}
@@ -186,7 +184,7 @@ inline WTF::String toWTFString(WKURLRef urlRef)
/* Enum conversions */
-inline WKTypeID toRef(WebKit::APIObject::Type type)
+inline WKTypeID toRef(APIObject::Type type)
{
return static_cast<WKTypeID>(type);
}
@@ -219,18 +217,20 @@ inline WKFrameNavigationType toRef(WebCore::NavigationType type)
return wkType;
}
-inline WKEventModifiers toRef(WebKit::WebEvent::Modifiers modifiers)
+inline WKEventModifiers toRef(WebEvent::Modifiers modifiers)
{
WKEventModifiers wkModifiers = 0;
- if (modifiers & WebKit::WebEvent::ShiftKey)
+ if (modifiers & WebEvent::ShiftKey)
wkModifiers |= kWKEventModifiersShiftKey;
- if (modifiers & WebKit::WebEvent::ControlKey)
+ if (modifiers & WebEvent::ControlKey)
wkModifiers |= kWKEventModifiersControlKey;
- if (modifiers & WebKit::WebEvent::AltKey)
+ if (modifiers & WebEvent::AltKey)
wkModifiers |= kWKEventModifiersAltKey;
- if (modifiers & WebKit::WebEvent::MetaKey)
+ if (modifiers & WebEvent::MetaKey)
wkModifiers |= kWKEventModifiersMetaKey;
return wkModifiers;
}
+} // namespace WebKit
+
#endif // WKAPICast_h
diff --git a/WebKit2/UIProcess/API/C/cf/WKStringCF.cpp b/WebKit2/UIProcess/API/C/cf/WKStringCF.cpp
index 295704b..1bb3b69 100644
--- a/WebKit2/UIProcess/API/C/cf/WKStringCF.cpp
+++ b/WebKit2/UIProcess/API/C/cf/WKStringCF.cpp
@@ -29,6 +29,7 @@
#include <wtf/text/WTFString.h>
using namespace WebCore;
+using namespace WebKit;
WKStringRef WKStringCreateWithCFString(CFStringRef cfString)
{
diff --git a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleAPICast.h b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleAPICast.h
index 9b35d59..0a311c8 100644
--- a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleAPICast.h
+++ b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleAPICast.h
@@ -70,23 +70,21 @@ template<> struct BundleImplTypeInfo<WebCore::CSSStyleDeclaration*> { typede
template<> struct BundleImplTypeInfo<WebCore::Node*> { typedef WKBundleNodeRef APIType; };
template<> struct BundleImplTypeInfo<WebCore::Range*> { typedef WKBundleRangeRef APIType; };
-} // namespace WebKit
-
/* Opaque typing convenience methods */
template<typename T>
-inline typename WebKit::BundleAPITypeInfo<T>::ImplType toWK(T t)
+inline typename BundleAPITypeInfo<T>::ImplType toWK(T t)
{
typedef typename WTF::RemovePointer<T>::Type PotentiallyConstValueType;
typedef typename WTF::RemoveConst<PotentiallyConstValueType>::Type NonConstValueType;
- return reinterpret_cast<typename WebKit::BundleAPITypeInfo<T>::ImplType>(const_cast<NonConstValueType*>(t));
+ return reinterpret_cast<typename BundleAPITypeInfo<T>::ImplType>(const_cast<NonConstValueType*>(t));
}
template<typename T>
-inline typename WebKit::BundleImplTypeInfo<T>::APIType toRef(T t)
+inline typename BundleImplTypeInfo<T>::APIType toRef(T t)
{
- return reinterpret_cast<typename WebKit::BundleImplTypeInfo<T>::APIType>(t);
+ return reinterpret_cast<typename BundleImplTypeInfo<T>::APIType>(t);
}
inline WKInsertActionType toWK(WebCore::EditorInsertAction action)
@@ -159,4 +157,6 @@ inline WebCore::UserContentInjectedFrames toUserContentInjectedFrames(WKUserCont
return WebCore::InjectInAllFrames;
}
+} // namespace WebKit
+
#endif // WKBundleAPICast_h
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list