Remove @no-unify of InjectedBundleRangeHandle.cpp and InjectedBundleNodeHandle.cpp
authorHironori.Fujii@sony.com <Hironori.Fujii@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 22 Nov 2018 01:27:42 +0000 (01:27 +0000)
committerHironori.Fujii@sony.com <Hironori.Fujii@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 22 Nov 2018 01:27:42 +0000 (01:27 +0000)
https://bugs.webkit.org/show_bug.cgi?id=191853

Reviewed by Michael Catanzaro.

In r235845, I excluded InjectedBundleRangeHandle.cpp and
InjectedBundleNodeHandle.cpp from unify source builds in order to
work around a MSVC bug.

Then, I commited a different workaround for the MSVC bug in
r238386. Now, we can include InjectedBundleRangeHandle.cpp and
InjectedBundleNodeHandle.cpp in unified source builds. Revert
r235845.

* Sources.txt: Removed @no-unify of InjectedBundleRangeHandle.cpp
and InjectedBundleNodeHandle.cpp
* WebKit.xcodeproj/project.pbxproj: Unchecked Target Membership
not to be compiled by XCode.

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

Source/WebKit/ChangeLog
Source/WebKit/Sources.txt
Source/WebKit/WebKit.xcodeproj/project.pbxproj

index 6e8e3e4..0078421 100644 (file)
@@ -1,3 +1,24 @@
+2018-11-21  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        Remove @no-unify of InjectedBundleRangeHandle.cpp and InjectedBundleNodeHandle.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=191853
+
+        Reviewed by Michael Catanzaro.
+
+        In r235845, I excluded InjectedBundleRangeHandle.cpp and
+        InjectedBundleNodeHandle.cpp from unify source builds in order to
+        work around a MSVC bug.
+
+        Then, I commited a different workaround for the MSVC bug in
+        r238386. Now, we can include InjectedBundleRangeHandle.cpp and
+        InjectedBundleNodeHandle.cpp in unified source builds. Revert
+        r235845.
+
+        * Sources.txt: Removed @no-unify of InjectedBundleRangeHandle.cpp
+        and InjectedBundleNodeHandle.cpp
+        * WebKit.xcodeproj/project.pbxproj: Unchecked Target Membership
+        not to be compiled by XCode.
+
 2018-11-20  Jeff Miller  <jeffm@apple.com>
 
         Return nullptr immediately if the key doesn't exist in the HashMap.
index 8766dfd..2d42a0d 100644 (file)
@@ -456,8 +456,8 @@ WebProcess/InjectedBundle/API/c/WKBundleRangeHandle.cpp
 WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.cpp
 
 WebProcess/InjectedBundle/DOM/InjectedBundleCSSStyleDeclarationHandle.cpp
-WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp @no-unify
-WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp @no-unify
+WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp
+WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp
 
 WebProcess/MediaStream/MediaDeviceSandboxExtensions.cpp
 WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp
index a9e5d07..bd8158c 100644 (file)
                26F10BE819187E2E001D0E68 /* WKSyntheticClickTapGestureRecognizer.h in Headers */ = {isa = PBXBuildFile; fileRef = 26F10BE619187E2E001D0E68 /* WKSyntheticClickTapGestureRecognizer.h */; };
                26F10BE919187E2E001D0E68 /* WKSyntheticClickTapGestureRecognizer.m in Sources */ = {isa = PBXBuildFile; fileRef = 26F10BE719187E2E001D0E68 /* WKSyntheticClickTapGestureRecognizer.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 */; };
                290F4272172A0C7400939FF0 /* ChildProcessSupplement.h in Headers */ = {isa = PBXBuildFile; fileRef = 290F4271172A0C7400939FF0 /* ChildProcessSupplement.h */; };
                29232DF418B29D6800D0596F /* WKAccessibilityWebPageObjectMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 29232DF318B29D6800D0596F /* WKAccessibilityWebPageObjectMac.h */; };
                293EBEAB1627D9C9005F89F1 /* WKDOMText.h in Headers */ = {isa = PBXBuildFile; fileRef = 293EBEA91627D9C9005F89F1 /* WKDOMText.h */; settings = {ATTRIBUTES = (Private, ); }; };
                                1A64230812DD09EB00CAAE2C /* DrawingAreaProxyMessageReceiver.cpp in Sources */,
                                2D92A780212B6A7100F493FD /* Encoder.cpp in Sources */,
                                1AA576021496B97900A4EE06 /* EventDispatcherMessageReceiver.cpp in Sources */,
-                               2749F6442146561B008380BF /* InjectedBundleNodeHandle.cpp in Sources */,
-                               2749F6452146561E008380BF /* InjectedBundleRangeHandle.cpp in Sources */,
                                2D913441212CF9F000128AFD /* JSNPMethod.cpp in Sources */,
                                2D913442212CF9F000128AFD /* JSNPObject.cpp in Sources */,
                                2984F588164BA095004BC0C6 /* LegacyCustomProtocolManagerMessageReceiver.cpp in Sources */,