⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 238722 in webkit


Ignore:
Timestamp:
Nov 29, 2018, 5:50:22 PM (8 years ago)
Author:
Ryan Haddad
Message:

Unreviewed, rolling out r238713.

Breaks internal builds.

Reverted changeset:

"[Cocoa] Add some WKA extension points"
​https://bugs.webkit.org/show_bug.cgi?id=192131
​https://trac.webkit.org/changeset/238713

Location:
trunk/Source
Files:
2 deleted
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r238720 r238722  
     12018-11-29  Ryan Haddad  <ryanhaddad@apple.com>
     2
     3        Unreviewed, rolling out r238713.
     4
     5        Breaks internal builds.
     6
     7        Reverted changeset:
     8
     9        "[Cocoa] Add some WKA extension points"
     10        https://bugs.webkit.org/show_bug.cgi?id=192131
     11        https://trac.webkit.org/changeset/238713
     12
    1132018-11-29  Ryan Haddad  <ryanhaddad@apple.com>
    214

  • trunk/Source/WebCore/DerivedSources.make

    r238717 r238722  
    11501150ADDITIONAL_EVENT_TARGET_FACTORY =
    11511151
    1152 -include WebCoreDerivedSourcesAdditions.make
    1153 
    11541152JS_BINDING_IDLS += $(ADDITIONAL_BINDING_IDLS)
    11551153

  • trunk/Source/WebCore/Modules/applepay/PaymentCoordinatorClient.h

    r238713 r238722  
    3232#include <wtf/Function.h>
    3333
    34 #if USE(APPLE_INTERNAL_SDK)
    35 #import <WebKitAdditions/PaymentCoordinatorClientAdditions.h>
    36 #endif
    37 
    3834namespace WebCore {
    3935
    … …  
    6763protected:
    6864    virtual ~PaymentCoordinatorClient() = default;
    69 
    70 #if defined(PAYMENTCOORDINATORCLIENT_ADDITIONS)
    71 PAYMENTCOORDINATORCLIENT_ADDITIONS
    72 #undef PAYMENTCOORDINATORCLIENT_ADDITIONS
    73 #endif
    7465};
    7566

  • trunk/Source/WebCore/SourcesCocoa.txt

    r238713 r238722  
    214214platform/cocoa/VideoFullscreenModelVideoElement.mm
    215215platform/cocoa/VideoToolboxSoftLink.cpp
    216 platform/cocoa/WebCoreAdditions.mm @no-unify
    217216platform/cocoa/WebCoreNSErrorExtras.mm
    218217

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r238718 r238722  
    29932993                A17D275E1EAC579800BF01E7 /* MediaSelectionOption.h in Headers */ = {isa = PBXBuildFile; fileRef = A17D275D1EAC579800BF01E7 /* MediaSelectionOption.h */; settings = {ATTRIBUTES = (Private, ); }; };
    29942994                A17FEE641F8893220021E811 /* PaymentSessionBase.h in Headers */ = {isa = PBXBuildFile; fileRef = A17FEE631F8893220021E811 /* PaymentSessionBase.h */; };
    2995                 A180AD5B219F81B000DC039A /* WebCoreAdditions.mm in Sources */ = {isa = PBXBuildFile; fileRef = A17E4F26219BC01600E1C7EE /* WebCoreAdditions.mm */; };
    29962995                A185B42A1E8211A100DC9118 /* PreviewLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = A185B4281E8211A100DC9118 /* PreviewLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
    29972996                A18890AF1AA13F250026C301 /* ParentalControlsContentFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = A18890AD1AA13F250026C301 /* ParentalControlsContentFilter.h */; };
    … …  
    1113311132                A17C81210F2A5CF7005DAAEB /* HTMLElementFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLElementFactory.h; path = DerivedSources/WebCore/HTMLElementFactory.h; sourceTree = BUILT_PRODUCTS_DIR; };
    1113411133                A17D275D1EAC579800BF01E7 /* MediaSelectionOption.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MediaSelectionOption.h; sourceTree = "<group>"; };
    11135                 A17E4F26219BC01600E1C7EE /* WebCoreAdditions.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreAdditions.mm; sourceTree = "<group>"; };
    1113611134                A17FEE631F8893220021E811 /* PaymentSessionBase.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PaymentSessionBase.h; sourceTree = "<group>"; };
    1113711135                A182D5B61BE722620087A7CC /* SettingsBaseCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SettingsBaseCocoa.mm; sourceTree = "<group>"; };
    … …  
    2214622144                                CDC939A51E9BDFB100BB768D /* VideoToolboxSoftLink.cpp */,
    2214722145                                CDC939A61E9BDFB100BB768D /* VideoToolboxSoftLink.h */,
    22148                                 A17E4F26219BC01600E1C7EE /* WebCoreAdditions.mm */,
    2214922146                                CDC979F31C498C0900DB50D4 /* WebCoreNSErrorExtras.h */,
    2215022147                                CDC979F21C498C0900DB50D4 /* WebCoreNSErrorExtras.mm */,
    … …  
    3293232929                                DE5F861E1FA281FD006DB63A /* WebAccessibilityObjectWrapperBase.mm in Sources */,
    3293332930                                DE5F861D1FA2815B006DB63A /* WebAccessibilityObjectWrapperMac.mm in Sources */,
    32934                                 A180AD5B219F81B000DC039A /* WebCoreAdditions.mm in Sources */,
    3293532931                                CD7E05221651C28200C1201F /* WebCoreAVFResourceLoader.mm in Sources */,
    3293632932                                CD225C0B1C46FBF400140761 /* WebCoreNSURLSession.mm in Sources */,

  • trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h

    r238713 r238722  
    11/*
    22 *  Copyright (c) 2015, Canon Inc. All rights reserved.
    3  *  Copyright (C) 2018 Apple Inc. All rights reserved.
    43 *
    54 *  Redistribution and use in source and binary forms, with or without
    … …  
    3029#include <JavaScriptCore/BuiltinUtils.h>
    3130
    32 #if USE(APPLE_INTERNAL_SDK)
    33 #include <WebKitAdditions/WebCoreBuiltinNamesAdditions.h>
    34 #endif
    35 
    3631namespace WebCore {
    37 
    38 #if !defined(WEBCORE_ADDITIONAL_PRIVATE_IDENTIFIERS)
    39 #define WEBCORE_ADDITIONAL_PRIVATE_IDENTIFIERS(macro)
    40 #endif
    4132
    4233#define WEBCORE_COMMON_PRIVATE_IDENTIFIERS_EACH_PROPERTY_NAME(macro) \
    … …  
    351342    macro(webgpu) \
    352343    macro(window) \
    353     macro(writing) \
    354     WEBCORE_ADDITIONAL_PRIVATE_IDENTIFIERS(macro) \
     344    macro(writing)
    355345
    356346class WebCoreBuiltinNames {

  • trunk/Source/WebCore/page/SettingsBase.h

    r238713 r238722  
    208208    float m_maxTextAutosizingScaleIncrease { defaultMaxTextAutosizingScaleIncrease };
    209209#endif
    210 
    211 #if USE(APPLE_INTERNAL_SDK)
    212 #include <WebKitAdditions/SettingsAdditions.h>
    213 #endif
    214210};
    215211

  • trunk/Source/WebKit/ChangeLog

    r238715 r238722  
     12018-11-29  Ryan Haddad  <ryanhaddad@apple.com>
     2
     3        Unreviewed, rolling out r238713.
     4
     5        Breaks internal builds.
     6
     7        Reverted changeset:
     8
     9        "[Cocoa] Add some WKA extension points"
     10        https://bugs.webkit.org/show_bug.cgi?id=192131
     11        https://trac.webkit.org/changeset/238713
     12
    1132018-11-29  Simon Fraser  <simon.fraser@apple.com>
    214

  • trunk/Source/WebKit/DerivedSources.make

    r238713 r238722  
    1 # Copyright (C) 2010-2018 Apple Inc. All rights reserved.
     1# Copyright (C) 2010-2017 Apple Inc. All rights reserved.
    22#
    33# Redistribution and use in source and binary forms, with or without
    … …  
    291291# WebPreferences generation
    292292
    293 WEB_PREFERENCES_INPUT_FILES = \
    294     $(WebKit2)/Shared/WebPreferences.yaml \
    295     $(ADDITIONAL_WEB_PREFERENCES_INPUT_FILES) \
    296 #
    297 WEB_PREFERENCES_COMBINED_INPUT_FILE = WebPreferencesCombined.yaml
    298 
    299293WEB_PREFERENCES_TEMPLATES = \
    300294    $(WebKit2)/Scripts/PreferencesTemplates/WebPageUpdatePreferences.cpp.erb \
    … …  
    309303WEB_PREFERENCES_PATTERNS = $(subst .,%,$(WEB_PREFERENCES_FILES))
    310304
    311 all : $(WEB_PREFERENCES_FILES) $(WEB_PREFERENCES_COMBINED_INPUT_FILE)
    312 
    313 $(WEB_PREFERENCES_COMBINED_INPUT_FILE) : $(WEB_PREFERENCES_INPUT_FILES)
    314         cat $^ > $(WEB_PREFERENCES_COMBINED_INPUT_FILE)
    315 
    316 $(WEB_PREFERENCES_PATTERNS) : $(WebKit2)/Scripts/GeneratePreferences.rb $(WEB_PREFERENCES_TEMPLATES) $(WEB_PREFERENCES_COMBINED_INPUT_FILE)
    317         $(RUBY) $< --input $(WEB_PREFERENCES_COMBINED_INPUT_FILE)
     305all : $(WEB_PREFERENCES_FILES)
     306
     307$(WEB_PREFERENCES_PATTERNS) : $(WebKit2)/Scripts/GeneratePreferences.rb $(WEB_PREFERENCES_TEMPLATES) $(WebKit2)/Shared/WebPreferences.yaml
     308        $(RUBY) $< --input $(WebKit2)/Shared/WebPreferences.yaml

  • trunk/Source/WebKit/Platform/IPC/MessageSender.h

    r238713 r238722  
    11/*
    2  * Copyright (C) 2010-2018 Apple Inc. All rights reserved.
     2 * Copyright (C) 2010-2016 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    6767
    6868    template<typename T, typename... Args>
    69     void sendWithAsyncReply(T&& message, CompletionHandler<void(Args...)>&& completionHandler)
     69    void sendWithAsyncReply(T&& message, CompletionHandler<void(Args...)>&& args, uint64_t destinationID = 0)
    7070    {
    71         messageSenderConnection()->sendWithAsyncReply(WTFMove(message), WTFMove(completionHandler), messageSenderDestinationID());
     71        ASSERT(messageSenderConnection());
     72
     73        messageSenderConnection()->sendWithAsyncReply(WTFMove(message), WTFMove(args), destinationID);
    7274    }
    7375

  • trunk/Source/WebKit/SourcesCocoa.txt

    r238713 r238722  
    6363Platform/cocoa/SharedMemoryCocoa.cpp
    6464Platform/cocoa/WKCrashReporter.mm
    65 Platform/cocoa/WebKitAdditions.mm @no-unify
    6665
    6766Platform/foundation/LoggingFoundation.mm

  • trunk/Source/WebKit/UIProcess/ApplePay/WebPaymentCoordinatorProxy.cpp

    r238713 r238722  
    4545{
    4646    m_webPageProxy.process().addMessageReceiver(Messages::WebPaymentCoordinatorProxy::messageReceiverName(), m_webPageProxy.pageID(), *this);
    47     finishConstruction(*this);
    4847}
    4948

  • trunk/Source/WebKit/UIProcess/ApplePay/WebPaymentCoordinatorProxy.h

    r238713 r238722  
    3333#include <wtf/RetainPtr.h>
    3434#include <wtf/WeakPtr.h>
    35 
    36 #if USE(APPLE_INTERNAL_SDK)
    37 #import <WebKitAdditions/WebPaymentCoordinatorProxyAdditions.h>
    38 #endif
    3935
    4036namespace IPC {
    … …  
    155151    RetainPtr<NSObject *> m_sheetWindowWillCloseObserver;
    156152#endif
    157    
    158 #if defined(WEBPAYMENTCOORDINATORPROXY_ADDITIONS)
    159 WEBPAYMENTCOORDINATORPROXY_ADDITIONS
    160 #undef WEBPAYMENTCOORDINATORPROXY_ADDITIONS
    161 #else
    162     void finishConstruction(WebPaymentCoordinatorProxy&) { }
    163 #endif
    164153};
    165154

  • trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

    r238713 r238722  
    12711271                A15EEDE61E301CEE000069B0 /* WKPasswordView.h in Headers */ = {isa = PBXBuildFile; fileRef = A15EEDE41E301CEE000069B0 /* WKPasswordView.h */; };
    12721272                A175C44A21AA3171000037D0 /* ArgumentCodersCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = A175C44921AA3170000037D0 /* ArgumentCodersCocoa.h */; };
    1273                 A181A79821ACC74B0059A316 /* WebKitAdditions.mm in Sources */ = {isa = PBXBuildFile; fileRef = A181A79721ACAC610059A316 /* WebKitAdditions.mm */; };
    12741273                A182D5B51BE6BD250087A7CC /* AccessibilityIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = A182D5B31BE6BD250087A7CC /* AccessibilityIOS.h */; };
    12751274                A19DD3C01D07D16800AC823B /* _WKWebViewPrintFormatterInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = A19DD3BF1D07D16800AC823B /* _WKWebViewPrintFormatterInternal.h */; };
    … …  
    38383837                A175C44921AA3170000037D0 /* ArgumentCodersCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArgumentCodersCocoa.h; sourceTree = "<group>"; };
    38393838                A175C44B21AA331B000037D0 /* ArgumentCodersCocoa.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = ArgumentCodersCocoa.mm; sourceTree = "<group>"; };
    3840                 A181A79721ACAC610059A316 /* WebKitAdditions.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = WebKitAdditions.mm; sourceTree = "<group>"; };
    38413839                A182D5B21BE6BD250087A7CC /* AccessibilityIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AccessibilityIOS.mm; sourceTree = "<group>"; };
    38423840                A182D5B31BE6BD250087A7CC /* AccessibilityIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilityIOS.h; sourceTree = "<group>"; };
    … …  
    63616359                        children = (
    63626360                                4450AEBF1DC3FAE5009943F2 /* SharedMemoryCocoa.cpp */,
    6363                                 A181A79721ACAC610059A316 /* WebKitAdditions.mm */,
    63646361                                A1FB68221F6E518200C43F9F /* WKCrashReporter.h */,
    63656362                                A1FB68231F6E518200C43F9F /* WKCrashReporter.mm */,
    … …  
    1104311040                                1A6280F31919982A006AD9F9 /* WebKit.m in Sources */,
    1104411041                                2D92A78B212B6AB100F493FD /* WebKit2Initialize.cpp in Sources */,
    11045                                 A181A79821ACC74B0059A316 /* WebKitAdditions.mm in Sources */,
    1104611042                                51F060E11654318500F3282F /* WebMDNSRegisterMessageReceiver.cpp in Sources */,
    1104711043                                2D92A78C212B6AB100F493FD /* WebMouseEvent.cpp in Sources */,

  • trunk/Source/WebKit/WebProcess/ApplePay/WebPaymentCoordinator.h

    r238713 r238722  
    9797
    9898    std::optional<AvailablePaymentNetworksSet> m_availablePaymentNetworks;
    99 
    100 #if USE(APPLE_INTERNAL_SDK)
    101 #import <WebKitAdditions/WebPaymentCoordinatorAdditions.h>
    102 #endif
    10399};
    104100
Note: See TracChangeset for help on using the changeset viewer.