Title: [247599] branches/safari-608-branch/Source
Revision
247599
Author
kocsen_ch...@apple.com
Date
2019-07-18 13:24:15 -0700 (Thu, 18 Jul 2019)

Log Message

Cherry-pick r247502. rdar://problem/53229564

    REGRESSION: fast/events/watchos/double-tap-to-zoom* tests crashing in com.apple.WebKit: -[WKContentView(WKInteraction) _singleTapDidReset:]
    https://bugs.webkit.org/show_bug.cgi?id=199840
    <rdar://problem/52856531>

    Patch by Antoine Quint <grao...@apple.com> on 2019-07-16
    Reviewed by Wenson Hsieh.

    Source/WebCore:

    Fix a build error that occured when building for the watchOS Simulator in the debug configuration.

    * rendering/RenderLayerCompositor.cpp:
    (WebCore::RenderLayerCompositor::updateScrollingNodeForScrollingProxyRole):

    Source/WebKit:

    We need to ensure the NSNumber used for -[WKSyntheticTapGestureRecognizer lastActiveTouchIdentifier] is retained. This innocent change required
    the use of RetainPtr<>, which required the move to an Objective-C++ file, which lead to a change in the order files are unified, which lead to
    build errors, which leads to a much bigger patch than just the source change necessary to fix the crash.

    * SourcesCocoa.txt:
    * UIProcess/ios/WKSyntheticTapGestureRecognizer.mm: Renamed from Source/WebKit/UIProcess/ios/WKSyntheticTapGestureRecognizer.m.
    * UIProcess/ios/forms/WKFormPeripheralBase.h:
    * UIProcess/ios/forms/WKFormPeripheralBase.mm:
    * WebKit.xcodeproj/project.pbxproj:

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@247502 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Added Paths

Removed Paths

Diff

Modified: branches/safari-608-branch/Source/WebCore/ChangeLog (247598 => 247599)


--- branches/safari-608-branch/Source/WebCore/ChangeLog	2019-07-18 20:24:12 UTC (rev 247598)
+++ branches/safari-608-branch/Source/WebCore/ChangeLog	2019-07-18 20:24:15 UTC (rev 247599)
@@ -1,5 +1,50 @@
 2019-07-17  Kocsen Chung  <kocsen_ch...@apple.com>
 
+        Cherry-pick r247502. rdar://problem/53229564
+
+    REGRESSION: fast/events/watchos/double-tap-to-zoom* tests crashing in com.apple.WebKit: -[WKContentView(WKInteraction) _singleTapDidReset:]
+    https://bugs.webkit.org/show_bug.cgi?id=199840
+    <rdar://problem/52856531>
+    
+    Patch by Antoine Quint <grao...@apple.com> on 2019-07-16
+    Reviewed by Wenson Hsieh.
+    
+    Source/WebCore:
+    
+    Fix a build error that occured when building for the watchOS Simulator in the debug configuration.
+    
+    * rendering/RenderLayerCompositor.cpp:
+    (WebCore::RenderLayerCompositor::updateScrollingNodeForScrollingProxyRole):
+    
+    Source/WebKit:
+    
+    We need to ensure the NSNumber used for -[WKSyntheticTapGestureRecognizer lastActiveTouchIdentifier] is retained. This innocent change required
+    the use of RetainPtr<>, which required the move to an Objective-C++ file, which lead to a change in the order files are unified, which lead to
+    build errors, which leads to a much bigger patch than just the source change necessary to fix the crash.
+    
+    * SourcesCocoa.txt:
+    * UIProcess/ios/WKSyntheticTapGestureRecognizer.mm: Renamed from Source/WebKit/UIProcess/ios/WKSyntheticTapGestureRecognizer.m.
+    * UIProcess/ios/forms/WKFormPeripheralBase.h:
+    * UIProcess/ios/forms/WKFormPeripheralBase.mm:
+    * WebKit.xcodeproj/project.pbxproj:
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@247502 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-07-16  Antoine Quint  <grao...@apple.com>
+
+            REGRESSION: fast/events/watchos/double-tap-to-zoom* tests crashing in com.apple.WebKit: -[WKContentView(WKInteraction) _singleTapDidReset:]
+            https://bugs.webkit.org/show_bug.cgi?id=199840
+            <rdar://problem/52856531>
+
+            Reviewed by Wenson Hsieh.
+
+            Fix a build error that occured when building for the watchOS Simulator in the debug configuration.
+
+            * rendering/RenderLayerCompositor.cpp:
+            (WebCore::RenderLayerCompositor::updateScrollingNodeForScrollingProxyRole):
+
+2019-07-17  Kocsen Chung  <kocsen_ch...@apple.com>
+
         Cherry-pick r247490. rdar://problem/53229559
 
     NSTextFinder holes don't scroll with the page

Modified: branches/safari-608-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp (247598 => 247599)


--- branches/safari-608-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp	2019-07-18 20:24:12 UTC (rev 247598)
+++ branches/safari-608-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp	2019-07-18 20:24:15 UTC (rev 247599)
@@ -4525,7 +4525,7 @@
             ASSERT(entry.clipData.clippingLayer);
             ASSERT(entry.clipData.clippingLayer->isComposited());
 
-            auto overflowScrollNodeID = 0;
+            ScrollingNodeID overflowScrollNodeID = 0;
             if (auto* backing = entry.clipData.clippingLayer->backing())
                 overflowScrollNodeID = backing->scrollingNodeIDForRole(ScrollCoordinationRole::Scrolling);
 

Modified: branches/safari-608-branch/Source/WebKit/ChangeLog (247598 => 247599)


--- branches/safari-608-branch/Source/WebKit/ChangeLog	2019-07-18 20:24:12 UTC (rev 247598)
+++ branches/safari-608-branch/Source/WebKit/ChangeLog	2019-07-18 20:24:15 UTC (rev 247599)
@@ -1,5 +1,55 @@
 2019-07-17  Kocsen Chung  <kocsen_ch...@apple.com>
 
+        Cherry-pick r247502. rdar://problem/53229564
+
+    REGRESSION: fast/events/watchos/double-tap-to-zoom* tests crashing in com.apple.WebKit: -[WKContentView(WKInteraction) _singleTapDidReset:]
+    https://bugs.webkit.org/show_bug.cgi?id=199840
+    <rdar://problem/52856531>
+    
+    Patch by Antoine Quint <grao...@apple.com> on 2019-07-16
+    Reviewed by Wenson Hsieh.
+    
+    Source/WebCore:
+    
+    Fix a build error that occured when building for the watchOS Simulator in the debug configuration.
+    
+    * rendering/RenderLayerCompositor.cpp:
+    (WebCore::RenderLayerCompositor::updateScrollingNodeForScrollingProxyRole):
+    
+    Source/WebKit:
+    
+    We need to ensure the NSNumber used for -[WKSyntheticTapGestureRecognizer lastActiveTouchIdentifier] is retained. This innocent change required
+    the use of RetainPtr<>, which required the move to an Objective-C++ file, which lead to a change in the order files are unified, which lead to
+    build errors, which leads to a much bigger patch than just the source change necessary to fix the crash.
+    
+    * SourcesCocoa.txt:
+    * UIProcess/ios/WKSyntheticTapGestureRecognizer.mm: Renamed from Source/WebKit/UIProcess/ios/WKSyntheticTapGestureRecognizer.m.
+    * UIProcess/ios/forms/WKFormPeripheralBase.h:
+    * UIProcess/ios/forms/WKFormPeripheralBase.mm:
+    * WebKit.xcodeproj/project.pbxproj:
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@247502 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-07-16  Antoine Quint  <grao...@apple.com>
+
+            REGRESSION: fast/events/watchos/double-tap-to-zoom* tests crashing in com.apple.WebKit: -[WKContentView(WKInteraction) _singleTapDidReset:]
+            https://bugs.webkit.org/show_bug.cgi?id=199840
+            <rdar://problem/52856531>
+
+            Reviewed by Wenson Hsieh.
+
+            We need to ensure the NSNumber used for -[WKSyntheticTapGestureRecognizer lastActiveTouchIdentifier] is retained. This innocent change required
+            the use of RetainPtr<>, which required the move to an Objective-C++ file, which lead to a change in the order files are unified, which lead to
+            build errors, which leads to a much bigger patch than just the source change necessary to fix the crash.
+
+            * SourcesCocoa.txt:
+            * UIProcess/ios/WKSyntheticTapGestureRecognizer.mm: Renamed from Source/WebKit/UIProcess/ios/WKSyntheticTapGestureRecognizer.m.
+            * UIProcess/ios/forms/WKFormPeripheralBase.h:
+            * UIProcess/ios/forms/WKFormPeripheralBase.mm:
+            * WebKit.xcodeproj/project.pbxproj:
+
+2019-07-17  Kocsen Chung  <kocsen_ch...@apple.com>
+
         Cherry-pick r247494. rdar://problem/53229554
 
     [macCatalyst] Do not include WebKitLegacy.h in WebKit.h

Modified: branches/safari-608-branch/Source/WebKit/SourcesCocoa.txt (247598 => 247599)


--- branches/safari-608-branch/Source/WebKit/SourcesCocoa.txt	2019-07-18 20:24:12 UTC (rev 247598)
+++ branches/safari-608-branch/Source/WebKit/SourcesCocoa.txt	2019-07-18 20:24:15 UTC (rev 247599)
@@ -428,7 +428,7 @@
 UIProcess/ios/WKPDFView.mm
 UIProcess/ios/WKScrollView.mm
 UIProcess/ios/WKSyntheticFlagsChangedWebEvent.mm
-UIProcess/ios/WKSyntheticTapGestureRecognizer.m
+UIProcess/ios/WKSyntheticTapGestureRecognizer.mm
 UIProcess/ios/WKSystemPreviewView.mm
 UIProcess/ios/WKTouchActionGestureRecognizer.m
 UIProcess/ios/WKWebEvent.mm

Deleted: branches/safari-608-branch/Source/WebKit/UIProcess/ios/WKSyntheticTapGestureRecognizer.m (247598 => 247599)


--- branches/safari-608-branch/Source/WebKit/UIProcess/ios/WKSyntheticTapGestureRecognizer.m	2019-07-18 20:24:12 UTC (rev 247598)
+++ branches/safari-608-branch/Source/WebKit/UIProcess/ios/WKSyntheticTapGestureRecognizer.m	2019-07-18 20:24:15 UTC (rev 247599)
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2014 - 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
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "config.h"
-#import "WKSyntheticTapGestureRecognizer.h"
-
-#if PLATFORM(IOS_FAMILY)
-
-#import <UIKit/UIGestureRecognizerSubclass.h>
-
-@implementation WKSyntheticTapGestureRecognizer {
-    id _gestureIdentifiedTarget;
-    SEL _gestureIdentifiedAction;
-    id _gestureFailedTarget;
-    SEL _gestureFailedAction;
-    id _resetTarget;
-    SEL _resetAction;
-}
-
-- (void)setGestureIdentifiedTarget:(id)target action:(SEL)action
-{
-    _gestureIdentifiedTarget = target;
-    _gestureIdentifiedAction = action;
-}
-
-- (void)setGestureFailedTarget:(id)target action:(SEL)action
-{
-    _gestureFailedTarget = target;
-    _gestureFailedAction = action;
-}
-
-- (void)setResetTarget:(id)target action:(SEL)action
-{
-    _resetTarget = target;
-    _resetAction = action;
-}
-
-- (void)setState:(UIGestureRecognizerState)state
-{
-    if (state == UIGestureRecognizerStateEnded)
-        [_gestureIdentifiedTarget performSelector:_gestureIdentifiedAction withObject:self];
-    else if (state == UIGestureRecognizerStateFailed)
-        [_gestureFailedTarget performSelector:_gestureFailedAction withObject:self];
-    [super setState:state];
-}
-
-- (void)reset
-{
-    [super reset];
-    [_resetTarget performSelector:_resetAction withObject:self];
-#if ENABLE(POINTER_EVENTS) 
-    _lastActiveTouchIdentifier = nil;
-#endif
-}
-
-- (void)touchesEnded:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
-{
-    [super touchesEnded:touches withEvent:event];
-#if ENABLE(POINTER_EVENTS)
-    if (!_supportingWebTouchEventsGestureRecognizer)
-        return;
-
-    // FIXME: <rdar://problem/48035706>
-    NSMapTable<NSNumber *, UITouch *> *activeTouches = [_supportingWebTouchEventsGestureRecognizer activeTouchesByIdentifier];
-    for (NSNumber *touchIdentifier in activeTouches) {
-        UITouch *touch = [activeTouches objectForKey:touchIdentifier];
-        if ([touch.gestureRecognizers containsObject:self]) {
-            _lastActiveTouchIdentifier = touchIdentifier;
-            break;
-        }
-    }
-#endif
-}
-
-@end
-
-#endif

Copied: branches/safari-608-branch/Source/WebKit/UIProcess/ios/WKSyntheticTapGestureRecognizer.mm (from rev 247598, branches/safari-608-branch/Source/WebKit/UIProcess/ios/WKSyntheticTapGestureRecognizer.m) (0 => 247599)


--- branches/safari-608-branch/Source/WebKit/UIProcess/ios/WKSyntheticTapGestureRecognizer.mm	                        (rev 0)
+++ branches/safari-608-branch/Source/WebKit/UIProcess/ios/WKSyntheticTapGestureRecognizer.mm	2019-07-18 20:24:15 UTC (rev 247599)
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2014 - 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
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+#import "WKSyntheticTapGestureRecognizer.h"
+
+#if PLATFORM(IOS_FAMILY)
+
+#import <UIKit/UIGestureRecognizerSubclass.h>
+#import <wtf/RetainPtr.h>
+
+@implementation WKSyntheticTapGestureRecognizer {
+    id _gestureIdentifiedTarget;
+    SEL _gestureIdentifiedAction;
+    id _gestureFailedTarget;
+    SEL _gestureFailedAction;
+    id _resetTarget;
+    SEL _resetAction;
+    RetainPtr<NSNumber> _lastActiveTouchIdentifier;
+}
+
+- (void)setGestureIdentifiedTarget:(id)target action:(SEL)action
+{
+    _gestureIdentifiedTarget = target;
+    _gestureIdentifiedAction = action;
+}
+
+- (void)setGestureFailedTarget:(id)target action:(SEL)action
+{
+    _gestureFailedTarget = target;
+    _gestureFailedAction = action;
+}
+
+- (void)setResetTarget:(id)target action:(SEL)action
+{
+    _resetTarget = target;
+    _resetAction = action;
+}
+
+- (void)setState:(UIGestureRecognizerState)state
+{
+    if (state == UIGestureRecognizerStateEnded)
+        [_gestureIdentifiedTarget performSelector:_gestureIdentifiedAction withObject:self];
+    else if (state == UIGestureRecognizerStateFailed)
+        [_gestureFailedTarget performSelector:_gestureFailedAction withObject:self];
+    [super setState:state];
+}
+
+- (void)reset
+{
+    [super reset];
+    [_resetTarget performSelector:_resetAction withObject:self];
+#if ENABLE(POINTER_EVENTS) 
+    _lastActiveTouchIdentifier = nil;
+#endif
+}
+
+- (void)touchesEnded:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+{
+    [super touchesEnded:touches withEvent:event];
+#if ENABLE(POINTER_EVENTS)
+    if (!_supportingWebTouchEventsGestureRecognizer)
+        return;
+
+    // FIXME: <rdar://problem/48035706>
+    NSMapTable<NSNumber *, UITouch *> *activeTouches = [_supportingWebTouchEventsGestureRecognizer activeTouchesByIdentifier];
+    for (NSNumber *touchIdentifier in activeTouches) {
+        UITouch *touch = [activeTouches objectForKey:touchIdentifier];
+        if ([touch.gestureRecognizers containsObject:self]) {
+            _lastActiveTouchIdentifier = touchIdentifier;
+            break;
+        }
+    }
+#endif
+}
+
+- (NSNumber*)lastActiveTouchIdentifier
+{
+    return _lastActiveTouchIdentifier.get();
+}
+
+@end
+
+#endif

Modified: branches/safari-608-branch/Source/WebKit/UIProcess/ios/forms/WKFormPeripheralBase.h (247598 => 247599)


--- branches/safari-608-branch/Source/WebKit/UIProcess/ios/forms/WKFormPeripheralBase.h	2019-07-18 20:24:12 UTC (rev 247598)
+++ branches/safari-608-branch/Source/WebKit/UIProcess/ios/forms/WKFormPeripheralBase.h	2019-07-18 20:24:15 UTC (rev 247599)
@@ -27,6 +27,7 @@
 
 #import "WKFormPeripheral.h"
 #import <wtf/Forward.h>
+#import <wtf/RetainPtr.h>
 
 @class WKContentView;
 

Modified: branches/safari-608-branch/Source/WebKit/UIProcess/ios/forms/WKFormPeripheralBase.mm (247598 => 247599)


--- branches/safari-608-branch/Source/WebKit/UIProcess/ios/forms/WKFormPeripheralBase.mm	2019-07-18 20:24:12 UTC (rev 247598)
+++ branches/safari-608-branch/Source/WebKit/UIProcess/ios/forms/WKFormPeripheralBase.mm	2019-07-18 20:24:15 UTC (rev 247599)
@@ -28,9 +28,9 @@
 
 #if PLATFORM(IOS_FAMILY)
 
-#import "WKContentView.h"
+#import "UIKitSPI.h"
+#import "WKContentViewInteraction.h"
 #import <pal/spi/cocoa/IOKitSPI.h>
-#import <wtf/RetainPtr.h>
 
 @implementation WKFormPeripheralBase {
     RetainPtr<NSObject <WKFormControl>> _control;

Modified: branches/safari-608-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj (247598 => 247599)


--- branches/safari-608-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj	2019-07-18 20:24:12 UTC (rev 247598)
+++ branches/safari-608-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj	2019-07-18 20:24:15 UTC (rev 247599)
@@ -413,7 +413,6 @@
 		2684055218B86ED60022C38B /* ViewUpdateDispatcherMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2684055018B86ED60022C38B /* ViewUpdateDispatcherMessageReceiver.cpp */; };
 		2684055318B86ED60022C38B /* ViewUpdateDispatcherMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 2684055118B86ED60022C38B /* ViewUpdateDispatcherMessages.h */; };
 		26F10BE819187E2E001D0E68 /* WKSyntheticTapGestureRecognizer.h in Headers */ = {isa = PBXBuildFile; fileRef = 26F10BE619187E2E001D0E68 /* WKSyntheticTapGestureRecognizer.h */; };
-		26F10BE919187E2E001D0E68 /* WKSyntheticTapGestureRecognizer.m in Sources */ = {isa = PBXBuildFile; fileRef = 26F10BE719187E2E001D0E68 /* WKSyntheticTapGestureRecognizer.m */; };
 		26F9A83B18A3468100AEB88A /* WKWebViewPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 26F9A83A18A3463F00AEB88A /* WKWebViewPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		2749F6442146561B008380BF /* InjectedBundleNodeHandle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC4BEEAA120A0A5F00FBA0C7 /* InjectedBundleNodeHandle.cpp */; };
 		2749F6452146561E008380BF /* InjectedBundleRangeHandle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC33E0D012408E8600360F3F /* InjectedBundleRangeHandle.cpp */; };
@@ -2501,7 +2500,7 @@
 		2684055018B86ED60022C38B /* ViewUpdateDispatcherMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ViewUpdateDispatcherMessageReceiver.cpp; path = DerivedSources/WebKit2/ViewUpdateDispatcherMessageReceiver.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
 		2684055118B86ED60022C38B /* ViewUpdateDispatcherMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ViewUpdateDispatcherMessages.h; path = DerivedSources/WebKit2/ViewUpdateDispatcherMessages.h; sourceTree = BUILT_PRODUCTS_DIR; };
 		26F10BE619187E2E001D0E68 /* WKSyntheticTapGestureRecognizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKSyntheticTapGestureRecognizer.h; path = ios/WKSyntheticTapGestureRecognizer.h; sourceTree = "<group>"; };
-		26F10BE719187E2E001D0E68 /* WKSyntheticTapGestureRecognizer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WKSyntheticTapGestureRecognizer.m; path = ios/WKSyntheticTapGestureRecognizer.m; sourceTree = "<group>"; };
+		26F10BE719187E2E001D0E68 /* WKSyntheticTapGestureRecognizer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKSyntheticTapGestureRecognizer.mm; path = ios/WKSyntheticTapGestureRecognizer.mm; sourceTree = "<group>"; };
 		26F9A83A18A3463F00AEB88A /* WKWebViewPrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WKWebViewPrivate.h; sourceTree = "<group>"; };
 		290F4271172A0C7400939FF0 /* AuxiliaryProcessSupplement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuxiliaryProcessSupplement.h; sourceTree = "<group>"; };
 		29232DF118B29D1100D0596F /* WKAccessibilityWebPageObjectMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKAccessibilityWebPageObjectMac.mm; sourceTree = "<group>"; };
@@ -6062,7 +6061,7 @@
 				CE5B4C8621B73D870022E64F /* WKSyntheticFlagsChangedWebEvent.h */,
 				CE5B4C8721B73D870022E64F /* WKSyntheticFlagsChangedWebEvent.mm */,
 				26F10BE619187E2E001D0E68 /* WKSyntheticTapGestureRecognizer.h */,
-				26F10BE719187E2E001D0E68 /* WKSyntheticTapGestureRecognizer.m */,
+				26F10BE719187E2E001D0E68 /* WKSyntheticTapGestureRecognizer.mm */,
 				316B8B622054B55800BD4A62 /* WKSystemPreviewView.h */,
 				316B8B612054B55800BD4A62 /* WKSystemPreviewView.mm */,
 				71A676A422C62318007D6295 /* WKTouchActionGestureRecognizer.h */,
@@ -11453,7 +11452,6 @@
 				5CA26D83217AD1B800F97A35 /* WKSafeBrowsingWarning.mm in Sources */,
 				1DB01944211CF005009FB3E8 /* WKShareSheet.mm in Sources */,
 				7A78FF332241919B0096483E /* WKStorageAccessAlert.mm in Sources */,
-				26F10BE919187E2E001D0E68 /* WKSyntheticTapGestureRecognizer.m in Sources */,
 				71A676A722C6232F007D6295 /* WKTouchActionGestureRecognizer.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to