Changeset 235845 in webkit

Timestamp:

Sep 10, 2018, 1:57:41 AM (8 years ago)

Author:

Fujii Hironori

Message:

[MSVC] X86Assembler.h(108): error C2666: 'WebCore::operator -': 7 overloads have similar conversions
​https://bugs.webkit.org/show_bug.cgi?id=189467

Unreviewed build fix for WinCairo port.

MSVC reports compilation errors if certain JSC header files are
included after "using namespace" statements.

• Sources.txt: Added @no-unify to InjectedBundleNodeHandle.cpp and InjectedBundleRangeHandle.cpp temporarily.
• WebKit.xcodeproj/project.pbxproj: Compile InjectedBundleNodeHandle.cpp and InjectedBundleRangeHandle.cpp.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Sources.txt (modified) (1 diff)
• WebKit.xcodeproj/project.pbxproj (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-09-10  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [MSVC] X86Assembler.h(108): error C2666: 'WebCore::operator -': 7 overloads have similar conversions
+        https://bugs.webkit.org/show_bug.cgi?id=189467
+
+        Unreviewed build fix for WinCairo port.
+
+        MSVC reports compilation errors if certain JSC header files are
+        included after "using namespace" statements.
+
+        * Sources.txt: Added @no-unify to InjectedBundleNodeHandle.cpp and InjectedBundleRangeHandle.cpp temporarily.
+        * WebKit.xcodeproj/project.pbxproj: Compile InjectedBundleNodeHandle.cpp and InjectedBundleRangeHandle.cpp.
+
 2018-09-09  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Source/WebKit/Sources.txt

@@ -452 +452 @@
 WebProcess/InjectedBundle/DOM/InjectedBundleCSSStyleDeclarationHandle.cpp
 WebProcess/InjectedBundle/DOM/InjectedBundleFileHandle.cpp
-WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp
-WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp
+WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp @no-unify
+WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp @no-unify
 
 WebProcess/MediaStream/MediaDeviceSandboxExtensions.cpp

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

@@ -413 +413 @@
                 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 */; };
@@ -10637 +10639 @@
                                 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 */,