Title: [284620] branches/safari-612-branch/Source/WebCore
- Revision
- 284620
- Author
- alanc...@apple.com
- Date
- 2021-10-21 10:32:06 -0700 (Thu, 21 Oct 2021)
Log Message
Cherry-pick r284201. rdar://problem/83670287
[AppleWin] Controls are not being rendered
https://bugs.webkit.org/show_bug.cgi?id=231769
<rdar://problem/83670287>
Reviewed by Fujii Hironori.
Controls are not being rendered because the LocalWindowsContext destructor is no longer blitting the bitmap contents to the hdc.
The test in GraphicsContext::getWindowsContext needs to match the test in GraphicsContext::releaseWindowsContext.
* platform/graphics/win/GraphicsContextWin.cpp:
(WebCore::GraphicsContext::getWindowsContext):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@284201 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-612-branch/Source/WebCore/ChangeLog (284619 => 284620)
--- branches/safari-612-branch/Source/WebCore/ChangeLog 2021-10-21 17:30:45 UTC (rev 284619)
+++ branches/safari-612-branch/Source/WebCore/ChangeLog 2021-10-21 17:32:06 UTC (rev 284620)
@@ -1,3 +1,36 @@
+2021-10-21 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r284201. rdar://problem/83670287
+
+ [AppleWin] Controls are not being rendered
+ https://bugs.webkit.org/show_bug.cgi?id=231769
+ <rdar://problem/83670287>
+
+ Reviewed by Fujii Hironori.
+
+ Controls are not being rendered because the LocalWindowsContext destructor is no longer blitting the bitmap contents to the hdc.
+ The test in GraphicsContext::getWindowsContext needs to match the test in GraphicsContext::releaseWindowsContext.
+
+ * platform/graphics/win/GraphicsContextWin.cpp:
+ (WebCore::GraphicsContext::getWindowsContext):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@284201 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-10-14 Per Arne Vollan <pvol...@apple.com>
+
+ [AppleWin] Controls are not being rendered
+ https://bugs.webkit.org/show_bug.cgi?id=231769
+ <rdar://problem/83670287>
+
+ Reviewed by Fujii Hironori.
+
+ Controls are not being rendered because the LocalWindowsContext destructor is no longer blitting the bitmap contents to the hdc.
+ The test in GraphicsContext::getWindowsContext needs to match the test in GraphicsContext::releaseWindowsContext.
+
+ * platform/graphics/win/GraphicsContextWin.cpp:
+ (WebCore::GraphicsContext::getWindowsContext):
+
2021-10-19 Russell Epstein <repst...@apple.com>
Revert r283931. rdar://problem/83953710
Modified: branches/safari-612-branch/Source/WebCore/platform/graphics/win/GraphicsContextWin.cpp (284619 => 284620)
--- branches/safari-612-branch/Source/WebCore/platform/graphics/win/GraphicsContextWin.cpp 2021-10-21 17:30:45 UTC (rev 284619)
+++ branches/safari-612-branch/Source/WebCore/platform/graphics/win/GraphicsContextWin.cpp 2021-10-21 17:32:06 UTC (rev 284620)
@@ -56,7 +56,7 @@
HDC hdc = nullptr;
#if !USE(CAIRO)
hdc = deprecatedPrivateContext()->m_hdc;
- if (hdc && isInTransparencyLayer()) {
+ if (hdc && !isInTransparencyLayer()) {
deprecatedPrivateContext()->flush();
deprecatedPrivateContext()->save();
return deprecatedPrivateContext()->m_hdc;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
