51752 2010-12-30 08:52:01 -0800 Make retrieving extraMediaControlsStyleSheet be page dependent 2011-01-03 05:40:26 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 max.hong.shen max.hong.shen ademar commit-queue jer.noble kling laszlo.gombos nancy.piedra tonikitoo oldest_to_newest 327932 0 max.hong.shen 2010-12-30 08:52:01 -0800 For media element, cssstyleselector loads the media controls style-sheet by using defaultTheme, which assumes the theme is needed in non-page dependent code. However, we may need to load a page dependent theme. For example, if the browser runs in a force-fullscreen-mode, (see https://bugs.webkit.org/show_bug.cgi?id=51133) then the theme of the media controls might be changed a bit. To change the theme, one possible solution is to load a different style sheet for the force-fullscreen-mode. Considering following code String RenderThemeQt::extraMediaControlsStyleSheet() { String result = String(mediaControlsQtUserAgentStyleSheet, sizeof(mediaControlsQtUserAgentStyleSheet)); if (m_page && m_page->chrome()->requiresFullscreenForVideoPlayback()) result += String(mediaControlsQtFullscreenUserAgentStyleSheet, sizeof(mediaControlsQtFullscreenUserAgentStyleSheet)); return result; } To make above code work, we have to use themeForPage (which passes a page pointer to the RenderThemeQt) to retrieve extraMediaControlsStyleSheet. 327935 1 77683 max.hong.shen 2010-12-30 08:58:59 -0800 Created attachment 77683 first try 328182 2 77683 eric 2010-12-31 09:08:44 -0800 Comment on attachment 77683 first try OK 328196 3 77683 commit-queue 2010-12-31 09:58:48 -0800 Comment on attachment 77683 first try Clearing flags on attachment: 77683 Committed r74832: <http://trac.webkit.org/changeset/74832> 328197 4 commit-queue 2010-12-31 09:58:54 -0800 All reviewed patches have been landed. Closing bug. 328539 5 ademar 2011-01-03 05:40:19 -0800 Revision r74832 cherry-picked into qtwebkit-2.2 with commit 5b7ebdc <http://gitorious.org/webkit/qtwebkit/commit/5b7ebdc> 77683 2010-12-30 08:58:59 -0800 2010-12-31 09:58:47 -0800 first try 51752.patch text/plain 1848 max.hong.shen SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3NDc5OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTAtMTItMzAgIFlpIFNoZW4gIDx5aS40LnNoZW5Abm9raWEuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1ha2Ug cmV0cmlldmluZyBleHRyYU1lZGlhQ29udHJvbHNTdHlsZVNoZWV0IGJlIHBhZ2UgZGVwZW5kZW50 LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTE3NTIK KworICAgICAgICBVc2UgdGhlbWVGb3JQYWdlIHRvIHJldHJpZXZlIGV4dHJhTWVkaWFDb250cm9s c1N0eWxlU2hlZXQgZm9yIG1lZGlhCisgICAgICAgIGNvbnRyb2xzLgorCisgICAgICAgIE5vIG5l dyB0ZXN0cyBiZWNhdXNlIG5vIHBsYXRmb3JtLXNwZWNpZmljIHRoZW1lIGltcGxlbWVudGF0aW9u IHVzZXMKKyAgICAgICAgdGhlIHBhc3NlZCBwYWdlIHBvaW50ZXIgeWV0LgorCisgICAgICAgICog Y3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTU3R5bGVTZWxl Y3Rvcjo6c3R5bGVGb3JFbGVtZW50KToKKwogMjAxMC0xMi0zMCAgUGF2ZWwgUG9kaXZpbG92ICA8 cG9kaXZpbG92QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBGZWxk bWFuLgpJbmRleDogV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAJKHJldmlzaW9uIDc0Nzk2KQorKysg V2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEyNjAs NyArMTI2MCw3IEBAIFBhc3NSZWZQdHI8UmVuZGVyU3R5bGU+IENTU1N0eWxlU2VsZWN0b3IKICAg ICBzdGF0aWMgYm9vbCBsb2FkZWRNZWRpYVN0eWxlU2hlZXQ7CiAgICAgaWYgKCFsb2FkZWRNZWRp YVN0eWxlU2hlZXQgJiYgKGUtPmhhc1RhZ05hbWUodmlkZW9UYWcpIHx8IGUtPmhhc1RhZ05hbWUo YXVkaW9UYWcpKSkgewogICAgICAgICBsb2FkZWRNZWRpYVN0eWxlU2hlZXQgPSB0cnVlOwotICAg ICAgICBTdHJpbmcgbWVkaWFSdWxlcyA9IFN0cmluZyhtZWRpYUNvbnRyb2xzVXNlckFnZW50U3R5 bGVTaGVldCwgc2l6ZW9mKG1lZGlhQ29udHJvbHNVc2VyQWdlbnRTdHlsZVNoZWV0KSkgKyBSZW5k ZXJUaGVtZTo6ZGVmYXVsdFRoZW1lKCktPmV4dHJhTWVkaWFDb250cm9sc1N0eWxlU2hlZXQoKTsK KyAgICAgICAgU3RyaW5nIG1lZGlhUnVsZXMgPSBTdHJpbmcobWVkaWFDb250cm9sc1VzZXJBZ2Vu dFN0eWxlU2hlZXQsIHNpemVvZihtZWRpYUNvbnRyb2xzVXNlckFnZW50U3R5bGVTaGVldCkpICsg UmVuZGVyVGhlbWU6OnRoZW1lRm9yUGFnZShlLT5kb2N1bWVudCgpLT5wYWdlKCkpLT5leHRyYU1l ZGlhQ29udHJvbHNTdHlsZVNoZWV0KCk7CiAgICAgICAgIENTU1N0eWxlU2hlZXQqIG1lZGlhQ29u dHJvbHNTaGVldCA9IHBhcnNlVUFTaGVldChtZWRpYVJ1bGVzKTsKICAgICAgICAgZGVmYXVsdFN0 eWxlLT5hZGRSdWxlc0Zyb21TaGVldChtZWRpYUNvbnRyb2xzU2hlZXQsIHNjcmVlbkV2YWwoKSk7 CiAgICAgICAgIGRlZmF1bHRQcmludFN0eWxlLT5hZGRSdWxlc0Zyb21TaGVldChtZWRpYUNvbnRy b2xzU2hlZXQsIHByaW50RXZhbCgpKTsK