Title: [238620] trunk/Source/WebKit
Revision
238620
Author
hironori.fu...@sony.com
Date
2018-11-28 10:16:10 -0800 (Wed, 28 Nov 2018)

Log Message

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.

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (238619 => 238620)


--- trunk/Source/WebKit/ChangeLog	2018-11-28 18:05:31 UTC (rev 238619)
+++ trunk/Source/WebKit/ChangeLog	2018-11-28 18:16:10 UTC (rev 238620)
@@ -1,3 +1,24 @@
+2018-11-28  Fujii Hironori  <hironori.fu...@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-28  Joseph Pecoraro  <pecor...@apple.com>
 
         Web Inspector: REGRESSION(r238378): reloading WebInspector after a settings change doesn't re-show WebInspector

Modified: trunk/Source/WebKit/Sources.txt (238619 => 238620)


--- trunk/Source/WebKit/Sources.txt	2018-11-28 18:05:31 UTC (rev 238619)
+++ trunk/Source/WebKit/Sources.txt	2018-11-28 18:16:10 UTC (rev 238620)
@@ -456,8 +456,8 @@
 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

Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (238619 => 238620)


--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj	2018-11-28 18:05:31 UTC (rev 238619)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj	2018-11-28 18:16:10 UTC (rev 238620)
@@ -412,8 +412,6 @@
 		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, ); }; };
@@ -10737,8 +10735,6 @@
 				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 */,
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to