Title: [245263] trunk/Source/WebKitLegacy/mac
- Revision
- 245263
- Author
- jer.no...@apple.com
- Date
- 2019-05-13 16:11:25 -0700 (Mon, 13 May 2019)
Log Message
Make QTKit an optional framework
https://bugs.webkit.org/show_bug.cgi?id=197075
Reviewed by Eric Carlson.
* WebView/WebVideoFullscreenHUDWindowController.mm:
(-[WebVideoFullscreenHUDWindowController windowDidLoad]):
Modified Paths
Diff
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (245262 => 245263)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2019-05-13 23:09:39 UTC (rev 245262)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2019-05-13 23:11:25 UTC (rev 245263)
@@ -1,3 +1,13 @@
+2019-05-13 Jer Noble <jer.no...@apple.com>
+
+ Make QTKit an optional framework
+ https://bugs.webkit.org/show_bug.cgi?id=197075
+
+ Reviewed by Eric Carlson.
+
+ * WebView/WebVideoFullscreenHUDWindowController.mm:
+ (-[WebVideoFullscreenHUDWindowController windowDidLoad]):
+
2019-05-08 Alex Christensen <achristen...@webkit.org>
Don't crash when DOMNode.addEventListener:listener:useCapture: is called with a nil listener
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebVideoFullscreenHUDWindowController.mm (245262 => 245263)
--- trunk/Source/WebKitLegacy/mac/WebView/WebVideoFullscreenHUDWindowController.mm 2019-05-13 23:09:39 UTC (rev 245262)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebVideoFullscreenHUDWindowController.mm 2019-05-13 23:11:25 UTC (rev 245263)
@@ -32,12 +32,12 @@
#import <pal/spi/mac/QTKitSPI.h>
#import <wtf/SoftLinking.h>
-SOFT_LINK_FRAMEWORK(QTKit)
+SOFT_LINK_FRAMEWORK_OPTIONAL(QTKit)
-SOFT_LINK_CLASS(QTKit, QTHUDBackgroundView)
-SOFT_LINK_CLASS(QTKit, QTHUDButton)
-SOFT_LINK_CLASS(QTKit, QTHUDSlider)
-SOFT_LINK_CLASS(QTKit, QTHUDTimeline)
+SOFT_LINK_CLASS_OPTIONAL(QTKit, QTHUDBackgroundView)
+SOFT_LINK_CLASS_OPTIONAL(QTKit, QTHUDButton)
+SOFT_LINK_CLASS_OPTIONAL(QTKit, QTHUDSlider)
+SOFT_LINK_CLASS_OPTIONAL(QTKit, QTHUDTimeline)
#define QTHUDBackgroundView getQTHUDBackgroundViewClass()
#define QTHUDButton getQTHUDButtonClass()
@@ -402,6 +402,13 @@
static const CGFloat timeTextFieldHeight = 13;
static const CGFloat timeTextFieldHorizontalMargin = 7;
+ if (!QTKitLibrary()
+ || !getQTHUDBackgroundViewClass()
+ || !getQTHUDButtonClass()
+ || !getQTHUDSliderClass()
+ || !getQTHUDTimelineClass())
+ return;
+
NSWindow *window = [self window];
ASSERT(window);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
