Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1124)

Unified Diff: Source/core/html/shadow/PluginPlaceholderElement.js

Issue 698533003: Implement support for closing shadow DOM plugin placeholders. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: mkwst comments Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/html/shadow/PluginPlaceholderElement.js
diff --git a/Source/core/html/shadow/PluginPlaceholderElement.js b/Source/core/html/shadow/PluginPlaceholderElement.js
index 21cc3b782cc90ab99789d7c5ec5706f130f89255..c6ab1a8f7d279b11ce26fc4ef22ba6ce1de72ea2 100644
--- a/Source/core/html/shadow/PluginPlaceholderElement.js
+++ b/Source/core/html/shadow/PluginPlaceholderElement.js
@@ -33,15 +33,70 @@ installClass('PluginPlaceholderElement', function(PluginPlaceholderElementProtot
var messageElement = document.createElement('div');
messageElement.id = 'plugin-placeholder-message';
+ // FIXME: UI polish, l10n, etc. for the close button.
+ var closeButton = document.createElement('button');
+ closeButton.id = 'plugin-placeholder-close-button';
+ closeButton.textContent = 'Close';
+ closeButton.style.display = 'none';
+ closeButton.addEventListener('click', function() {
+ // FIXME: Record UMA Plugin_Hide_Click.
+ this.hide();
+ }.bind(this));
+
contentElement.appendChild(messageElement);
+ contentElement.appendChild(closeButton);
this.appendChild(styleElement);
this.appendChild(contentElement);
this.messageElement = messageElement;
+ this.closeButton = closeButton;
+ };
+
+ PluginPlaceholderElementPrototype.hide = function() {
+ var host = (this.parentNode instanceof ShadowRoot) ? this.parentNode.host : this;
+ host.style.display = 'none';
+
+ // If we have a width and height, search for a parent (often <div>) with the
+ // same dimensions. If we find such a parent, hide that as well.
+ // This makes much more uncovered page content usable (including clickable)
+ // as opposed to merely visible.
+ // TODO(cevans) -- it's a foul heuristic but we're going to tolerate it for
+ // now for these reasons:
+ // 1) Makes the user experience better.
+ // 2) Foulness is encapsulated within this single function.
+ // 3) Confidence in no false positives.
+ // 4) Seems to have a good / low false negative rate at this time.
+ //
+ // This heuristic was copied from plugins::PluginPlaceholder::HidePlugin
+ // (src/components/plugins/renderer/plugin_placeholder.cc) and should be
+ // kept in sync with it until it goes away.
+ if (host.hasAttribute('width') && host.hasAttribute('height')) {
+ var presentationAttributeInPixels = function(attr) {
+ var match = host.getAttribute(attr).match(/^\s*(\d+)\s*(px)?\s*$/);
+ if (match)
+ return match[1] + 'px';
+ };
+ var width = presentationAttributeInPixels('width');
+ var height = presentationAttributeInPixels('height');
+ if (!width || !height)
+ return;
+
+ var element = host;
+ while (element instanceof Element) {
+ if (element.style.width == width && element.style.height == height)
+ element.style.display = 'none';
+ element = element.parentNode;
+ }
+ }
};
Object.defineProperty(PluginPlaceholderElementPrototype, 'message', {
get: function() { return this.messageElement.textContent; },
set: function(message) { this.messageElement.textContent = message; },
});
+
+ Object.defineProperty(PluginPlaceholderElementPrototype, 'closeable', {
+ get: function() { return this.closeButton.style.display != 'none'; },
+ set: function(closeable) { this.closeButton.style.display = closeable ? '' : 'none'; },
+ });
});
« no previous file with comments | « Source/core/html/shadow/PluginPlaceholderElement.idl ('k') | Source/core/plugins/testing/DictionaryPluginPlaceholder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698