Diff
Modified: trunk/Source/WebKit2/ChangeLog (159200 => 159201)
--- trunk/Source/WebKit2/ChangeLog 2013-11-13 17:13:44 UTC (rev 159200)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-13 17:26:54 UTC (rev 159201)
@@ -1,3 +1,24 @@
+2013-11-13 Tamas Gergely <[email protected]>
+
+ Remove prefixed template class processing from message receiver generator.
+ https://bugs.webkit.org/show_bug.cgi?id=123095
+
+ Reviewed by Anders Carlsson.
+
+ There was a FIXME in messages.py to remove unprefixed WTF template classes,
+ but in the discussion of the bug report we concluded that in the messages.in
+ files we should follow the C++ naming convention where none of the WTF
+ classes require the WTF prefix.
+
+ * NetworkProcess/NetworkConnectionToWebProcess.messages.in:
+ * Scripts/webkit2/messages.py:
+ (class_template_headers):
+ * Scripts/webkit2/messages_unittest.py:
+ (std):
+ * UIProcess/Storage/StorageManager.messages.in:
+ * UIProcess/WebPageProxy.messages.in:
+ * WebProcess/WebPage/WebPage.messages.in:
+
2013-11-13 Csaba Osztrogonác <[email protected]>
URTBF after r159199 to make cmake and GTK build happy.
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in (159200 => 159201)
--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in 2013-11-13 17:13:44 UTC (rev 159200)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in 2013-11-13 17:26:54 UTC (rev 159201)
@@ -39,7 +39,7 @@
SetCookiesFromDOM(bool privateBrowsingEnabled, WebCore::URL firstParty, WebCore::URL url, WTF::String cookieString)
CookiesEnabled(bool privateBrowsingEnabled, WebCore::URL firstParty, WebCore::URL url) -> (bool enabled)
CookieRequestHeaderFieldValue(bool privateBrowsingEnabled, WebCore::URL firstParty, WebCore::URL url) -> (WTF::String result)
- GetRawCookies(bool privateBrowsingEnabled, WebCore::URL firstParty, WebCore::URL url) -> (WTF::Vector<WebCore::Cookie> cookies)
+ GetRawCookies(bool privateBrowsingEnabled, WebCore::URL firstParty, WebCore::URL url) -> (Vector<WebCore::Cookie> cookies)
DeleteCookie(bool privateBrowsingEnabled, WebCore::URL url, WTF::String cookieName)
RegisterBlobURL(WebCore::URL url, WebKit::BlobRegistrationData data)
Modified: trunk/Source/WebKit2/Scripts/webkit2/messages.py (159200 => 159201)
--- trunk/Source/WebKit2/Scripts/webkit2/messages.py 2013-11-13 17:13:44 UTC (rev 159200)
+++ trunk/Source/WebKit2/Scripts/webkit2/messages.py 2013-11-13 17:26:54 UTC (rev 159201)
@@ -356,12 +356,8 @@
template_string = template_string.strip()
class_template_types = {
- # FIXME: Remove the unprefixed versions.
'Vector': {'headers': ['<wtf/Vector.h>'], 'argument_coder_headers': ['"ArgumentCoders.h"']},
'HashMap': {'headers': ['<wtf/HashMap.h>'], 'argument_coder_headers': ['"ArgumentCoders.h"']},
-
- 'WTF::Vector': {'headers': ['<wtf/Vector.h>'], 'argument_coder_headers': ['"ArgumentCoders.h"']},
- 'WTF::HashMap': {'headers': ['<wtf/HashMap.h>'], 'argument_coder_headers': ['"ArgumentCoders.h"']},
'std::pair': {'headers': ['<utility>'], 'argument_coder_headers': ['"ArgumentCoders.h"']},
}
Modified: trunk/Source/WebKit2/Scripts/webkit2/messages_unittest.py (159200 => 159201)
--- trunk/Source/WebKit2/Scripts/webkit2/messages_unittest.py 2013-11-13 17:13:44 UTC (rev 159200)
+++ trunk/Source/WebKit2/Scripts/webkit2/messages_unittest.py 2013-11-13 17:26:54 UTC (rev 159201)
@@ -71,7 +71,7 @@
TestParameterAttributes([AttributeOne AttributeTwo] uint64_t foo, double bar, [AttributeThree] double baz)
- TemplateTest(WTF::HashMap<String, std::pair<String, uint64_t>> a)
+ TemplateTest(HashMap<String, std::pair<String, uint64_t>> a)
#if PLATFORM(MAC)
DidCreateWebProcessConnection(CoreIPC::MachPort connectionIdentifier)
@@ -209,7 +209,7 @@
{
'name': 'TemplateTest',
'parameters': (
- ('WTF::HashMap<String, std::pair<String, uint64_t>>', 'a'),
+ ('HashMap<String, std::pair<String, uint64_t>>', 'a'),
),
'conditions': (None),
},
@@ -654,24 +654,24 @@
class TemplateTest {
public:
- typedef std::tuple<WTF::HashMap<String, std::pair<String, uint64_t>>> DecodeType;
+ typedef std::tuple<HashMap<String, std::pair<String, uint64_t>>> DecodeType;
static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
static CoreIPC::StringReference name() { return CoreIPC::StringReference("TemplateTest"); }
static const bool isSync = false;
- explicit TemplateTest(const WTF::HashMap<String, std::pair<String, uint64_t>>& a)
+ explicit TemplateTest(const HashMap<String, std::pair<String, uint64_t>>& a)
: m_arguments(a)
{
}
- const std::tuple<const WTF::HashMap<String, std::pair<String, uint64_t>>&> arguments() const
+ const std::tuple<const HashMap<String, std::pair<String, uint64_t>>&> arguments() const
{
return m_arguments;
}
private:
- std::tuple<const WTF::HashMap<String, std::pair<String, uint64_t>>&> m_arguments;
+ std::tuple<const HashMap<String, std::pair<String, uint64_t>>&> m_arguments;
};
#if PLATFORM(MAC)
Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.messages.in (159200 => 159201)
--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.messages.in 2013-11-13 17:13:44 UTC (rev 159200)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.messages.in 2013-11-13 17:26:54 UTC (rev 159201)
@@ -25,7 +25,7 @@
CreateSessionStorageMap(uint64_t storageMapID, uint64_t storageNamespaceID, WebKit::SecurityOriginData securityOriginData) WantsConnection
DestroyStorageMap(uint64_t storageMapID) WantsConnection
- GetValues(uint64_t storageMapID, uint64_t storageMapSeed) -> (WTF::HashMap<WTF::String, WTF::String> values) WantsConnection
+ GetValues(uint64_t storageMapID, uint64_t storageMapSeed) -> (HashMap<WTF::String, WTF::String> values) WantsConnection
SetItem(uint64_t storageMapID, uint64_t sourceStorageAreaID, uint64_t storageMapSeed, WTF::String key, WTF::String value, WTF::String urlString) WantsConnection
RemoveItem(uint64_t storageMapID, uint64_t sourceStorageAreaID, uint64_t storageMapSeed, WTF::String key, WTF::String urlString) WantsConnection
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (159200 => 159201)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2013-11-13 17:13:44 UTC (rev 159200)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2013-11-13 17:26:54 UTC (rev 159201)
@@ -131,7 +131,7 @@
FrameDidBecomeFrameSet(uint64_t frameID, bool value)
# Forms messages
- WillSubmitForm(uint64_t frameID, uint64_t sourceFrameID, WTF::Vector<std::pair<WTF::String, WTF::String>> textFieldValues, uint64_t listenerID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
+ WillSubmitForm(uint64_t frameID, uint64_t sourceFrameID, Vector<std::pair<WTF::String, WTF::String>> textFieldValues, uint64_t listenerID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
# Callback messages
VoidCallback(uint64_t callbackID)
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (159200 => 159201)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2013-11-13 17:13:44 UTC (rev 159200)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2013-11-13 17:26:54 UTC (rev 159201)
@@ -182,7 +182,7 @@
# Spelling and grammar.
AdvanceToNextMisspelling(bool startBeforeSelection)
ChangeSpellingToWord(WTF::String word)
- DidFinishCheckingText(uint64_t requestID, WTF::Vector<WebCore::TextCheckingResult> result)
+ DidFinishCheckingText(uint64_t requestID, Vector<WebCore::TextCheckingResult> result)
DidCancelCheckingText(uint64_t requestID)
#if USE(APPKIT)
UppercaseWord()
@@ -237,7 +237,7 @@
#endif
#if PLATFORM(GTK)
- SetComposition(WTF::String text, WTF::Vector<WebCore::CompositionUnderline> underlines, uint64_t selectionStart, uint64_t selectionEnd, uint64_t replacementRangeStart, uint64_t replacementRangeEnd)
+ SetComposition(WTF::String text, Vector<WebCore::CompositionUnderline> underlines, uint64_t selectionStart, uint64_t selectionEnd, uint64_t replacementRangeStart, uint64_t replacementRangeEnd)
ConfirmComposition(WTF::String text, int64_t selectionStart, int64_t selectionLength)
CancelComposition()
#endif
@@ -255,7 +255,7 @@
ReadSelectionFromPasteboard(WTF::String pasteboardName) -> (bool result)
# Text input.
- SetComposition(WTF::String text, WTF::Vector<WebCore::CompositionUnderline> underlines, uint64_t selectionStart, uint64_t selectionEnd, uint64_t replacementRangeStart, uint64_t replacementRangeEnd) -> (WebKit::EditorState newState)
+ SetComposition(WTF::String text, Vector<WebCore::CompositionUnderline> underlines, uint64_t selectionStart, uint64_t selectionEnd, uint64_t replacementRangeStart, uint64_t replacementRangeEnd) -> (WebKit::EditorState newState)
ConfirmComposition() -> (WebKit::EditorState newState)
CancelComposition() -> (WebKit::EditorState newState)
InsertText(WTF::String text, uint64_t replacementRangeStart, uint64_t replacementRangeEnd) -> (bool handled, WebKit::EditorState newState)
@@ -267,7 +267,7 @@
ExecuteKeypressCommands(Vector<WebCore::KeypressCommand> savedCommands) -> (bool handled, WebKit::EditorState newState)
ShouldDelayWindowOrderingEvent(WebKit::WebMouseEvent event) -> (bool result)
AcceptsFirstMouse(int eventNumber, WebKit::WebMouseEvent event) -> (bool result)
- InsertDictatedText(WTF::String text, uint64_t replacementRangeStart, uint64_t replacementRangeEnd, WTF::Vector<WebCore::DictationAlternative> dictationAlternatives) -> (bool handled, WebKit::EditorState newState)
+ InsertDictatedText(WTF::String text, uint64_t replacementRangeStart, uint64_t replacementRangeEnd, Vector<WebCore::DictationAlternative> dictationAlternatives) -> (bool handled, WebKit::EditorState newState)
#endif
SetMinimumLayoutSize(WebCore::IntSize minimumLayoutSize)
@@ -275,7 +275,7 @@
#if PLATFORM(EFL)
ConfirmComposition(WTF::String compositionString)
- SetComposition(WTF::String compositionString, WTF::Vector<WebCore::CompositionUnderline> underlines, uint64_t cursorPosition)
+ SetComposition(WTF::String compositionString, Vector<WebCore::CompositionUnderline> underlines, uint64_t cursorPosition)
CancelComposition()
#endif
#if USE(COORDINATED_GRAPHICS)
