Bug 118348 – Name resources related to snapshotted plug-ins more accurately

• Status: RESOLVED
• Resolution: WONTFIX
• Component: Plug-ins

[Antoine Quint]

To support https://bugs.webkit.org/show_bug.cgi?id=118347, we'll add a new CSS file to style the content of the missing/blocked plug-in content. Since we'll want to load this CSS file independently of any CSS file related to snapshotted plug-ins, we need to rename the plugIns.css and plugIns.js files to have less of a generic name.

[Antoine Quint]

Created attachment 205989 [details]
Patch

[Build Bot]

Comment on attachment 205989 [details]
Patch

Attachment 205989 [details] did not pass mac-wk2-ews (mac-wk2):
Output: http://webkit-queues.appspot.com/results/1014773

[Early Warning System Bot]

Comment on attachment 205989 [details]
Patch

Attachment 205989 [details] did not pass qt-ews (qt):
Output: http://webkit-queues.appspot.com/results/1016592

[Early Warning System Bot]

Comment on attachment 205989 [details]
Patch

Attachment 205989 [details] did not pass qt-wk2-ews (qt-wk2):
Output: http://webkit-queues.appspot.com/results/1013824

[EFL EWS Bot]

Comment on attachment 205989 [details]
Patch

Attachment 205989 [details] did not pass efl-ews (efl):
Output: http://webkit-queues.appspot.com/results/1018394

[EFL EWS Bot]

Comment on attachment 205989 [details]
Patch

Attachment 205989 [details] did not pass efl-wk2-ews (efl-wk2):
Output: http://webkit-queues.appspot.com/results/1009990

[Build Bot]

Comment on attachment 205989 [details]
Patch

Attachment 205989 [details] did not pass mac-ews (mac):
Output: http://webkit-queues.appspot.com/results/1025047

[kov's GTK+ EWS bot]

Comment on attachment 205989 [details]
Patch

Attachment 205989 [details] did not pass gtk-ews (gtk):
Output: http://webkit-queues.appspot.com/results/1012905

[Dean Jackson]

Comment on attachment 205989 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=205989&action=review

> Source/WebCore/ChangeLog:27
> +        (object::-webkit-snapshotted-plugin-content):
> +        (object::-webkit-snapshotted-plugin-content > .snapshot-overlay):
> +        (object::-webkit-snapshotted-plugin-content > .snapshot-overlay > .snapshot-label):
> +        (object::-webkit-snapshotted-plugin-content > .snapshot-overlay > .snapshot-label > div):
> +        (object::-webkit-snapshotted-plugin-content > .snapshot-overlay > .snapshot-label > .snapshot-title):
> +        (object::-webkit-snapshotted-plugin-content > .snapshot-overlay > .snapshot-label > .snapshot-subtitle):

No need for all this if it is just a rename.

> Source/WebCore/WebCore.xcodeproj/project.pbxproj:8082
> +		5A91469E8E9F8485C37A2876 /* JSSVGGraphicsElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGGraphicsElement.cpp; sourceTree = "<group>"; };

This is just Xcode screwing around with the file, but I generally remove these changes by hand.

> Source/WebCore/WebCore.xcodeproj/project.pbxproj:9367
> +		950C4C02BED8936F818E2F99 /* JSSVGGraphicsElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSSVGGraphicsElement.h; sourceTree = "<group>"; };

Same.

> Source/WebCore/WebCore.xcodeproj/project.pbxproj:-11071
> -		5A91469E8E9F8485C37A2876 /* JSSVGGraphicsElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGGraphicsElement.cpp; sourceTree = "<group>"; };
> -		950C4C02BED8936F818E2F99 /* JSSVGGraphicsElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSSVGGraphicsElement.h; sourceTree = "<group>"; };

And here's where they came from.

> Source/WebCore/css/CSSDefaultStyleSheets.cpp:208
> -            plugInsRules = String(plugInsUserAgentStyleSheet, sizeof(plugInsUserAgentStyleSheet));
> +            plugInsRules = String(snapshottedPlugInsUserAgentStyleSheet, sizeof(snapshottedPlugInsUserAgentStyleSheet));

This is where the change of name doesn't look right. I'm not sure if this is where you're intending to load the blockedPlugins.css, but if not, then I think you should just leave plugins.css named as it is. Otherwise plugInsRules has a generic name for what it is.

> Source/WebCore/rendering/RenderTheme.h:92
> -    // adjust the default CSS rules in html.css, quirks.css, mediaControls.css, or plugIns.css
> +    // adjust the default CSS rules in html.css, quirks.css, mediaControls.css, or snapshottedPlugIns.css
>      virtual String extraDefaultStyleSheet() { return String(); }
>      virtual String extraQuirksStyleSheet() { return String(); }
>      virtual String extraPlugInsStyleSheet() { return String(); }

It's now a bit weird that the method name is fairly different from the file it is replacing.

[Dean Jackson]

Comment on attachment 205989 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=205989&action=review

> Source/WebCore/ChangeLog:14
> +        * Resources/snapshottedPlugIns.js: Renamed from Source/WebCore/Resources/plugIns.js.

This breaks compilation in Document.cpp.

[Dean Jackson]

Source/WebCore/dom/Document.cpp:6011:20: error: use of undeclared identifier 'plugInsJavaScript'
        jsString = plugInsJavaScript;
                   ^
1 error generated.

[Antoine Quint]

Yeah, I think we might as well just keep plugIns.css and plugIns.js and have an extra unavailablePlugIns.css to complement it.