Attachment #449642 for bug #235431

View Details Raw Unified Return to Bug 235431



2022-01-21  Fujii Hironori  <Hironori.Fujii@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  Alan Bujtas  <zalan@apple.com>

        [LFC][IFC] Implement TextUtil::directionForTextContent



2022-01-21  Fujii Hironori  <Hironori.Fujii@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  <weinig@apple.com>

        CSS Gradients: interpolation mode should default to OKLab if any non-legacy color syntax colors are used in the stops

Lines 720-726 static void printLayer(StringBuilder& builder, const PlatformCALayer* layer, int a/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp_sec1
- a/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp -1 / +1 lines
720	builder.append('\n');	720	builder.append('\n');
721	printIndent(builder, indent);	721	printIndent(builder, indent);
722		722
723	char* layerTypeName = nullptr;	723	const char* layerTypeName = nullptr;
724	switch (layer->layerType()) {	724	switch (layer->layerType()) {
725	case PlatformCALayer::LayerTypeLayer: layerTypeName = "layer"; break;	725	case PlatformCALayer::LayerTypeLayer: layerTypeName = "layer"; break;
726	case PlatformCALayer::LayerTypeWebLayer: layerTypeName = "web-layer"; break;	726	case PlatformCALayer::LayerTypeWebLayer: layerTypeName = "web-layer"; break;



    if (!m_download)
        return E_FAIL;

    HRESULT hr = S_OK;
    RetainPtr<CFDataRef> resumeData;
    if (m_destination.isEmpty()) {
        CFURLDownloadCancel(m_download.get());
        m_download = nullptr;
        return S_OK;
    }

    CFURLDownloadSetDeletesUponFailure(m_download.get(), false);

    resumeData = adoptCF(CFURLDownloadCopyResumeData(m_download.get()));
    if (!resumeData) {
        LOG(Download, "WebDownload - Unable to create resume data for download (%p)", this);
        m_download = nullptr;
        return S_OK;
    }

    auto* resumeBytes = reinterpret_cast<const uint8_t*>(CFDataGetBytePtr(resumeData.get()));
    uint32_t resumeLength = CFDataGetLength(resumeData.get());
    DownloadBundle::appendResumeData(resumeBytes, resumeLength, m_bundlePath);

exit:
    m_download = nullptr;
    return S_OK;
}

HRESULT WebDownload::deletesFileUponFailure(_Out_ BOOL* result)

Lines 592-598 bool CAD3DRenderer::resetD3DDevice(CWindow window, const CGSize& size) a/Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/CAD3DRenderer.cpp_sec1
- a/Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/CAD3DRenderer.cpp -1 / +1 lines
592	D3DPRESENT_PARAMETERS parameters = initialPresentationParameters(size);	592	D3DPRESENT_PARAMETERS parameters = initialPresentationParameters(size);
593	parameters.hDeviceWindow = window;	593	parameters.hDeviceWindow = window;
594	if (m_usingDirect3D9Ex) {	594	if (m_usingDirect3D9Ex) {
595	CComQIPtr<IDirect3DDevice9Ex> d3d9Ex = m_d3dDevice;	595	CComQIPtr<IDirect3DDevice9Ex> d3d9Ex(m_d3dDevice);
596	ASSERT(d3d9Ex);	596	ASSERT(d3d9Ex);
597	hr = d3d9Ex->ResetEx(&parameters, nullptr);	597	hr = d3d9Ex->ResetEx(&parameters, nullptr);
598	} else	598	} else

Return to Bug 235431

Lines 236-246 HRESULT WebDownload::cancelForResume() a/Source/WebKitLegacy/win/WebDownloadCFNet.cpp_sec1
- a/Source/WebKitLegacy/win/WebDownloadCFNet.cpp -5 / +5 lines
236	if (!m_download)	236	if (!m_download)
237	return E_FAIL;	237	return E_FAIL;
238		238
239	HRESULT hr = S_OK;
240	RetainPtr<CFDataRef> resumeData;	239	RetainPtr<CFDataRef> resumeData;
241	if (m_destination.isEmpty()) {	240	if (m_destination.isEmpty()) {
242	CFURLDownloadCancel(m_download.get());	241	CFURLDownloadCancel(m_download.get());
243	goto exit;	242	m_download = nullptr;
		243	return S_OK;
244	}	244	}
245		245
246	CFURLDownloadSetDeletesUponFailure(m_download.get(), false);	246	CFURLDownloadSetDeletesUponFailure(m_download.get(), false);
Lines 249-264 HRESULT WebDownload::cancelForResume() a/Source/WebKitLegacy/win/WebDownloadCFNet.cpp_sec2
249	resumeData = adoptCF(CFURLDownloadCopyResumeData(m_download.get()));	249	resumeData = adoptCF(CFURLDownloadCopyResumeData(m_download.get()));
250	if (!resumeData) {	250	if (!resumeData) {
251	LOG(Download, "WebDownload - Unable to create resume data for download (%p)", this);	251	LOG(Download, "WebDownload - Unable to create resume data for download (%p)", this);
252	goto exit;	252	m_download = nullptr;
		253	return S_OK;
253	}	254	}
254		255
255	auto* resumeBytes = reinterpret_cast<const uint8_t*>(CFDataGetBytePtr(resumeData.get()));	256	auto* resumeBytes = reinterpret_cast<const uint8_t*>(CFDataGetBytePtr(resumeData.get()));
256	uint32_t resumeLength = CFDataGetLength(resumeData.get());	257	uint32_t resumeLength = CFDataGetLength(resumeData.get());
257	DownloadBundle::appendResumeData(resumeBytes, resumeLength, m_bundlePath);	258	DownloadBundle::appendResumeData(resumeBytes, resumeLength, m_bundlePath);
258		259
259	exit:
260	m_download = nullptr;	260	m_download = nullptr;
261	return hr;	261	return S_OK;
262	}	262	}
263		263
264	HRESULT WebDownload::deletesFileUponFailure(_Out_ BOOL* result)	264	HRESULT WebDownload::deletesFileUponFailure(_Out_ BOOL* result)

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +10 lines
		1	2022-01-21 Fujii Hironori <Hironori.Fujii@sony.com>
		2
		3	Fix AppleWin build with newer MSVC
		4	https://bugs.webkit.org/show_bug.cgi?id=235431
		5
		6	Reviewed by Alex Christensen.
		7
		8	* platform/graphics/ca/win/PlatformCALayerWin.cpp:
		9	(printLayer):
		10
1	2022-01-20 Alan Bujtas <zalan@apple.com>	11	2022-01-20 Alan Bujtas <zalan@apple.com>
2		12
3	[LFC][IFC] Implement TextUtil::directionForTextContent	13	[LFC][IFC] Implement TextUtil::directionForTextContent

Lines 1-3 a/Source/WebKitLegacy/win/ChangeLog_sec1
- a/Source/WebKitLegacy/win/ChangeLog +12 lines
		1	2022-01-21 Fujii Hironori <Hironori.Fujii@sony.com>
		2
		3	Fix AppleWin build with newer MSVC
		4	https://bugs.webkit.org/show_bug.cgi?id=235431
		5
		6	Reviewed by Alex Christensen.
		7
		8	* WebDownloadCFNet.cpp:
		9	(WebDownload::cancelForResume):
		10	* WebKitQuartzCoreAdditions/CAD3DRenderer.cpp:
		11	(WKQCA::CAD3DRenderer::resetD3DDevice):
		12
1	2022-01-15 Sam Weinig <weinig@apple.com>	13	2022-01-15 Sam Weinig <weinig@apple.com>
2		14
3	CSS Gradients: interpolation mode should default to OKLab if any non-legacy color syntax colors are used in the stops	15	CSS Gradients: interpolation mode should default to OKLab if any non-legacy color syntax colors are used in the stops