Title: [288356] trunk/Source
- Revision
- 288356
- Author
- hironori.fu...@sony.com
- Date
- 2022-01-21 01:41:01 -0800 (Fri, 21 Jan 2022)
Log Message
Fix AppleWin build with newer MSVC
https://bugs.webkit.org/show_bug.cgi?id=235431
Reviewed by Alex Christensen.
Source/WebCore:
* platform/graphics/ca/win/PlatformCALayerWin.cpp:
(printLayer):
Source/WebKitLegacy/win:
* WebDownloadCFNet.cpp:
(WebDownload::cancelForResume):
* WebKitQuartzCoreAdditions/CAD3DRenderer.cpp:
(WKQCA::CAD3DRenderer::resetD3DDevice):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (288355 => 288356)
--- trunk/Source/WebCore/ChangeLog 2022-01-21 09:25:23 UTC (rev 288355)
+++ trunk/Source/WebCore/ChangeLog 2022-01-21 09:41:01 UTC (rev 288356)
@@ -1,3 +1,13 @@
+2022-01-21 Fujii Hironori <hironori.fu...@sony.com>
+
+ Fix AppleWin build with newer MSVC
+ https://bugs.webkit.org/show_bug.cgi?id=235431
+
+ Reviewed by Alex Christensen.
+
+ * platform/graphics/ca/win/PlatformCALayerWin.cpp:
+ (printLayer):
+
2022-01-20 Said Abou-Hallawa <s...@apple.com>
[Cocoa] Accelerated filters are enabled by the wrong setting
Modified: trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp (288355 => 288356)
--- trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp 2022-01-21 09:25:23 UTC (rev 288355)
+++ trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp 2022-01-21 09:41:01 UTC (rev 288356)
@@ -720,7 +720,7 @@
builder.append('\n');
printIndent(builder, indent);
- char* layerTypeName = nullptr;
+ const char* layerTypeName = nullptr;
switch (layer->layerType()) {
case PlatformCALayer::LayerTypeLayer: layerTypeName = "layer"; break;
case PlatformCALayer::LayerTypeWebLayer: layerTypeName = "web-layer"; break;
Modified: trunk/Source/WebKitLegacy/win/ChangeLog (288355 => 288356)
--- trunk/Source/WebKitLegacy/win/ChangeLog 2022-01-21 09:25:23 UTC (rev 288355)
+++ trunk/Source/WebKitLegacy/win/ChangeLog 2022-01-21 09:41:01 UTC (rev 288356)
@@ -1,3 +1,15 @@
+2022-01-21 Fujii Hironori <hironori.fu...@sony.com>
+
+ Fix AppleWin build with newer MSVC
+ https://bugs.webkit.org/show_bug.cgi?id=235431
+
+ Reviewed by Alex Christensen.
+
+ * WebDownloadCFNet.cpp:
+ (WebDownload::cancelForResume):
+ * WebKitQuartzCoreAdditions/CAD3DRenderer.cpp:
+ (WKQCA::CAD3DRenderer::resetD3DDevice):
+
2022-01-15 Sam Weinig <wei...@apple.com>
CSS Gradients: interpolation mode should default to OKLab if any non-legacy color syntax colors are used in the stops
Modified: trunk/Source/WebKitLegacy/win/WebDownloadCFNet.cpp (288355 => 288356)
--- trunk/Source/WebKitLegacy/win/WebDownloadCFNet.cpp 2022-01-21 09:25:23 UTC (rev 288355)
+++ trunk/Source/WebKitLegacy/win/WebDownloadCFNet.cpp 2022-01-21 09:41:01 UTC (rev 288356)
@@ -236,11 +236,11 @@
if (!m_download)
return E_FAIL;
- HRESULT hr = S_OK;
RetainPtr<CFDataRef> resumeData;
if (m_destination.isEmpty()) {
CFURLDownloadCancel(m_download.get());
- goto exit;
+ m_download = nullptr;
+ return S_OK;
}
CFURLDownloadSetDeletesUponFailure(m_download.get(), false);
@@ -249,7 +249,8 @@
resumeData = adoptCF(CFURLDownloadCopyResumeData(m_download.get()));
if (!resumeData) {
LOG(Download, "WebDownload - Unable to create resume data for download (%p)", this);
- goto exit;
+ m_download = nullptr;
+ return S_OK;
}
auto* resumeBytes = reinterpret_cast<const uint8_t*>(CFDataGetBytePtr(resumeData.get()));
@@ -256,9 +257,8 @@
uint32_t resumeLength = CFDataGetLength(resumeData.get());
DownloadBundle::appendResumeData(resumeBytes, resumeLength, m_bundlePath);
-exit:
m_download = nullptr;
- return hr;
+ return S_OK;
}
HRESULT WebDownload::deletesFileUponFailure(_Out_ BOOL* result)
Modified: trunk/Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/CAD3DRenderer.cpp (288355 => 288356)
--- trunk/Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/CAD3DRenderer.cpp 2022-01-21 09:25:23 UTC (rev 288355)
+++ trunk/Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/CAD3DRenderer.cpp 2022-01-21 09:41:01 UTC (rev 288356)
@@ -592,7 +592,7 @@
D3DPRESENT_PARAMETERS parameters = initialPresentationParameters(size);
parameters.hDeviceWindow = window;
if (m_usingDirect3D9Ex) {
- CComQIPtr<IDirect3DDevice9Ex> d3d9Ex = m_d3dDevice;
+ CComQIPtr<IDirect3DDevice9Ex> d3d9Ex(m_d3dDevice);
ASSERT(d3d9Ex);
hr = d3d9Ex->ResetEx(¶meters, nullptr);
} else
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
