Changeset 206000 in webkit

Timestamp:

Sep 15, 2016 3:38:17 PM (8 years ago)

Author:

andersca@apple.com

Message:

Add support for enum class parameters in the message generator
​https://bugs.webkit.org/show_bug.cgi?id=162036

Reviewed by Brady Eidson.

Also, convert the WebPage::SetLayerHostingMode to take an actual enum class.

• Scripts/webkit/messages.py:

(function_parameter_type):
Change this to take the parameter kind as well, and use the raw type for enums.

(arguments_type):
(message_to_struct_declaration):
Pass the kind to function_parameter_type.

(forward_declaration):
(forward_declarations_for_namespace):
Forward declare enums with "enum class".

(headers_for_type):
Add WebKit::LayerHostingMode as a special case.

(generate_message_handler):
Pass the kind to function_parameter_type.

• Scripts/webkit/parser.py:

(parse_parameters_string):
Parse 'enum' as well.

• Shared/LayerTreeContext.h:

Add enum traits.

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::viewDidEnterWindow):
(WebKit::WebPageProxy::layerHostingModeDidChange):

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::reinitializeWebPage):
(WebKit::WebPage::setLayerHostingMode):

• WebProcess/WebPage/WebPage.h:

Change unsigned to LayerHostingMode.

• WebProcess/WebPage/WebPage.messages.in:

Change unsigned to LayerHostingMode.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkit/messages.py (modified) (9 diffs)
• Scripts/webkit/parser.py (modified) (1 diff)
• Shared/LayerTreeContext.h (modified) (2 diffs)
• UIProcess/WebPageProxy.cpp (modified) (2 diffs)
• WebProcess/WebPage/WebPage.cpp (modified) (2 diffs)
• WebProcess/WebPage/WebPage.h (modified) (1 diff)
• WebProcess/WebPage/WebPage.messages.in (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-09-15  Anders Carlsson  <andersca@apple.com>
+
+        Add support for enum class parameters in the message generator
+        https://bugs.webkit.org/show_bug.cgi?id=162036
+
+        Reviewed by Brady Eidson.
+
+        Also, convert the WebPage::SetLayerHostingMode to take an actual enum class.
+
+        * Scripts/webkit/messages.py:
+        (function_parameter_type):
+        Change this to take the parameter kind as well, and use the raw type for enums.
+
+        (arguments_type):
+        (message_to_struct_declaration):
+        Pass the kind to function_parameter_type.
+
+        (forward_declaration):
+        (forward_declarations_for_namespace):
+        Forward declare enums with "enum class".
+
+        (headers_for_type):
+        Add WebKit::LayerHostingMode as a special case.
+
+        (generate_message_handler):
+        Pass the kind to function_parameter_type.
+
+        * Scripts/webkit/parser.py:
+        (parse_parameters_string):
+        Parse 'enum' as well.
+
+        * Shared/LayerTreeContext.h:
+        Add enum traits.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::viewDidEnterWindow):
+        (WebKit::WebPageProxy::layerHostingModeDidChange):
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::reinitializeWebPage):
+        (WebKit::WebPage::setLayerHostingMode):
+        * WebProcess/WebPage/WebPage.h:
+        Change unsigned to LayerHostingMode.
+
+        * WebProcess/WebPage/WebPage.messages.in:
+        Change unsigned to LayerHostingMode.
+
 2016-09-14  Beth Dakin  <bdakin@apple.com>
 

trunk/Source/WebKit2/Scripts/webkit/messages.py

@@ -67 +67 @@
 
 
-def function_parameter_type(type):
+def function_parameter_type(type, kind):
     # Don't use references for built-in types.
     builtin_types = frozenset([
@@ -86 +86 @@
         return type
 
+    if kind == 'enum':
+        return type
+
     return 'const %s&' % type
 
@@ -94 +97 @@
 
 def arguments_type(message):
-    return 'std::tuple<%s>' % ', '.join(function_parameter_type(parameter.type) for parameter in message.parameters)
+    return 'std::tuple<%s>' % ', '.join(function_parameter_type(parameter.type, parameter.kind) for parameter in message.parameters)
 
 
@@ -103 +106 @@
 def message_to_struct_declaration(message):
     result = []
-    function_parameters = [(function_parameter_type(x.type), x.name) for x in message.parameters]
+    function_parameters = [(function_parameter_type(x.type, x.kind), x.name) for x in message.parameters]
     result.append('class %s {\n' % message.name)
     result.append('public:\n')
@@ -114 +117 @@
     if message.reply_parameters != None:
         if message.has_attribute(DELAYED_ATTRIBUTE):
-            send_parameters = [(function_parameter_type(x.type), x.name) for x in message.reply_parameters]
+            send_parameters = [(function_parameter_type(x.type, x.kind), x.name) for x in message.reply_parameters]
             result.append('    struct DelayedReply : public ThreadSafeRefCounted<DelayedReply> {\n')
             result.append('        DelayedReply(PassRefPtr<IPC::Connection>, std::unique_ptr<IPC::Encoder>);\n')
@@ -144 +147 @@
 
 
-def struct_or_class(namespace, kind_and_type):
+def forward_declaration(namespace, kind_and_type):
     kind, type = kind_and_type
 
@@ -150 +153 @@
     if kind == 'struct':
         return 'struct %s' % type
+    elif kind == 'enum':
+        return 'enum class %s' % type
     else:
         return 'class %s' % type
-
 
 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 kind_and_types]
+    result += ['    %s;\n' % forward_declaration(namespace, x) for x in kind_and_types]
     result.append('}\n')
     return ''.join(result)
@@ -371 +375 @@
         'struct WebKit::WebScriptMessageHandlerData': ['"WebUserContentControllerDataTypes.h"'],
         'std::chrono::system_clock::time_point': ['<chrono>'],
+        'WebKit::LayerHostingMode': ['"LayerTreeContext.h"'],
     }
 
@@ -474 +479 @@
 
         for message in sync_delayed_messages:
-            send_parameters = [(function_parameter_type(x.type), x.name) for x in message.reply_parameters]
+            send_parameters = [(function_parameter_type(x.type, x.kind), x.name) for x in message.reply_parameters]
 
             if message.condition:

trunk/Source/WebKit2/Scripts/webkit/parser.py

@@ -134 +134 @@
             parameter_kind = 'struct'
             split[0] = split[0][7:]
+        elif split[0].startswith('enum '):
+            parameter_kind = 'enum'
+            split[0] = split[0][5:]
 
         parameter_type = split[0]

trunk/Source/WebKit2/Shared/LayerTreeContext.h

@@ -24 +24 @@
  */
 
-#ifndef LayerTreeContext_h
-#define LayerTreeContext_h
+#pragma once
 
 #include <stdint.h>
+#include <wtf/EnumTraits.h>
 
 namespace IPC {
@@ -63 +63 @@
 }
 
+}
+
+namespace WTF {
+template<> struct EnumTraits<WebKit::LayerHostingMode> {
+    using values = EnumValues<
+        WebKit::LayerHostingMode,
+#if HAVE(OUT_OF_PROCESS_LAYER_HOSTING)
+        WebKit::LayerHostingMode::OutOfProcess,
+#endif
+        WebKit::LayerHostingMode::InProcess
+    >;
 };
-
-#endif // LayerTreeContext_h
+}

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -1504 +1504 @@
     if (m_layerHostingMode != layerHostingMode) {
         m_layerHostingMode = layerHostingMode;
-        m_process->send(Messages::WebPage::SetLayerHostingMode(static_cast<unsigned>(layerHostingMode)), m_pageID);
+        m_process->send(Messages::WebPage::SetLayerHostingMode(layerHostingMode), m_pageID);
     }
 }
@@ -1621 +1621 @@
 
     m_layerHostingMode = layerHostingMode;
-    m_process->send(Messages::WebPage::SetLayerHostingMode(static_cast<unsigned>(layerHostingMode)), m_pageID);
+    m_process->send(Messages::WebPage::SetLayerHostingMode(layerHostingMode), m_pageID);
 }
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -578 +578 @@
         setViewState(parameters.viewState, false, Vector<uint64_t>());
     if (m_layerHostingMode != parameters.layerHostingMode)
-        setLayerHostingMode(static_cast<unsigned>(parameters.layerHostingMode));
+        setLayerHostingMode(parameters.layerHostingMode);
 }
 
@@ -2609 +2609 @@
 }
 
-void WebPage::setLayerHostingMode(unsigned layerHostingMode)
-{
-    m_layerHostingMode = static_cast<LayerHostingMode>(layerHostingMode);
+void WebPage::setLayerHostingMode(LayerHostingMode layerHostingMode)
+{
+    m_layerHostingMode = layerHostingMode;
 
     m_drawingArea->setLayerHostingMode(m_layerHostingMode);

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

@@ -440 +440 @@
 
     LayerHostingMode layerHostingMode() const { return m_layerHostingMode; }
-    void setLayerHostingMode(unsigned);
+    void setLayerHostingMode(LayerHostingMode);
 
 #if PLATFORM(COCOA)

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in

@@ -24 +24 @@
     SetInitialFocus(bool forward, bool isKeyboardEventValid, WebKit::WebKeyboardEvent event, uint64_t callbackID)
     SetViewState(unsigned viewState, bool wantsDidUpdateViewState, Vector<uint64_t> callbackIDs)
-    SetLayerHostingMode(unsigned layerHostingMode)
+    SetLayerHostingMode(enum WebKit::LayerHostingMode layerHostingMode)
 
     SetSessionID(WebCore::SessionID sessionID)