Attachment 359064 Details for Bug 189987 – Patch

[patch] Patch

bug-189987.diff (text/plain), 11.12 KB, created by Don Olmstead on 2019-01-14 12:06:52 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Don Olmstead

Created: 2019-01-14 12:06:52 PST

Size: 11.12 KB

patch

obsolete

>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 618ce99666c..1f06b3b1e49 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,19 @@
>+2019-01-14  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        [Win] error C2139: 'WebKit::UpdateInfo': an undefined class is not allowed as an argument to compiler intrinsic type trait '__is_assignable'
>+        https://bugs.webkit.org/show_bug.cgi?id=189987
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Scripts/webkit/LegacyMessageReceiver-expected.cpp:
>+        * Scripts/webkit/LegacyMessages-expected.h:
>+        * Scripts/webkit/MessageReceiver-expected.cpp:
>+        * Scripts/webkit/MessageReceiverSuperclass-expected.cpp:
>+        * Scripts/webkit/Messages-expected.h:
>+        * Scripts/webkit/MessagesSuperclass-expected.h:
>+        * Scripts/webkit/messages.py:
>+        * UIProcess/WebPageProxy.h:
>+
> 2019-01-14  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         Unreviewed. Update OptionsGTK.cmake and NEWS for 2.23.3 release
>diff --git a/Source/WebKit/Scripts/webkit/LegacyMessageReceiver-expected.cpp b/Source/WebKit/Scripts/webkit/LegacyMessageReceiver-expected.cpp
>index eadcb96e2fb..ab05ca3904c 100644
>--- a/Source/WebKit/Scripts/webkit/LegacyMessageReceiver-expected.cpp
>+++ b/Source/WebKit/Scripts/webkit/LegacyMessageReceiver-expected.cpp
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (C) 2010-2018 Apple Inc. All rights reserved.
>+ * Copyright (C) 2010-2019 Apple Inc. All rights reserved.
>  *
>  * Redistribution and use in source and binary forms, with or without
>  * modification, are permitted provided that the following conditions
>diff --git a/Source/WebKit/Scripts/webkit/LegacyMessages-expected.h b/Source/WebKit/Scripts/webkit/LegacyMessages-expected.h
>index 4f95a138025..743fe4fb656 100644
>--- a/Source/WebKit/Scripts/webkit/LegacyMessages-expected.h
>+++ b/Source/WebKit/Scripts/webkit/LegacyMessages-expected.h
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (C) 2010-2018 Apple Inc. All rights reserved.
>+ * Copyright (C) 2010-2019 Apple Inc. All rights reserved.
>  *
>  * Redistribution and use in source and binary forms, with or without
>  * modification, are permitted provided that the following conditions
>@@ -28,26 +28,30 @@
> 
> #include "ArgumentCoders.h"
> #include "Connection.h"
>+#if ENABLE(DEPRECATED_FEATURE) || ENABLE(EXPERIMENTAL_FEATURE)
>+#include "DummyType.h"
>+#endif
>+#if PLATFORM(MAC)
>+#include "MachPort.h"
>+#endif
> #include "Plugin.h"
>+#include "WebCoreArgumentCoders.h"
>+#if (ENABLE(TOUCH_EVENTS) && (NESTED_MESSAGE_CONDITION && SOME_OTHER_MESSAGE_CONDITION)) || (ENABLE(TOUCH_EVENTS) && (NESTED_MESSAGE_CONDITION || SOME_OTHER_MESSAGE_CONDITION))
>+#include "WebEvent.h"
>+#endif
>+#include "WebPreferencesStore.h"
> #include <WebCore/GraphicsLayer.h>
>+#if PLATFORM(MAC)
> #include <WebCore/KeyboardEvent.h>
>+#endif
> #include <WebCore/PluginData.h>
> #include <utility>
>-#include <wtf/Forward.h>
> #include <wtf/HashMap.h>
>-#include <wtf/ThreadSafeRefCounted.h>
> #include <wtf/Vector.h>
> #include <wtf/text/WTFString.h>
> 
> namespace IPC {
>-class MachPort;
> class Connection;
>-class DummyType;
>-}
>-
>-namespace WebKit {
>-class WebTouchEvent;
>-class WebPreferencesStore;
> }
> 
> namespace Messages {
>diff --git a/Source/WebKit/Scripts/webkit/MessageReceiver-expected.cpp b/Source/WebKit/Scripts/webkit/MessageReceiver-expected.cpp
>index e294aac9ff6..5ca5af6eb06 100644
>--- a/Source/WebKit/Scripts/webkit/MessageReceiver-expected.cpp
>+++ b/Source/WebKit/Scripts/webkit/MessageReceiver-expected.cpp
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (C) 2010-2018 Apple Inc. All rights reserved.
>+ * Copyright (C) 2010-2019 Apple Inc. All rights reserved.
>  *
>  * Redistribution and use in source and binary forms, with or without
>  * modification, are permitted provided that the following conditions
>diff --git a/Source/WebKit/Scripts/webkit/MessageReceiverSuperclass-expected.cpp b/Source/WebKit/Scripts/webkit/MessageReceiverSuperclass-expected.cpp
>index 20748c8c3bf..9fafbf4660f 100644
>--- a/Source/WebKit/Scripts/webkit/MessageReceiverSuperclass-expected.cpp
>+++ b/Source/WebKit/Scripts/webkit/MessageReceiverSuperclass-expected.cpp
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (C) 2010-2018 Apple Inc. All rights reserved.
>+ * Copyright (C) 2010-2019 Apple Inc. All rights reserved.
>  *
>  * Redistribution and use in source and binary forms, with or without
>  * modification, are permitted provided that the following conditions
>diff --git a/Source/WebKit/Scripts/webkit/Messages-expected.h b/Source/WebKit/Scripts/webkit/Messages-expected.h
>index 4f95a138025..743fe4fb656 100644
>--- a/Source/WebKit/Scripts/webkit/Messages-expected.h
>+++ b/Source/WebKit/Scripts/webkit/Messages-expected.h
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (C) 2010-2018 Apple Inc. All rights reserved.
>+ * Copyright (C) 2010-2019 Apple Inc. All rights reserved.
>  *
>  * Redistribution and use in source and binary forms, with or without
>  * modification, are permitted provided that the following conditions
>@@ -28,26 +28,30 @@
> 
> #include "ArgumentCoders.h"
> #include "Connection.h"
>+#if ENABLE(DEPRECATED_FEATURE) || ENABLE(EXPERIMENTAL_FEATURE)
>+#include "DummyType.h"
>+#endif
>+#if PLATFORM(MAC)
>+#include "MachPort.h"
>+#endif
> #include "Plugin.h"
>+#include "WebCoreArgumentCoders.h"
>+#if (ENABLE(TOUCH_EVENTS) && (NESTED_MESSAGE_CONDITION && SOME_OTHER_MESSAGE_CONDITION)) || (ENABLE(TOUCH_EVENTS) && (NESTED_MESSAGE_CONDITION || SOME_OTHER_MESSAGE_CONDITION))
>+#include "WebEvent.h"
>+#endif
>+#include "WebPreferencesStore.h"
> #include <WebCore/GraphicsLayer.h>
>+#if PLATFORM(MAC)
> #include <WebCore/KeyboardEvent.h>
>+#endif
> #include <WebCore/PluginData.h>
> #include <utility>
>-#include <wtf/Forward.h>
> #include <wtf/HashMap.h>
>-#include <wtf/ThreadSafeRefCounted.h>
> #include <wtf/Vector.h>
> #include <wtf/text/WTFString.h>
> 
> namespace IPC {
>-class MachPort;
> class Connection;
>-class DummyType;
>-}
>-
>-namespace WebKit {
>-class WebTouchEvent;
>-class WebPreferencesStore;
> }
> 
> namespace Messages {
>diff --git a/Source/WebKit/Scripts/webkit/MessagesSuperclass-expected.h b/Source/WebKit/Scripts/webkit/MessagesSuperclass-expected.h
>index bc41a73f410..515018db807 100644
>--- a/Source/WebKit/Scripts/webkit/MessagesSuperclass-expected.h
>+++ b/Source/WebKit/Scripts/webkit/MessagesSuperclass-expected.h
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (C) 2010-2018 Apple Inc. All rights reserved.
>+ * Copyright (C) 2010-2019 Apple Inc. All rights reserved.
>  *
>  * Redistribution and use in source and binary forms, with or without
>  * modification, are permitted provided that the following conditions
>@@ -26,19 +26,16 @@
> 
> #include "ArgumentCoders.h"
> #include "TestClassName.h"
>-#include <wtf/Forward.h>
>+#if ENABLE(TEST_FEATURE)
>+#include "TestTwoStateEnum.h"
>+#endif
> #include <wtf/Optional.h>
>-#include <wtf/ThreadSafeRefCounted.h>
> #include <wtf/text/WTFString.h>
> 
> namespace IPC {
> class Connection;
> }
> 
>-namespace WebKit {
>-enum class TestTwoStateEnum : bool;
>-}
>-
> namespace Messages {
> namespace WebPage {
> 
>diff --git a/Source/WebKit/Scripts/webkit/messages.py b/Source/WebKit/Scripts/webkit/messages.py
>index c481f337fbd..52555c37a15 100644
>--- a/Source/WebKit/Scripts/webkit/messages.py
>+++ b/Source/WebKit/Scripts/webkit/messages.py
>@@ -33,7 +33,7 @@ ASYNC_ATTRIBUTE = 'Async'
> LEGACY_SYNC_ATTRIBUTE = 'LegacySync'
> 
> _license_header = """/*
>- * Copyright (C) 2010-2018 Apple Inc. All rights reserved.
>+ * Copyright (C) 2010-2019 Apple Inc. All rights reserved.
>  *
>  * Redistribution and use in source and binary forms, with or without
>  * modification, are permitted provided that the following conditions
>@@ -209,32 +209,41 @@ def forward_declarations_and_headers(receiver):
>         'WebKit::UserContentControllerIdentifier',
>     ])
> 
>+    type_conditions = {}
>     for parameter in receiver.iterparameters():
>-        kind = parameter.kind
>-        type = parameter.type
>+        if not parameter.type in type_conditions:
>+            type_conditions[parameter.type] = []
> 
>-        if type.find('<') != -1 or type in no_forward_declaration_types:
>-            # Don't forward declare class templates.
>-            headers.update(headers_for_type(type))
>-            continue
>+        if not parameter.condition in type_conditions[parameter.type]:
>+            type_conditions[parameter.type].append(parameter.condition)
> 
>-        split = type.split('::')
>+    header_conditions = {}
>+    for parameter in receiver.iterparameters():
>+        type = parameter.type
>+        conditions = type_conditions[type]
> 
>-        # Handle WTF types even if the WTF:: prefix is not given
>-        if split[0] in non_template_wtf_types:
>-            split.insert(0, 'WTF')
>+        argument_encoder_headers = argument_coder_headers_for_type(type)
>+        if argument_encoder_headers:
>+            for header in argument_encoder_headers:
>+                if header not in header_conditions:
>+                    header_conditions[header] = []
>+                header_conditions[header].extend(conditions)
> 
>-        if len(split) == 2:
>-            namespace = split[0]
>-            inner_type = split[1]
>-            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.
>-            headers.update(headers_for_type(type))
>+        type_headers = headers_for_type(type)
>+        for header in type_headers:
>+            if header not in header_conditions:
>+                header_conditions[header] = []
>+            header_conditions[header].extend(conditions)
> 
>     forward_declarations = '\n'.join([forward_declarations_for_namespace(namespace, types) for (namespace, types) in sorted(types_by_namespace.items())])
>-    headers = ['#include %s\n' % header for header in sorted(headers)]
>+    headers = []
>+    for header in sorted(header_conditions):
>+        if header_conditions[header] and not None in header_conditions[header]:
>+            headers.append('#if %s\n' % ' || '.join(set(header_conditions[header])))
>+            headers += ['#include %s\n' % header]
>+            headers.append('#endif\n')
>+        else:
>+            headers += ['#include %s\n' % header]
> 
>     return (forward_declarations, headers)
> 
>diff --git a/Source/WebKit/UIProcess/WebPageProxy.h b/Source/WebKit/UIProcess/WebPageProxy.h
>index de98694aa37..3cfc4ff4df4 100644
>--- a/Source/WebKit/UIProcess/WebPageProxy.h
>+++ b/Source/WebKit/UIProcess/WebPageProxy.h
>@@ -1209,7 +1209,6 @@ public:
>     void recordAutomaticNavigationSnapshot();
>     void suppressNextAutomaticNavigationSnapshot() { m_shouldSuppressNextAutomaticNavigationSnapshot = true; }
>     void recordNavigationSnapshot(WebBackForwardListItem&);
>-    void requestFocusedElementInformation(Function<void(const FocusedElementInformation&, CallbackBase::Error)>&&);
> 
> #if PLATFORM(COCOA)
>     RefPtr<ViewSnapshot> takeViewSnapshot();
>@@ -1786,6 +1785,7 @@ private:
>     void elementDidFocus(const FocusedElementInformation&, bool userIsInteracting, bool blurPreviousNode, bool changingActivityState, const UserData&);
>     void elementDidBlur();
>     void didReceiveEditorStateUpdateAfterFocus();
>+    void requestFocusedElementInformation(Function<void(const FocusedElementInformation&, CallbackBase::Error)>&&);
> 
>     void showInspectorHighlight(const WebCore::Highlight&);
>     void hideInspectorHighlight();

Actions: View | Formatted Diff | Diff

Attachments on bug 189987: 350848 | 351872 | 359064