Title: [200491] trunk/Source/WebCore
- Revision
- 200491
- Author
- [email protected]
- Date
- 2016-05-05 16:22:47 -0700 (Thu, 05 May 2016)
Log Message
Add WebKitAdditions extension points in media controls related code in RenderThemeMac
https://bugs.webkit.org/show_bug.cgi?id=157390
Reviewed by Anders Carlsson.
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::mediaControlsStyleSheet):
(WebCore::RenderThemeMac::mediaControlsScript):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (200490 => 200491)
--- trunk/Source/WebCore/ChangeLog 2016-05-05 23:18:20 UTC (rev 200490)
+++ trunk/Source/WebCore/ChangeLog 2016-05-05 23:22:47 UTC (rev 200491)
@@ -1,3 +1,14 @@
+2016-05-05 Ada Chan <[email protected]>
+
+ Add WebKitAdditions extension points in media controls related code in RenderThemeMac
+ https://bugs.webkit.org/show_bug.cgi?id=157390
+
+ Reviewed by Anders Carlsson.
+
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::mediaControlsStyleSheet):
+ (WebCore::RenderThemeMac::mediaControlsScript):
+
2016-05-05 Jer Noble <[email protected]>
[WK2] Media controls don't update if controller is created after the interface is created
Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (200490 => 200491)
--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2016-05-05 23:18:20 UTC (rev 200490)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2016-05-05 23:22:47 UTC (rev 200491)
@@ -230,8 +230,16 @@
String RenderThemeMac::mediaControlsStyleSheet()
{
#if ENABLE(MEDIA_CONTROLS_SCRIPT)
- if (m_mediaControlsStyleSheet.isEmpty())
- m_mediaControlsStyleSheet = [NSString stringWithContentsOfFile:[[NSBundle bundleForClass:[WebCoreRenderThemeBundle class]] pathForResource:@"mediaControlsApple" ofType:@"css"] encoding:NSUTF8StringEncoding error:nil];
+ if (m_mediaControlsStyleSheet.isEmpty()) {
+ StringBuilder styleSheetBuilder;
+ styleSheetBuilder.append([NSString stringWithContentsOfFile:[[NSBundle bundleForClass:[WebCoreRenderThemeBundle class]] pathForResource:@"mediaControlsApple" ofType:@"css"] encoding:NSUTF8StringEncoding error:nil]);
+
+#if USE(APPLE_INTERNAL_SDK)
+#import <WebKitAdditions/RenderThemeMacMediaControlsStyleSheetAdditions.mm>
+#endif
+
+ m_mediaControlsStyleSheet = styleSheetBuilder.toString();
+ }
return m_mediaControlsStyleSheet;
#else
return emptyString();
@@ -245,6 +253,11 @@
StringBuilder scriptBuilder;
scriptBuilder.append([NSString stringWithContentsOfFile:[[NSBundle bundleForClass:[WebCoreRenderThemeBundle class]] pathForResource:@"mediaControlsLocalizedStrings" ofType:@"js"] encoding:NSUTF8StringEncoding error:nil]);
scriptBuilder.append([NSString stringWithContentsOfFile:[[NSBundle bundleForClass:[WebCoreRenderThemeBundle class]] pathForResource:@"mediaControlsApple" ofType:@"js"] encoding:NSUTF8StringEncoding error:nil]);
+
+#if USE(APPLE_INTERNAL_SDK)
+#import <WebKitAdditions/RenderThemeMacMediaControlsScriptAdditions.mm>
+#endif
+
m_mediaControlsScript = scriptBuilder.toString();
}
return m_mediaControlsScript;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
