Changeset 245263 in webkit

Timestamp:

May 13, 2019 4:11:25 PM (5 years ago)

Author:

jer.noble@apple.com

Message:

Make QTKit an optional framework
​https://bugs.webkit.org/show_bug.cgi?id=197075

Reviewed by Eric Carlson.

• WebView/WebVideoFullscreenHUDWindowController.mm:

(-[WebVideoFullscreenHUDWindowController windowDidLoad]):

Location:

trunk/Source/WebKitLegacy/mac

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebVideoFullscreenHUDWindowController.mm (modified) (2 diffs)

trunk/Source/WebKitLegacy/mac/ChangeLog

@@ +1 @@
+2019-05-13  Jer Noble  <jer.noble@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  <achristensen@webkit.org>
 

trunk/Source/WebKitLegacy/mac/WebView/WebVideoFullscreenHUDWindowController.mm

@@ -33 +33 @@
 #import <wtf/SoftLinking.h>
 
-SOFT_LINK_FRAMEWORK(QTKit)
-
-SOFT_LINK_CLASS(QTKit, QTHUDBackgroundView)
-SOFT_LINK_CLASS(QTKit, QTHUDButton)
-SOFT_LINK_CLASS(QTKit, QTHUDSlider)
-SOFT_LINK_CLASS(QTKit, QTHUDTimeline)
+SOFT_LINK_FRAMEWORK_OPTIONAL(QTKit)
+
+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()
@@ -403 +403 @@
     static const CGFloat timeTextFieldHorizontalMargin = 7;
 
+    if (!QTKitLibrary()
+        || !getQTHUDBackgroundViewClass()
+        || !getQTHUDButtonClass()
+        || !getQTHUDSliderClass()
+        || !getQTHUDTimelineClass())
+        return;
+
     NSWindow *window = [self window];
     ASSERT(window);