Changeset 206029 in webkit


Ignore:
Timestamp:
Sep 16, 2016 10:08:09 AM (8 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r206000.
​https://bugs.webkit.org/show_bug.cgi?id=162062

inadvertent GCC requirement bump (Requested by mcatanzaro on
#webkit).

Reverted changeset:

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

Location:
trunk/Source/WebKit2
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r206006 r206029  
     12016-09-16  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r206000.
     4        https://bugs.webkit.org/show_bug.cgi?id=162062
     5
     6        inadvertent GCC requirement bump (Requested by mcatanzaro on
     7        #webkit).
     8
     9        Reverted changeset:
     10
     11        "Add support for enum class parameters in the message
     12        generator"
     13        https://bugs.webkit.org/show_bug.cgi?id=162036
     14        http://trac.webkit.org/changeset/206000
     15
    1162016-09-15  Brady Eidson  <beidson@apple.com>
    217

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

    r206006 r206029  
    6767
    6868
    69 def function_parameter_type(type, kind):
     69def function_parameter_type(type):
    7070    # Don't use references for built-in types.
    7171    builtin_types = frozenset([
    … …  
    8686        return type
    8787
    88     if kind == 'enum':
    89         return type
    90 
    9188    return 'const %s&' % type
    9289
    … …  
    9794
    9895def arguments_type(message):
    99     return 'std::tuple<%s>' % ', '.join(function_parameter_type(parameter.type, parameter.kind) for parameter in message.parameters)
     96    return 'std::tuple<%s>' % ', '.join(function_parameter_type(parameter.type) for parameter in message.parameters)
    10097
    10198
    … …  
    106103def message_to_struct_declaration(message):
    107104    result = []
    108     function_parameters = [(function_parameter_type(x.type, x.kind), x.name) for x in message.parameters]
     105    function_parameters = [(function_parameter_type(x.type), x.name) for x in message.parameters]
    109106    result.append('class %s {\n' % message.name)
    110107    result.append('public:\n')
    … …  
    117114    if message.reply_parameters != None:
    118115        if message.has_attribute(DELAYED_ATTRIBUTE):
    119             send_parameters = [(function_parameter_type(x.type, x.kind), x.name) for x in message.reply_parameters]
     116            send_parameters = [(function_parameter_type(x.type), x.name) for x in message.reply_parameters]
    120117            result.append('    struct DelayedReply : public ThreadSafeRefCounted<DelayedReply> {\n')
    121118            result.append('        DelayedReply(PassRefPtr<IPC::Connection>, std::unique_ptr<IPC::Encoder>);\n')
    … …  
    147144
    148145
    149 def forward_declaration(namespace, kind_and_type):
     146def struct_or_class(namespace, kind_and_type):
    150147    kind, type = kind_and_type
    151148
    … …  
    153150    if kind == 'struct':
    154151        return 'struct %s' % type
    155     elif kind == 'enum':
    156         return 'enum class %s' % type
    157152    else:
    158153        return 'class %s' % type
     154
    159155
    160156def forward_declarations_for_namespace(namespace, kind_and_types):
    161157    result = []
    162158    result.append('namespace %s {\n' % namespace)
    163     result += ['    %s;\n' % forward_declaration(namespace, x) for x in kind_and_types]
     159    result += ['    %s;\n' % struct_or_class(namespace, x) for x in kind_and_types]
    164160    result.append('}\n')
    165161    return ''.join(result)
    … …  
    377373        'struct WebKit::WebScriptMessageHandlerData': ['"WebUserContentControllerDataTypes.h"'],
    378374        'std::chrono::system_clock::time_point': ['<chrono>'],
    379         'WebKit::LayerHostingMode': ['"LayerTreeContext.h"'],
    380375    }
    381376
    … …  
    481476
    482477        for message in sync_delayed_messages:
    483             send_parameters = [(function_parameter_type(x.type, x.kind), x.name) for x in message.reply_parameters]
     478            send_parameters = [(function_parameter_type(x.type), x.name) for x in message.reply_parameters]
    484479
    485480            if message.condition:

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

    r206000 r206029  
    134134            parameter_kind = 'struct'
    135135            split[0] = split[0][7:]
    136         elif split[0].startswith('enum '):
    137             parameter_kind = 'enum'
    138             split[0] = split[0][5:]
    139136
    140137        parameter_type = split[0]

  • trunk/Source/WebKit2/Shared/LayerTreeContext.h

    r206000 r206029  
    2424 */
    2525
    26 #pragma once
     26#ifndef LayerTreeContext_h
     27#define LayerTreeContext_h
    2728
    2829#include <stdint.h>
    29 #include <wtf/EnumTraits.h>
    3030
    3131namespace IPC {
    … …  
    6363}
    6464
    65 }
     65};
    6666
    67 namespace WTF {
    68 template<> struct EnumTraits<WebKit::LayerHostingMode> {
    69     using values = EnumValues<
    70         WebKit::LayerHostingMode,
    71 #if HAVE(OUT_OF_PROCESS_LAYER_HOSTING)
    72         WebKit::LayerHostingMode::OutOfProcess,
    73 #endif
    74         WebKit::LayerHostingMode::InProcess
    75     >;
    76 };
    77 }
     67#endif // LayerTreeContext_h

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

    r206006 r206029  
    15041504    if (m_layerHostingMode != layerHostingMode) {
    15051505        m_layerHostingMode = layerHostingMode;
    1506         m_process->send(Messages::WebPage::SetLayerHostingMode(layerHostingMode), m_pageID);
     1506        m_process->send(Messages::WebPage::SetLayerHostingMode(static_cast<unsigned>(layerHostingMode)), m_pageID);
    15071507    }
    15081508}
    … …  
    16211621
    16221622    m_layerHostingMode = layerHostingMode;
    1623     m_process->send(Messages::WebPage::SetLayerHostingMode(layerHostingMode), m_pageID);
     1623    m_process->send(Messages::WebPage::SetLayerHostingMode(static_cast<unsigned>(layerHostingMode)), m_pageID);
    16241624}
    16251625

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

    r206000 r206029  
    578578        setViewState(parameters.viewState, false, Vector<uint64_t>());
    579579    if (m_layerHostingMode != parameters.layerHostingMode)
    580         setLayerHostingMode(parameters.layerHostingMode);
     580        setLayerHostingMode(static_cast<unsigned>(parameters.layerHostingMode));
    581581}
    582582
    … …  
    26092609}
    26102610
    2611 void WebPage::setLayerHostingMode(LayerHostingMode layerHostingMode)
    2612 {
    2613     m_layerHostingMode = layerHostingMode;
     2611void WebPage::setLayerHostingMode(unsigned layerHostingMode)
     2612{
     2613    m_layerHostingMode = static_cast<LayerHostingMode>(layerHostingMode);
    26142614
    26152615    m_drawingArea->setLayerHostingMode(m_layerHostingMode);

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

    r206000 r206029  
    440440
    441441    LayerHostingMode layerHostingMode() const { return m_layerHostingMode; }
    442     void setLayerHostingMode(LayerHostingMode);
     442    void setLayerHostingMode(unsigned);
    443443
    444444#if PLATFORM(COCOA)

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

    r206000 r206029  
    2424    SetInitialFocus(bool forward, bool isKeyboardEventValid, WebKit::WebKeyboardEvent event, uint64_t callbackID)
    2525    SetViewState(unsigned viewState, bool wantsDidUpdateViewState, Vector<uint64_t> callbackIDs)
    26     SetLayerHostingMode(enum WebKit::LayerHostingMode layerHostingMode)
     26    SetLayerHostingMode(unsigned layerHostingMode)
    2727
    2828    SetSessionID(WebCore::SessionID sessionID)
Note: See TracChangeset for help on using the changeset viewer.