Commit 3e8db997 authored by andersca@apple.com's avatar andersca@apple.com
Browse files

Fix clang++ build.

* Scripts/webkit2/messages.py:
DrawingAreaInfo is a struct.

* Shared/WebPreferencesStore.cpp:
(WebKit::valueForKey):
Move valueForKey above code that uses it.

* UIProcess/mac/WebInspectorProxyMac.mm:
(-[WebInspectorProxyObjCAdapter windowWillClose:]):
Remove trailing semicolon.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73671 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent e8e1c235
2010-12-09 Anders Carlsson <andersca@apple.com>
Fix clang++ build.
* Scripts/webkit2/messages.py:
DrawingAreaInfo is a struct.
* Shared/WebPreferencesStore.cpp:
(WebKit::valueForKey):
Move valueForKey above code that uses it.
* UIProcess/mac/WebInspectorProxyMac.mm:
(-[WebInspectorProxyObjCAdapter windowWillClose:]):
Remove trailing semicolon.
2010-12-09 Timothy Hatcher <timothy@apple.com>
 
Add support for transparent WebKit2 WKViews.
......@@ -253,6 +253,7 @@ def struct_or_class(namespace, type):
'WebCore::PluginInfo',
'WebCore::ViewportArguments',
'WebCore::WindowFeatures',
'WebKit::DrawingAreaInfo',
'WebKit::PlatformPopupMenuData',
'WebKit::PluginProcessCreationParameters',
'WebKit::WebNavigationDataStore',
......
......@@ -123,6 +123,15 @@ uint32_t defaultValueForKey(const String& key)
return defaults.get(key);
}
template<typename MapType>
static typename MapType::MappedType valueForKey(const MapType& map, const typename MapType::KeyType& key)
{
typename MapType::const_iterator it = map.find(key);
if (it != map.end())
return it->second;
return defaultValueForKey<typename MapType::MappedType>(key);
}
template<typename MapType>
static bool setValueForKey(MapType& map, const typename MapType::KeyType& key, const typename MapType::MappedType& value)
......@@ -135,16 +144,6 @@ static bool setValueForKey(MapType& map, const typename MapType::KeyType& key, c
return true;
}
template<typename MapType>
static typename MapType::MappedType valueForKey(const MapType& map, const typename MapType::KeyType& key)
{
typename MapType::const_iterator it = map.find(key);
if (it != map.end())
return it->second;
return defaultValueForKey<typename MapType::MappedType>(key);
}
bool WebPreferencesStore::setStringValueForKey(const String& key, const String& value)
{
return setValueForKey(m_stringValues, key, value);
......
......@@ -64,7 +64,7 @@ static const CGFloat windowContentBorderThickness = 55;
return self;
}
- (void)windowWillClose:(NSNotification *)notification;
- (void)windowWillClose:(NSNotification *)notification
{
_inspectorProxy->close();
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment