Title: [206499] branches/safari-602.2.15-branch/Source/WebCore
- Revision
- 206499
- Author
- [email protected]
- Date
- 2016-09-27 23:22:12 -0700 (Tue, 27 Sep 2016)
Log Message
Merge r206234. rdar://problem/28503781
Modified Paths
Diff
Modified: branches/safari-602.2.15-branch/Source/WebCore/ChangeLog (206498 => 206499)
--- branches/safari-602.2.15-branch/Source/WebCore/ChangeLog 2016-09-28 06:17:37 UTC (rev 206498)
+++ branches/safari-602.2.15-branch/Source/WebCore/ChangeLog 2016-09-28 06:22:12 UTC (rev 206499)
@@ -1,3 +1,20 @@
+2016-09-27 Babak Shafiei <[email protected]>
+
+ Merge r206234. rdar://problem/28503781
+
+ 2016-09-21 Per Arne Vollan <[email protected]>
+
+ [Win] Null pointer crash under WebCore::CACFLayerTreeHost::create().
+ https://bugs.webkit.org/show_bug.cgi?id=162266
+ <rdar://problem/28345073>
+
+ Reviewed by Brent Fulgham.
+
+ Add null pointer check.
+
+ * platform/graphics/ca/win/CACFLayerTreeHost.cpp:
+ (WebCore::CACFLayerTreeHost::create):
+
2016-09-26 Babak Shafiei <[email protected]>
Merge r206375. rdar://problem/28484393
Modified: branches/safari-602.2.15-branch/Source/WebCore/platform/graphics/ca/win/CACFLayerTreeHost.cpp (206498 => 206499)
--- branches/safari-602.2.15-branch/Source/WebCore/platform/graphics/ca/win/CACFLayerTreeHost.cpp 2016-09-28 06:17:37 UTC (rev 206498)
+++ branches/safari-602.2.15-branch/Source/WebCore/platform/graphics/ca/win/CACFLayerTreeHost.cpp 2016-09-28 06:22:12 UTC (rev 206499)
@@ -31,6 +31,7 @@
#include "DefWndProcWindowClass.h"
#include "FrameView.h"
#include "LayerChangesFlusher.h"
+#include "Logging.h"
#include "MainFrame.h"
#include "PlatformCALayerWin.h"
#include "PlatformLayer.h"
@@ -117,6 +118,10 @@
if (!acceleratedCompositingAvailable())
return nullptr;
RefPtr<CACFLayerTreeHost> host = WKCACFViewLayerTreeHost::create();
+ if (!host) {
+ LOG_ERROR("Failed to create layer tree host for accelerated compositing.");
+ return nullptr;
+ }
host->initialize();
return host.release();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
