Attachment 349298 Details for Bug 189467 – Patch

[patch] Patch

bug-189467-20180910163546.patch (text/plain), 4.13 KB, created by Fujii Hironori on 2018-09-10 00:35:47 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2018-09-10 00:35:47 PDT

Size: 4.13 KB

patch

obsolete

>Subversion Revision: 235842
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index f7a38495cddbcd2885f83fb840616b09e714f044..5e1d80440e87fff446bb07873d8f8966bbf95735 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,16 @@
>+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>
> 
>         Unreviewed, rolling out r235839.
>diff --git a/Source/WebKit/Sources.txt b/Source/WebKit/Sources.txt
>index 0d9945c5a57a8a46ce00341dec029eb71a699fe3..947cfd47442206e64942bd9073bc131cfc93b357 100644
>--- a/Source/WebKit/Sources.txt
>+++ b/Source/WebKit/Sources.txt
>@@ -451,8 +451,8 @@ WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.cpp
> 
> 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
> WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp
>diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>index 7bdac60fc32b60737e6ed11f6177941050f7570a..19ca35d73c3963ddbf233d7cd5584d7b2b302c90 100644
>--- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>+++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>@@ -412,6 +412,8 @@
> 		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, ); }; };
>@@ -10636,6 +10638,8 @@
> 				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 */,

Actions: View | Formatted Diff | Diff

Attachments on bug 189467: 349295 | 349298 | 355252 | 355314