Diff
Modified: trunk/Source/WebKit2/ChangeLog (177607 => 177608)
--- trunk/Source/WebKit2/ChangeLog 2014-12-20 00:38:56 UTC (rev 177607)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-20 00:46:42 UTC (rev 177608)
@@ -1,3 +1,37 @@
+2014-12-19 Anders Carlsson <[email protected]>
+
+ Get rid of the hardcoded set of structs in the message generation script
+ https://bugs.webkit.org/show_bug.cgi?id=139844
+
+ Reviewed by Tim Horton.
+
+ Instead, make it possible to use 'struct' in front of the type name to declare that the type is a struct.
+
+ * DatabaseProcess/DatabaseProcess.messages.in:
+ * DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in:
+ * NetworkProcess/NetworkProcess.messages.in:
+ * PluginProcess/PluginProcess.messages.in:
+ * PluginProcess/WebProcessConnection.messages.in:
+ * Scripts/webkit/messages.py:
+ (struct_or_class):
+ (forward_declarations_for_namespace):
+ (forward_declarations_and_headers):
+ * Scripts/webkit/model.py:
+ (Parameter.__init__):
+ * Scripts/webkit/parser.py:
+ (parse_parameters_string):
+ * UIProcess/Storage/StorageManager.messages.in:
+ * UIProcess/WebContext.messages.in:
+ * UIProcess/WebPageProxy.messages.in:
+ * UIProcess/WebProcessProxy.messages.in:
+ * WebProcess/ApplicationCache/WebApplicationCacheManager.messages.in:
+ * WebProcess/Databases/IndexedDB/WebIDBServerConnection.messages.in:
+ * WebProcess/OriginData/WebOriginDataManager.messages.in:
+ * WebProcess/ResourceCache/WebResourceCacheManager.messages.in:
+ * WebProcess/WebPage/DrawingArea.messages.in:
+ * WebProcess/WebPage/WebPage.messages.in:
+ * WebProcess/WebProcess.messages.in:
+
2014-12-19 Timothy Horton <[email protected]>
Fix the build.
Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.messages.in (177607 => 177608)
--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.messages.in 2014-12-20 00:38:56 UTC (rev 177607)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.messages.in 2014-12-20 00:46:42 UTC (rev 177608)
@@ -24,7 +24,7 @@
messages -> DatabaseProcess LegacyReceiver {
# Initializes the DatabaseProcess with the correct parameters
- InitializeDatabaseProcess(WebKit::DatabaseProcessCreationParameters processCreationParameters)
+ InitializeDatabaseProcess(struct WebKit::DatabaseProcessCreationParameters processCreationParameters)
# Creates a connection for communication with a WebProcess
CreateDatabaseToWebProcessConnection()
Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in (177607 => 177608)
--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in 2014-12-20 00:38:56 UTC (rev 177607)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in 2014-12-20 00:46:42 UTC (rev 177608)
@@ -23,7 +23,7 @@
#if ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
messages -> DatabaseProcessIDBConnection LegacyReceiver {
- EstablishConnection(String databaseName, WebKit::SecurityOriginData openingOrigin, WebKit::SecurityOriginData mainFrameOrigin)
+ EstablishConnection(String databaseName, struct WebKit::SecurityOriginData openingOrigin, struct WebKit::SecurityOriginData mainFrameOrigin)
GetOrEstablishIDBDatabaseMetadata(uint64_t requestID)
DeleteDatabase(uint64_t requestID, String databaseName)
@@ -37,21 +37,21 @@
RollbackTransactionSync(int64_t transactionID) -> (bool success) Delayed
ChangeDatabaseVersion(uint64_t requestID, int64_t transactionID, uint64_t newVersion)
- CreateObjectStore(uint64_t requestID, int64_t transactionID, WebCore::IDBObjectStoreMetadata objectStoreMetadata)
+ CreateObjectStore(uint64_t requestID, int64_t transactionID, struct WebCore::IDBObjectStoreMetadata objectStoreMetadata)
DeleteObjectStore(uint64_t requestID, int64_t transactionID, int64_t objectStoreID)
ClearObjectStore(uint64_t requestID, int64_t transactionID, int64_t objectStoreID);
- CreateIndex(uint64_t requestID, int64_t transactionID, int64_t objectStoreID, WebCore::IDBIndexMetadata indexMetadata)
+ CreateIndex(uint64_t requestID, int64_t transactionID, int64_t objectStoreID, struct WebCore::IDBIndexMetadata indexMetadata)
DeleteIndex(uint64_t requestID, int64_t transactionID, int64_t objectStoreID, int64_t indexID)
- PutRecord(uint64_t requestID, int64_t transactionID, int64_t objectStoreID, WebCore::IDBKeyData key, IPC::DataReference value, int64_t putMode, Vector<int64_t> indexIDs, Vector<Vector<WebCore::IDBKeyData>> indexKeys)
- GetRecord(uint64_t requestID, int64_t transactionID, int64_t objectStoreID, int64_t indexID, WebCore::IDBKeyRangeData keyRange, int64_t cursorType)
+ PutRecord(uint64_t requestID, int64_t transactionID, int64_t objectStoreID, struct WebCore::IDBKeyData key, IPC::DataReference value, int64_t putMode, Vector<int64_t> indexIDs, Vector<Vector<WebCore::IDBKeyData>> indexKeys)
+ GetRecord(uint64_t requestID, int64_t transactionID, int64_t objectStoreID, int64_t indexID, struct WebCore::IDBKeyRangeData keyRange, int64_t cursorType)
- OpenCursor(uint64_t requestID, int64_t transactionID, int64_t objectStoreID, int64_t indexID, int64_t cursorDirection, int64_t cursorType, int64_t taskType, WebCore::IDBKeyRangeData keyRange)
+ OpenCursor(uint64_t requestID, int64_t transactionID, int64_t objectStoreID, int64_t indexID, int64_t cursorDirection, int64_t cursorType, int64_t taskType, struct WebCore::IDBKeyRangeData keyRange)
CursorAdvance(uint64_t requestID, int64_t cursorID, uint64_t count)
- CursorIterate(uint64_t requestID, int64_t cursorID, WebCore::IDBKeyData key)
+ CursorIterate(uint64_t requestID, int64_t cursorID, struct WebCore::IDBKeyData key)
- Count(uint64_t requestID, int64_t transactionID, int64_t objectStoreID, int64_t indexID, WebCore::IDBKeyRangeData keyRange)
- DeleteRange(uint64_t requestID, int64_t transactionID, int64_t objectStoreID, WebCore::IDBKeyRangeData keyRange)
+ Count(uint64_t requestID, int64_t transactionID, int64_t objectStoreID, int64_t indexID, struct WebCore::IDBKeyRangeData keyRange)
+ DeleteRange(uint64_t requestID, int64_t transactionID, int64_t objectStoreID, struct WebCore::IDBKeyRangeData keyRange)
Close()
}
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in (177607 => 177608)
--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in 2014-12-20 00:38:56 UTC (rev 177607)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in 2014-12-20 00:46:42 UTC (rev 177608)
@@ -24,7 +24,7 @@
messages -> NetworkProcess LegacyReceiver {
# Initializes the network process.
- InitializeNetworkProcess(WebKit::NetworkProcessCreationParameters processCreationParameters)
+ InitializeNetworkProcess(struct WebKit::NetworkProcessCreationParameters processCreationParameters)
# Creates a connection for communication with a WebProcess
CreateNetworkConnectionToWebProcess()
Modified: trunk/Source/WebKit2/PluginProcess/PluginProcess.messages.in (177607 => 177608)
--- trunk/Source/WebKit2/PluginProcess/PluginProcess.messages.in 2014-12-20 00:38:56 UTC (rev 177607)
+++ trunk/Source/WebKit2/PluginProcess/PluginProcess.messages.in 2014-12-20 00:46:42 UTC (rev 177608)
@@ -24,7 +24,7 @@
messages -> PluginProcess LegacyReceiver {
# Initializes the plug-in process.
- InitializePluginProcess(WebKit::PluginProcessCreationParameters processCreationParameters)
+ InitializePluginProcess(struct WebKit::PluginProcessCreationParameters processCreationParameters)
# Creates a web process connection. When the connection has been created,
# The plug-in process sends back a DidCreateWebProcessConnection message with
Modified: trunk/Source/WebKit2/PluginProcess/WebProcessConnection.messages.in (177607 => 177608)
--- trunk/Source/WebKit2/PluginProcess/WebProcessConnection.messages.in 2014-12-20 00:38:56 UTC (rev 177607)
+++ trunk/Source/WebKit2/PluginProcess/WebProcessConnection.messages.in 2014-12-20 00:46:42 UTC (rev 177608)
@@ -24,10 +24,10 @@
messages -> WebProcessConnection LegacyReceiver {
# Creates a plug-in instance using the given creation parameters.
- CreatePlugin(WebKit::PluginCreationParameters pluginCreationParameters) -> (bool creationResult, bool wantsWheelEvents, uint32_t remoteLayerClientID) Delayed
+ CreatePlugin(struct WebKit::PluginCreationParameters pluginCreationParameters) -> (bool creationResult, bool wantsWheelEvents, uint32_t remoteLayerClientID) Delayed
# Creates a plug-in instance asynchronously using the given creation parameters.
- CreatePluginAsynchronously(WebKit::PluginCreationParameters pluginCreationParameters)
+ CreatePluginAsynchronously(struct WebKit::PluginCreationParameters pluginCreationParameters)
# Destroys the plug-in instance with the given instance ID.
DestroyPlugin(uint64_t pluginInstanceID, bool asynchronousCreationIncomplete) -> () Delayed
Modified: trunk/Source/WebKit2/Scripts/webkit/messages.py (177607 => 177608)
--- trunk/Source/WebKit2/Scripts/webkit/messages.py 2014-12-20 00:38:56 UTC (rev 177607)
+++ trunk/Source/WebKit2/Scripts/webkit/messages.py 2014-12-20 00:46:42 UTC (rev 177608)
@@ -153,86 +153,20 @@
return surround_in_condition(''.join(result), message.condition)
-def struct_or_class(namespace, type):
- structs = frozenset([
- 'WebCore::Animation',
- 'WebCore::EditorCommandsForKeyEvent',
- 'WebCore::CompositionUnderline',
- 'WebCore::Cookie',
- 'WebCore::FloatPoint3D',
- 'WebCore::FileChooserSettings',
- 'WebCore::GrammarDetail',
- 'WebCore::Highlight',
- 'WebCore::IDBDatabaseMetadata',
- 'WebCore::IDBGetResult',
- 'WebCore::IDBIndexMetadata',
- 'WebCore::IDBKeyData',
- 'WebCore::IDBKeyRangeData',
- 'WebCore::IDBObjectStoreMetadata',
- 'WebCore::IdentityTransformOperation',
- 'WebCore::KeypressCommand',
- 'WebCore::Length',
- 'WebCore::MatrixTransformOperation',
- 'WebCore::Matrix3DTransformOperation',
- 'WebCore::NotificationContents',
- 'WebCore::PasteboardImage',
- 'WebCore::PasteboardWebContent',
- 'WebCore::PerspectiveTransformOperation',
- 'WebCore::PluginInfo',
- 'WebCore::PrintInfo',
- 'WebCore::RotateTransformOperation',
- 'WebCore::ScaleTransformOperation',
- 'WebCore::SkewTransformOperation',
- 'WebCore::TextIndicatorData',
- 'WebCore::TimingFunction',
- 'WebCore::TransformationMatrix',
- 'WebCore::TransformOperation',
- 'WebCore::TransformOperations',
- 'WebCore::TranslateTransformOperation',
- 'WebCore::ViewportArguments',
- 'WebCore::ViewportAttributes',
- 'WebCore::WindowFeatures',
- 'WebKit::ActionMenuHitTestResult',
- 'WebKit::AssistedNodeInformation',
- 'WebKit::AttributedString',
- 'WebKit::BackForwardListItemState',
- 'WebKit::ColorSpaceData',
- 'WebKit::ContextMenuState',
- 'WebKit::DatabaseProcessCreationParameters',
- 'WebKit::DictionaryPopupInfo',
- 'WebKit::DrawingAreaInfo',
- 'WebKit::EditingRange',
- 'WebKit::EditorState',
- 'WebKit::InteractionInformationAtPosition',
- 'WebKit::NavigationActionData',
- 'WebKit::NetworkProcessCreationParameters',
- 'WebKit::PageState',
- 'WebKit::PlatformPopupMenuData',
- 'WebKit::PluginCreationParameters',
- 'WebKit::PluginProcessCreationParameters',
- 'WebKit::PrintInfo',
- 'WebKit::SecurityOriginData',
- 'WebKit::StatisticsData',
- 'WebKit::TextCheckerState',
- 'WebKit::WKOptionItem',
- 'WebKit::WebNavigationDataStore',
- 'WebKit::WebPageCreationParameters',
- 'WebKit::WebPreferencesStore',
- 'WebKit::WebProcessCreationParameters',
- 'WebKit::WebScriptMessageHandlerHandle',
- 'WebKit::WindowGeometry',
- ])
+def struct_or_class(namespace, kind_and_type):
+ kind, type = kind_and_type
qualified_name = '%s::%s' % (namespace, type)
- if qualified_name in structs:
+ if kind == 'struct':
return 'struct %s' % type
+ else:
+ return 'class %s' % type
- return 'class %s' % type
-def forward_declarations_for_namespace(namespace, types):
+def forward_declarations_for_namespace(namespace, kind_and_types):
result = []
result.append('namespace %s {\n' % namespace)
- result += [' %s;\n' % struct_or_class(namespace, x) for x in types]
+ result += [' %s;\n' % struct_or_class(namespace, x) for x in kind_and_types]
result.append('}\n')
return ''.join(result)
@@ -253,9 +187,10 @@
for message in receiver.messages:
if message.reply_parameters != None and message.has_attribute(DELAYED_ATTRIBUTE):
headers.add('<wtf/ThreadSafeRefCounted.h>')
- types_by_namespace['IPC'].update(['Connection'])
+ types_by_namespace['IPC'].update([('class', 'Connection')])
for parameter in receiver.iterparameters():
+ kind = parameter.kind
type = parameter.type
if type.find('<') != -1:
@@ -272,7 +207,7 @@
if len(split) == 2:
namespace = split[0]
inner_type = split[1]
- types_by_namespace[namespace].add(inner_type)
+ types_by_namespace[namespace].add((kind, inner_type))
elif len(split) > 2:
# We probably have a nested struct, which means we can't forward declare it.
# Include its header instead.
Modified: trunk/Source/WebKit2/Scripts/webkit/model.py (177607 => 177608)
--- trunk/Source/WebKit2/Scripts/webkit/model.py 2014-12-20 00:38:56 UTC (rev 177607)
+++ trunk/Source/WebKit2/Scripts/webkit/model.py 2014-12-20 00:46:42 UTC (rev 177608)
@@ -51,7 +51,8 @@
class Parameter(object):
- def __init__(self, type, name, attributes=None, condition=None):
+ def __init__(self, kind, type, name, attributes=None, condition=None):
+ self.kind = kind
self.type = type
self.name = name
self.attributes = frozenset(attributes or [])
Modified: trunk/Source/WebKit2/Scripts/webkit/parser.py (177607 => 177608)
--- trunk/Source/WebKit2/Scripts/webkit/parser.py 2014-12-20 00:38:56 UTC (rev 177607)
+++ trunk/Source/WebKit2/Scripts/webkit/parser.py 2014-12-20 00:46:42 UTC (rev 177608)
@@ -127,6 +127,15 @@
for parameter_string in split_parameters_string(parameters_string):
match = re.search(r'\s*(?:\[(?P<attributes>.*?)\]\s+)?(?P<type_and_name>.*)', parameter_string)
attributes_string, type_and_name_string = match.group('attributes', 'type_and_name')
- parameter_type, parameter_name = type_and_name_string.rsplit(' ', 1)
- parameters.append(model.Parameter(type=parameter_type, name=parameter_name, attributes=parse_attributes_string(attributes_string)))
+
+ split = type_and_name_string.rsplit(' ', 1)
+ parameter_kind = 'class'
+ if split[0].startswith('struct '):
+ parameter_kind = 'struct'
+ split[0] = split[0][7:]
+
+ parameter_type = split[0]
+ parameter_name = split[1]
+
+ parameters.append(model.Parameter(kind=parameter_kind, type=parameter_type, name=parameter_name, attributes=parse_attributes_string(attributes_string)))
return parameters
Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.messages.in (177607 => 177608)
--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.messages.in 2014-12-20 00:38:56 UTC (rev 177607)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.messages.in 2014-12-20 00:46:42 UTC (rev 177608)
@@ -21,9 +21,9 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
messages -> StorageManager {
- CreateLocalStorageMap(uint64_t storageMapID, uint64_t storageNamespaceID, WebKit::SecurityOriginData securityOriginData) WantsConnection
- CreateTransientLocalStorageMap(uint64_t storageMapID, uint64_t storageNamespaceID, WebKit::SecurityOriginData topLevelSecurityOriginData, WebKit::SecurityOriginData securityOriginData) WantsConnection
- CreateSessionStorageMap(uint64_t storageMapID, uint64_t storageNamespaceID, WebKit::SecurityOriginData securityOriginData) WantsConnection
+ CreateLocalStorageMap(uint64_t storageMapID, uint64_t storageNamespaceID, struct WebKit::SecurityOriginData securityOriginData) WantsConnection
+ CreateTransientLocalStorageMap(uint64_t storageMapID, uint64_t storageNamespaceID, struct WebKit::SecurityOriginData topLevelSecurityOriginData, struct WebKit::SecurityOriginData securityOriginData) WantsConnection
+ CreateSessionStorageMap(uint64_t storageMapID, uint64_t storageNamespaceID, struct WebKit::SecurityOriginData securityOriginData) WantsConnection
DestroyStorageMap(uint64_t storageMapID) WantsConnection
GetValues(uint64_t storageMapID, uint64_t storageMapSeed) -> (HashMap<String, String> values) WantsConnection
Modified: trunk/Source/WebKit2/UIProcess/WebContext.messages.in (177607 => 177608)
--- trunk/Source/WebKit2/UIProcess/WebContext.messages.in 2014-12-20 00:38:56 UTC (rev 177607)
+++ trunk/Source/WebKit2/UIProcess/WebContext.messages.in 2014-12-20 00:46:42 UTC (rev 177608)
@@ -22,11 +22,11 @@
messages -> WebContext LegacyReceiver {
- DidGetStatistics(WebKit::StatisticsData statisticsData, uint64_t callbackID)
+ DidGetStatistics(struct WebKit::StatisticsData statisticsData, uint64_t callbackID)
#if PLATFORM(IOS)
- WriteWebContentToPasteboard(WebCore::PasteboardWebContent content)
- WriteImageToPasteboard(WebCore::PasteboardImage pasteboardImage)
+ WriteWebContentToPasteboard(struct WebCore::PasteboardWebContent content)
+ WriteImageToPasteboard(struct WebCore::PasteboardImage pasteboardImage)
WriteStringToPasteboard(String pasteboardType, String text)
ReadStringFromPasteboard(uint64_t index, String pasteboardType) -> (String string)
ReadURLFromPasteboard(uint64_t index, String pasteboardType) -> (String string)
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (177607 => 177608)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2014-12-20 00:38:56 UTC (rev 177607)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2014-12-20 00:46:42 UTC (rev 177608)
@@ -22,7 +22,7 @@
messages -> WebPageProxy {
# UI messages
- CreateNewPage(uint64_t frameID, WebCore::ResourceRequest request, WebCore::WindowFeatures windowFeatures, WebKit::NavigationActionData navigationActionData) -> (uint64_t newPageID, WebKit::WebPageCreationParameters newPageParameters)
+ CreateNewPage(uint64_t frameID, WebCore::ResourceRequest request, struct WebCore::WindowFeatures windowFeatures, struct WebKit::NavigationActionData navigationActionData) -> (uint64_t newPageID, struct WebKit::WebPageCreationParameters newPageParameters)
ShowPage()
ClosePage(bool stopResponsivenessTimer)
RunJavaScriptAlert(uint64_t frameID, String message) -> () Delayed
@@ -42,7 +42,7 @@
WebGLPolicyForURL(String url) -> (uint32_t loadPolicy)
ResolveWebGLPolicyForURL(String url) -> (uint32_t loadPolicy)
#endif // ENABLE(WEBGL)
- DidChangeViewportProperties(WebCore::ViewportAttributes attributes)
+ DidChangeViewportProperties(struct WebCore::ViewportAttributes attributes)
DidReceiveEvent(uint32_t type, bool handled)
StopResponsivenessTimer()
#if !PLATFORM(IOS)
@@ -76,7 +76,7 @@
RunBeforeUnloadConfirmPanel(String message, uint64_t frameID) -> (bool shouldClose)
PageDidScroll()
- RunOpenPanel(uint64_t frameID, WebCore::FileChooserSettings parameters)
+ RunOpenPanel(uint64_t frameID, struct WebCore::FileChooserSettings parameters)
PrintFrame(uint64_t frameID) -> ()
RunModal()
NotifyScrollerThumbIsVisibleInRect(WebCore::IntRect scrollerThumb)
@@ -115,8 +115,8 @@
# Policy messages
DecidePolicyForResponseSync(uint64_t frameID, WebCore::ResourceResponse response, WebCore::ResourceRequest request, bool canShowMIMEType, uint64_t listenerID, WebKit::InjectedBundleUserMessageEncoder userData) -> (bool receivedPolicyAction, uint64_t policyAction, uint64_t downloadID) Variadic
- DecidePolicyForNavigationAction(uint64_t frameID, uint64_t navigationID, WebKit::NavigationActionData navigationActionData, uint64_t originatingFrameID, WebCore::ResourceRequest originalRequest, WebCore::ResourceRequest request, uint64_t listenerID, WebKit::InjectedBundleUserMessageEncoder userData) -> (bool receivedPolicyAction, uint64_t newNavigationID, uint64_t policyAction, uint64_t downloadID) Variadic
- DecidePolicyForNewWindowAction(uint64_t frameID, WebKit::NavigationActionData navigationActionData, WebCore::ResourceRequest request, String frameName, uint64_t listenerID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
+ DecidePolicyForNavigationAction(uint64_t frameID, uint64_t navigationID, struct WebKit::NavigationActionData navigationActionData, uint64_t originatingFrameID, WebCore::ResourceRequest originalRequest, WebCore::ResourceRequest request, uint64_t listenerID, WebKit::InjectedBundleUserMessageEncoder userData) -> (bool receivedPolicyAction, uint64_t newNavigationID, uint64_t policyAction, uint64_t downloadID) Variadic
+ DecidePolicyForNewWindowAction(uint64_t frameID, struct WebKit::NavigationActionData navigationActionData, WebCore::ResourceRequest request, String frameName, uint64_t listenerID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
UnableToImplementPolicy(uint64_t frameID, WebCore::ResourceError error, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
# Progress messages
@@ -165,11 +165,11 @@
ScriptValueCallback(IPC::DataReference resultData, uint64_t callbackID)
ComputedPagesCallback(Vector<WebCore::IntRect> pageRects, double totalScaleFactorForPrinting, uint64_t callbackID)
ValidateCommandCallback(String command, bool isEnabled, int32_t state, uint64_t callbackID)
- EditingRangeCallback(WebKit::EditingRange range, uint64_t callbackID)
+ EditingRangeCallback(struct WebKit::EditingRange range, uint64_t callbackID)
UnsignedCallback(uint64_t result, uint64_t callbackID)
- RectForCharacterRangeCallback(WebCore::IntRect rect, WebKit::EditingRange actualRange, uint64_t callbackID)
+ RectForCharacterRangeCallback(WebCore::IntRect rect, struct WebKit::EditingRange actualRange, uint64_t callbackID)
#if PLATFORM(MAC)
- AttributedStringForCharacterRangeCallback(WebKit::AttributedString string, WebKit::EditingRange actualRange, uint64_t callbackID)
+ AttributedStringForCharacterRangeCallback(struct WebKit::AttributedString string, struct WebKit::EditingRange actualRange, uint64_t callbackID)
#endif
#if PLATFORM(IOS)
GestureCallback(WebCore::IntPoint point, uint32_t gestureType, uint32_t gestureState, uint32_t flags, uint64_t callbackID)
@@ -177,8 +177,8 @@
AutocorrectionDataCallback(Vector<WebCore::FloatRect> textRects, String fontName, double fontSize, uint64_t traits, uint64_t callbackID)
AutocorrectionContextCallback(String beforeText, String markedText, String selectedText, String afterText, uint64_t location, uint64_t length, uint64_t callbackID)
DictationContextCallback(String selectedText, String beforeText, String afterText, uint64_t callbackID)
- InterpretKeyEvent(WebKit::EditorState state, bool isCharEvent) -> (bool handled)
- DidReceivePositionInformation(WebKit::InteractionInformationAtPosition information)
+ InterpretKeyEvent(struct WebKit::EditorState state, bool isCharEvent) -> (bool handled)
+ DidReceivePositionInformation(struct WebKit::InteractionInformationAtPosition information)
SaveImageToLibrary(WebKit::SharedMemory::Handle handle, uint64_t size)
DidUpdateBlockSelectionWithTouch(uint32_t touch, uint32_t flags, float growThreshold, float shrinkThreshold)
ShowPlaybackTargetPicker(bool hasVideo, WebCore::IntRect elementRect)
@@ -222,12 +222,12 @@
ExecuteUndoRedo(uint32_t action) -> (bool result)
# Editor notifications
- EditorStateChanged(WebKit::EditorState editorState)
- CompositionWasCanceled(WebKit::EditorState editorState)
+ EditorStateChanged(struct WebKit::EditorState editorState)
+ CompositionWasCanceled(struct WebKit::EditorState editorState)
# Find messages
DidCountStringMatches(String string, uint32_t matchCount)
- SetTextIndicator(WebCore::TextIndicatorData indicator, bool fadeOut)
+ SetTextIndicator(struct WebCore::TextIndicatorData indicator, bool fadeOut)
ClearTextIndicator()
DidFindString(String string, uint32_t matchCount, int32_t matchIndex)
DidFailToFindString(String string)
@@ -235,7 +235,7 @@
DidGetImageForFindMatch(WebKit::ShareableBitmap::Handle contentImageHandle, uint32_t matchIndex)
# PopupMenu messages
- ShowPopupMenu(WebCore::IntRect rect, uint64_t textDirection, Vector<WebKit::WebPopupItem> items, int32_t selectedIndex, WebKit::PlatformPopupMenuData data)
+ ShowPopupMenu(WebCore::IntRect rect, uint64_t textDirection, Vector<WebKit::WebPopupItem> items, int32_t selectedIndex, struct WebKit::PlatformPopupMenuData data)
HidePopupMenu()
#if ENABLE(CONTEXT_MENUS)
@@ -276,7 +276,7 @@
CheckGrammarOfString(String text) -> (Vector<WebCore::GrammarDetail> results, int32_t badGrammarLocation, int32_t badGrammarLength)
SpellingUIIsShowing() -> (bool isShowing)
UpdateSpellingUIWithMisspelledWord(String misspelledWord)
- UpdateSpellingUIWithGrammarString(String badGrammarPhrase, WebCore::GrammarDetail grammarDetail)
+ UpdateSpellingUIWithGrammarString(String badGrammarPhrase, struct WebCore::GrammarDetail grammarDetail)
GetGuessesForWord(String word, String context) -> (Vector<String> guesses)
LearnWord(String word);
IgnoreWord(String word);
@@ -296,7 +296,7 @@
#if PLATFORM(COCOA)
# Dictionary support.
- DidPerformDictionaryLookup(WebKit::DictionaryPopupInfo dictionaryPopupInfo)
+ DidPerformDictionaryLookup(struct WebKit::DictionaryPopupInfo dictionaryPopupInfo)
# Keyboard input support messages
ExecuteSavedCommandBySelector(String selector) -> (bool handled)
@@ -351,12 +351,12 @@
RestorePageCenterAndScale(WebCore::FloatPoint unobscuredCenter, double scale)
DidGetTapHighlightGeometries(uint64_t requestID, WebCore::Color color, Vector<WebCore::FloatQuad> geometries, WebCore::IntSize topLeftRadius, WebCore::IntSize topRightRadius, WebCore::IntSize bottomLeftRadius, WebCore::IntSize bottomRightRadius)
- StartAssistingNode(WebKit::AssistedNodeInformation information, bool userIsInteracting, bool blurPreviousNode, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
+ StartAssistingNode(struct WebKit::AssistedNodeInformation information, bool userIsInteracting, bool blurPreviousNode, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
StopAssistingNode()
NotifyRevealedSelection()
#if ENABLE(INSPECTOR)
- ShowInspectorHighlight(WebCore::Highlight highlight)
+ ShowInspectorHighlight(struct WebCore::Highlight highlight)
HideInspectorHighlight()
ShowInspectorIndication()
@@ -414,6 +414,6 @@
IsPlayingAudioDidChange(bool newIsPlayingAudio)
#if PLATFORM(MAC)
- DidPerformActionMenuHitTest(WebKit::ActionMenuHitTestResult result, bool forImmediateAction, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
+ DidPerformActionMenuHitTest(struct WebKit::ActionMenuHitTestResult result, bool forImmediateAction, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
#endif
}
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.messages.in (177607 => 177608)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.messages.in 2014-12-20 00:38:56 UTC (rev 177607)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.messages.in 2014-12-20 00:46:42 UTC (rev 177608)
@@ -23,12 +23,12 @@
messages -> WebProcessProxy LegacyReceiver {
# History client messages.
- DidNavigateWithNavigationData(uint64_t pageID, WebKit::WebNavigationDataStore store, uint64_t frameID)
+ DidNavigateWithNavigationData(uint64_t pageID, struct WebKit::WebNavigationDataStore store, uint64_t frameID)
DidPerformClientRedirect(uint64_t pageID, String sourceURLString, String destinationURLString, uint64_t frameID)
DidPerformServerRedirect(uint64_t pageID, String sourceURLString, String destinationURLString, uint64_t frameID)
DidUpdateHistoryTitle(uint64_t pageID, String title, String url, uint64_t frameID)
- AddBackForwardItem(uint64_t itemID, uint64_t pageID, WebKit::PageState pageState)
+ AddBackForwardItem(uint64_t itemID, uint64_t pageID, struct WebKit::PageState pageState)
DidDestroyFrame(uint64_t frameID)
ShouldTerminate() -> (bool shouldTerminate)
Modified: trunk/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.messages.in (177607 => 177608)
--- trunk/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.messages.in 2014-12-20 00:38:56 UTC (rev 177607)
+++ trunk/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.messages.in 2014-12-20 00:46:42 UTC (rev 177608)
@@ -22,6 +22,6 @@
messages -> WebApplicationCacheManager {
void GetApplicationCacheOrigins(uint64_t callbackID)
- void DeleteEntriesForOrigin(WebKit::SecurityOriginData originIdentifier)
+ void DeleteEntriesForOrigin(struct WebKit::SecurityOriginData originIdentifier)
void DeleteAllEntries()
}
Modified: trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.messages.in (177607 => 177608)
--- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.messages.in 2014-12-20 00:38:56 UTC (rev 177607)
+++ trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.messages.in 2014-12-20 00:46:42 UTC (rev 177608)
@@ -23,7 +23,7 @@
#if ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
messages -> WebIDBServerConnection LegacyReceiver {
- DidGetOrEstablishIDBDatabaseMetadata(uint64_t requestID, bool success, WebCore::IDBDatabaseMetadata metadata)
+ DidGetOrEstablishIDBDatabaseMetadata(uint64_t requestID, bool success, struct WebCore::IDBDatabaseMetadata metadata)
DidDeleteDatabase(uint64_t requestID, bool success)
DidOpenTransaction(uint64_t requestID, bool success)
@@ -40,11 +40,11 @@
DidCreateIndex(uint64_t requestID, bool success)
DidDeleteIndex(uint64_t requestID, bool success)
- DidPutRecord(uint64_t requestID, WebCore::IDBKeyData resultKey, uint32_t errorCode, String errorMessage)
- DidGetRecord(uint64_t requestID, WebCore::IDBGetResult getResult, uint32_t errorCode, String errorMessage)
- DidOpenCursor(uint64_t requestID, int64_t cursorID, WebCore::IDBKeyData key, WebCore::IDBKeyData primaryKey, IPC::DataReference value, uint32_t errorCode, String errorMessage)
- DidAdvanceCursor(uint64_t requestID, WebCore::IDBKeyData key, WebCore::IDBKeyData primaryKey, IPC::DataReference value, uint32_t errorCode, String errorMessage)
- DidIterateCursor(uint64_t requestID, WebCore::IDBKeyData key, WebCore::IDBKeyData primaryKey, IPC::DataReference value, uint32_t errorCode, String errorMessage)
+ DidPutRecord(uint64_t requestID, struct WebCore::IDBKeyData resultKey, uint32_t errorCode, String errorMessage)
+ DidGetRecord(uint64_t requestID, struct WebCore::IDBGetResult getResult, uint32_t errorCode, String errorMessage)
+ DidOpenCursor(uint64_t requestID, int64_t cursorID, struct WebCore::IDBKeyData key, struct WebCore::IDBKeyData primaryKey, IPC::DataReference value, uint32_t errorCode, String errorMessage)
+ DidAdvanceCursor(uint64_t requestID, struct WebCore::IDBKeyData key, struct WebCore::IDBKeyData primaryKey, IPC::DataReference value, uint32_t errorCode, String errorMessage)
+ DidIterateCursor(uint64_t requestID, struct WebCore::IDBKeyData key, struct WebCore::IDBKeyData primaryKey, IPC::DataReference value, uint32_t errorCode, String errorMessage)
DidCount(uint64_t requestID, int64_t count, uint32_t errorCode, String errorMessage)
DidDeleteRange(uint64_t requestID, uint32_t errorCode, String errorMessage)
}
Modified: trunk/Source/WebKit2/WebProcess/OriginData/WebOriginDataManager.messages.in (177607 => 177608)
--- trunk/Source/WebKit2/WebProcess/OriginData/WebOriginDataManager.messages.in 2014-12-20 00:38:56 UTC (rev 177607)
+++ trunk/Source/WebKit2/WebProcess/OriginData/WebOriginDataManager.messages.in 2014-12-20 00:46:42 UTC (rev 177608)
@@ -22,7 +22,7 @@
messages -> WebOriginDataManager {
void GetOrigins(uint32_t types, uint64_t callbackID)
- void DeleteEntriesForOrigin(uint32_t types, WebKit::SecurityOriginData originIdentifier, uint64_t callbackID)
+ void DeleteEntriesForOrigin(uint32_t types, struct WebKit::SecurityOriginData originIdentifier, uint64_t callbackID)
void DeleteEntriesModifiedBetweenDates(uint32_t types, double startDate, double endDate, uint64_t callbackID)
void DeleteAllEntries(uint32_t types, uint64_t callbackID)
}
Modified: trunk/Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.messages.in (177607 => 177608)
--- trunk/Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.messages.in 2014-12-20 00:38:56 UTC (rev 177607)
+++ trunk/Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.messages.in 2014-12-20 00:46:42 UTC (rev 177608)
@@ -22,6 +22,6 @@
messages -> WebResourceCacheManager {
void GetCacheOrigins(uint64_t callbackID)
- void ClearCacheForOrigin(WebKit::SecurityOriginData originIdentifier, uint32_t cachesToClear)
+ void ClearCacheForOrigin(struct WebKit::SecurityOriginData originIdentifier, uint32_t cachesToClear)
void ClearCacheForAllOrigins(uint32_t cachesToClear)
}
Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in (177607 => 177608)
--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in 2014-12-20 00:38:56 UTC (rev 177607)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in 2014-12-20 00:46:42 UTC (rev 177608)
@@ -28,7 +28,7 @@
// Used by TiledCoreAnimationDrawingArea.
UpdateGeometry(WebCore::IntSize viewSize, WebCore::IntSize layerPosition)
SetDeviceScaleFactor(float deviceScaleFactor)
- SetColorSpace(WebKit::ColorSpaceData colorSpace)
+ SetColorSpace(struct WebKit::ColorSpaceData colorSpace)
SetExposedRect(WebCore::FloatRect exposedRect)
AdjustTransientZoom(double scale, WebCore::FloatPoint origin)
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (177607 => 177608)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-12-20 00:38:56 UTC (rev 177607)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-12-20 00:46:42 UTC (rev 177608)
@@ -77,7 +77,7 @@
SyncApplyAutocorrection(String correction, String originalText) -> (bool autocorrectionApplied)
RequestAutocorrectionContext(uint64_t callbackID)
GetAutocorrectionContext() -> (String beforeContext, String markedText, String selectedText, String afterContext, uint64_t location, uint64_t length)
- GetPositionInformation(WebCore::IntPoint point) -> (WebKit::InteractionInformationAtPosition information)
+ GetPositionInformation(WebCore::IntPoint point) -> (struct WebKit::InteractionInformationAtPosition information)
RequestPositionInformation(WebCore::IntPoint point)
StartInteractionWithElementAtPosition(WebCore::IntPoint point)
StopInteraction()
@@ -168,7 +168,7 @@
PerformDictionaryLookupOfCurrentSelection()
#endif
- PreferencesDidChange(WebKit::WebPreferencesStore store)
+ PreferencesDidChange(struct WebKit::WebPreferencesStore store)
SetUserAgent(String userAgent)
SetCustomTextEncodingName(String encodingName)
@@ -285,18 +285,18 @@
SetWindowResizerSize(WebCore::IntSize intersectsView)
# Printing.
- BeginPrinting(uint64_t frameID, WebKit::PrintInfo printInfo)
+ BeginPrinting(uint64_t frameID, struct WebKit::PrintInfo printInfo)
EndPrinting()
- ComputePagesForPrinting(uint64_t frameID, WebKit::PrintInfo printInfo, uint64_t callbackID)
+ ComputePagesForPrinting(uint64_t frameID, struct WebKit::PrintInfo printInfo, uint64_t callbackID)
#if PLATFORM(COCOA)
- DrawRectToImage(uint64_t frameID, WebKit::PrintInfo printInfo, WebCore::IntRect rect, WebCore::IntSize imageSize, uint64_t callbackID)
- DrawPagesToPDF(uint64_t frameID, WebKit::PrintInfo printInfo, uint32_t first, uint32_t count, uint64_t callbackID)
+ DrawRectToImage(uint64_t frameID, struct WebKit::PrintInfo printInfo, WebCore::IntRect rect, WebCore::IntSize imageSize, uint64_t callbackID)
+ DrawPagesToPDF(uint64_t frameID, struct WebKit::PrintInfo printInfo, uint32_t first, uint32_t count, uint64_t callbackID)
#if PLATFORM(IOS)
- ComputePagesForPrintingAndStartDrawingToPDF(uint64_t frameID, WebKit::PrintInfo printInfo, uint32_t firstPage) -> (Vector<WebCore::IntRect> pageRects, double totalScaleFactor) Delayed
+ ComputePagesForPrintingAndStartDrawingToPDF(uint64_t frameID, struct WebKit::PrintInfo printInfo, uint32_t firstPage) -> (Vector<WebCore::IntRect> pageRects, double totalScaleFactor) Delayed
#endif
#endif
#if PLATFORM(GTK)
- DrawPagesForPrinting(uint64_t frameID, WebKit::PrintInfo printInfo, uint64_t callbackID)
+ DrawPagesForPrinting(uint64_t frameID, struct WebKit::PrintInfo printInfo, uint64_t callbackID)
#endif
# Media
@@ -347,30 +347,30 @@
ShouldDelayWindowOrderingEvent(WebKit::WebMouseEvent event) -> (bool result)
AcceptsFirstMouse(int eventNumber, WebKit::WebMouseEvent event) -> (bool result)
- InsertTextAsync(String text, WebKit::EditingRange replacementRange, bool registerUndoGroup)
+ InsertTextAsync(String text, struct WebKit::EditingRange replacementRange, bool registerUndoGroup)
GetMarkedRangeAsync(uint64_t callbackID)
GetSelectedRangeAsync(uint64_t callbackID)
CharacterIndexForPointAsync(WebCore::IntPoint point, uint64_t callbackID);
- FirstRectForCharacterRangeAsync(WebKit::EditingRange range, uint64_t callbackID);
- SetCompositionAsync(String text, Vector<WebCore::CompositionUnderline> underlines, WebKit::EditingRange selectionRange, WebKit::EditingRange replacementRange)
+ FirstRectForCharacterRangeAsync(struct WebKit::EditingRange range, uint64_t callbackID);
+ SetCompositionAsync(String text, Vector<WebCore::CompositionUnderline> underlines, struct WebKit::EditingRange selectionRange, struct WebKit::EditingRange replacementRange)
ConfirmCompositionAsync()
#endif
#if PLATFORM(MAC)
- InsertDictatedTextAsync(String text, WebKit::EditingRange replacementRange, Vector<WebCore::DictationAlternative> dictationAlternatives, bool registerUndoGroup)
- AttributedSubstringForCharacterRangeAsync(WebKit::EditingRange range, uint64_t callbackID);
+ InsertDictatedTextAsync(String text, struct WebKit::EditingRange replacementRange, Vector<WebCore::DictationAlternative> dictationAlternatives, bool registerUndoGroup)
+ AttributedSubstringForCharacterRangeAsync(struct WebKit::EditingRange range, uint64_t callbackID);
#endif
#if PLATFORM(MAC) && !USE(ASYNC_NSTEXTINPUTCLIENT)
- InsertText(String text, WebKit::EditingRange replacementRange) -> (bool handled, WebKit::EditorState newState)
- SetComposition(String text, Vector<WebCore::CompositionUnderline> underlines, WebKit::EditingRange selectionRange, WebKit::EditingRange replacementRange) -> (WebKit::EditorState newState)
- ConfirmComposition() -> (WebKit::EditorState newState)
- InsertDictatedText(String text, WebKit::EditingRange replacementRange, Vector<WebCore::DictationAlternative> dictationAlternatives) -> (bool handled, WebKit::EditorState newState)
- GetAttributedSubstringFromRange(WebKit::EditingRange range) -> (WebKit::AttributedString result)
- GetMarkedRange() -> (WebKit::EditingRange range)
- GetSelectedRange() -> (WebKit::EditingRange range)
+ InsertText(String text, struct WebKit::EditingRange replacementRange) -> (bool handled, struct WebKit::EditorState newState)
+ SetComposition(String text, Vector<WebCore::CompositionUnderline> underlines, struct WebKit::EditingRange selectionRange, struct WebKit::EditingRange replacementRange) -> (struct WebKit::EditorState newState)
+ ConfirmComposition() -> (struct WebKit::EditorState newState)
+ InsertDictatedText(String text, struct WebKit::EditingRange replacementRange, Vector<WebCore::DictationAlternative> dictationAlternatives) -> (bool handled, struct WebKit::EditorState newState)
+ GetAttributedSubstringFromRange(struct WebKit::EditingRange range) -> (struct WebKit::AttributedString result)
+ GetMarkedRange() -> (struct WebKit::EditingRange range)
+ GetSelectedRange() -> (struct WebKit::EditingRange range)
CharacterIndexForPoint(WebCore::IntPoint point) -> (uint64_t result)
- FirstRectForCharacterRange(WebKit::EditingRange range) -> (WebCore::IntRect resultRect)
- ExecuteKeypressCommands(Vector<WebCore::KeypressCommand> savedCommands) -> (bool handled, WebKit::EditorState newState)
- CancelComposition() -> (WebKit::EditorState newState)
+ FirstRectForCharacterRange(struct WebKit::EditingRange range) -> (WebCore::IntRect resultRect)
+ ExecuteKeypressCommands(Vector<WebCore::KeypressCommand> savedCommands) -> (bool handled, struct WebKit::EditorState newState)
+ CancelComposition() -> (struct WebKit::EditorState newState)
#endif
SetMinimumLayoutSize(WebCore::IntSize minimumLayoutSize)
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.messages.in (177607 => 177608)
--- trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2014-12-20 00:38:56 UTC (rev 177607)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2014-12-20 00:46:42 UTC (rev 177608)
@@ -22,10 +22,10 @@
messages -> WebProcess LegacyReceiver {
# Initialize the WebProcess.
- InitializeWebProcess(WebKit::WebProcessCreationParameters processCreationParameters, WebKit::WebContextUserMessageEncoder initializationUserData) Variadic
+ InitializeWebProcess(struct WebKit::WebProcessCreationParameters processCreationParameters, WebKit::WebContextUserMessageEncoder initializationUserData) Variadic
# Create a new page.
- CreateWebPage(uint64_t newPageID, WebKit::WebPageCreationParameters pageCreationParameters)
+ CreateWebPage(uint64_t newPageID, struct WebKit::WebPageCreationParameters pageCreationParameters)
# Global preferences.
SetCacheModel(uint32_t cacheModel)
@@ -66,7 +66,7 @@
ResumeDownload(uint64_t downloadID, IPC::DataReference resumeData, String path, WebKit::SandboxExtension::Handle sandboxExtensionHandle)
CancelDownload(uint64_t downloadID)
- SetTextCheckerState(WebKit::TextCheckerState textCheckerState)
+ SetTextCheckerState(struct WebKit::TextCheckerState textCheckerState)
SetEnhancedAccessibility(bool flag)
