Title: [212958] branches/safari-603.1.30.4-branch/Source/WebCore
- Revision
- 212958
- Author
- matthew_han...@apple.com
- Date
- 2017-02-24 09:07:16 -0800 (Fri, 24 Feb 2017)
Log Message
Merge r212822. rdar://problem/30682429
Modified Paths
Diff
Modified: branches/safari-603.1.30.4-branch/Source/WebCore/ChangeLog (212957 => 212958)
--- branches/safari-603.1.30.4-branch/Source/WebCore/ChangeLog 2017-02-24 17:02:09 UTC (rev 212957)
+++ branches/safari-603.1.30.4-branch/Source/WebCore/ChangeLog 2017-02-24 17:07:16 UTC (rev 212958)
@@ -1,3 +1,19 @@
+2017-02-24 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r212822. rdar://problem/30682429
+
+ 2017-02-22 Per Arne Vollan <pvol...@apple.com>
+
+ [Win] Crash under CACFLayerTreeHost::acceleratedCompositingAvailable().
+ https://bugs.webkit.org/show_bug.cgi?id=168711
+
+ Reviewed by Alex Christensen.
+
+ Add null pointer check.
+
+ * platform/graphics/ca/win/CACFLayerTreeHost.cpp:
+ (WebCore::CACFLayerTreeHost::acceleratedCompositingAvailable):
+
2017-02-22 Matthew Hanson <matthew_han...@apple.com>
Merge r212831. rdar://problem/30628889
Modified: branches/safari-603.1.30.4-branch/Source/WebCore/platform/graphics/ca/win/CACFLayerTreeHost.cpp (212957 => 212958)
--- branches/safari-603.1.30.4-branch/Source/WebCore/platform/graphics/ca/win/CACFLayerTreeHost.cpp 2017-02-24 17:02:09 UTC (rev 212957)
+++ branches/safari-603.1.30.4-branch/Source/WebCore/platform/graphics/ca/win/CACFLayerTreeHost.cpp 2017-02-24 17:07:16 UTC (rev 212958)
@@ -107,6 +107,12 @@
}
RefPtr<CACFLayerTreeHost> host = CACFLayerTreeHost::create();
+
+ if (!host) {
+ available = false;
+ return available;
+ }
+
host->setWindow(testWindow);
available = host->createRenderer();
host->setWindow(0);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
