Bug 1836985 - Remove screenshot from the Star ('Bookmark this page') panel.r=dao
authorMarc Seibert <mseibert@mozilla.com>
Wed, 14 Jun 2023 08:33:44 +0000 (2023-06-14)
changeset 667849 0b75a72a1c0f8055fcbccd82ec702d29d924f764
parent 667848 b9439f32524ecb6be8d13532bb0bfb0ea1822c74
child 667850 d74cc456018b798ee4b82b04c70d0dd10dcc9d96
push id186042
push userdgottwald@mozilla.com
push dateWed, 14 Jun 2023 08:40:03 +0000 (2023-06-14)
treeherderautoland@0b75a72a1c0f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdao
bugs1836985
milestone116.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1836985 - Remove screenshot from the Star ('Bookmark this page') panel.r=dao Differential Revision: https://phabricator.services.mozilla.com/D180709
browser/base/content/browser-places.js
browser/base/content/main-popupset.inc.xhtml
browser/themes/shared/places/editBookmarkPanel.css
--- a/browser/base/content/browser-places.js
+++ b/browser/base/content/browser-places.js
@@ -236,18 +236,16 @@ var StarUI = {
     } else {
       // The label of the remove button differs if the URI is bookmarked
       // multiple times.
       document.l10n.setAttributes(removeButton, "bookmark-panel-remove", {
         count: this._itemGuids.length,
       });
     }
 
-    this._setIconAndPreviewImage();
-
     let onPanelReady = fn => {
       let target = this.panel;
       if (target.parentNode) {
         // By targeting the panel's parent and using a capturing listener, we
         // can have our listener called before others waiting for the panel to
         // be shown (which probably expect the panel to be fully initialized)
         target = target.parentNode;
       }
@@ -275,37 +273,16 @@ var StarUI = {
     if (!this._element("editBookmarkPanel")) {
       MozXULElement.insertFTLIfNeeded("browser/editBookmarkOverlay.ftl");
       let template = this._element("editBookmarkPanelTemplate");
       let clone = template.content.cloneNode(true);
       template.replaceWith(clone);
     }
   },
 
-  _setIconAndPreviewImage() {
-    let faviconImage = this._element("editBookmarkPanelFavicon");
-    faviconImage.removeAttribute("iconloadingprincipal");
-    faviconImage.removeAttribute("src");
-
-    let tab = gBrowser.selectedTab;
-    if (tab.hasAttribute("image") && !tab.hasAttribute("busy")) {
-      faviconImage.setAttribute(
-        "iconloadingprincipal",
-        tab.getAttribute("iconloadingprincipal")
-      );
-      faviconImage.setAttribute("src", tab.getAttribute("image"));
-    }
-
-    let canvas = PageThumbs.createCanvas(window);
-    PageThumbs.captureToCanvas(gBrowser.selectedBrowser, canvas).catch(e =>
-      console.error(e)
-    );
-    document.mozSetImageElement("editBookmarkPanelImageCanvas", canvas);
-  },
-
   removeBookmarkButtonCommand: function SU_removeBookmarkButtonCommand() {
     this._removeBookmarksOnPopupHidden = true;
     this.panel.hidePopup();
   },
 
   async _storeRecentlyUsedFolder(selectedFolderGuid, didChangeFolder) {
     if (!selectedFolderGuid) {
       return;
--- a/browser/base/content/main-popupset.inc.xhtml
+++ b/browser/base/content/main-popupset.inc.xhtml
@@ -175,23 +175,16 @@
            aria-labelledby="editBookmarkPanelTitle">
       <box class="panel-header">
         <html:h1>
           <html:span id="editBookmarkPanelTitle"/>
         </html:h1>
       </box>
       <toolbarseparator id="editBookmarkHeaderSeparator"></toolbarseparator>
       <vbox class="panel-subview-body">
-        <html:div id="editBookmarkPanelInfoArea">
-          <html:div id="editBookmarkPanelFaviconContainer">
-            <html:img id="editBookmarkPanelFavicon"/>
-          </html:div>
-          <html:div id="editBookmarkPanelImage"></html:div>
-        </html:div>
-        <toolbarseparator id="editBookmarkSeparator"></toolbarseparator>
 #include ../../components/places/content/editBookmarkPanel.inc.xhtml
         <vbox id="editBookmarkPanelBottomContent"
               flex="1">
           <checkbox id="editBookmarkPanel_showForNewBookmarks"
                     data-l10n-id="bookmark-panel-show-editor-checkbox"
                     oncommand="StarUI.onShowForNewBookmarksCheckboxCommand();"/>
         </vbox>
         <hbox id="editBookmarkPanelBottomButtons"
--- a/browser/themes/shared/places/editBookmarkPanel.css
+++ b/browser/themes/shared/places/editBookmarkPanel.css
@@ -17,48 +17,16 @@
 :root[lwt-popup-brighttext] #editBookmarkPanel {
   color-scheme: dark;
 }
 
 #editBookmarkPanel > .panel-subview-body {
   padding-bottom: 0;
 }
 
-html|div#editBookmarkPanelFaviconContainer {
-  display: flex;
-}
-
-#editBookmarkPanelInfoArea {
-  overflow: hidden;
-  padding: 4px var(--arrowpanel-padding) 0;
-  flex: none;
-}
-
-html|img#editBookmarkPanelFavicon[src] {
-  box-sizing: content-box;
-  width: 32px;
-  height: 32px;
-  padding: 5px;
-  background-color: #F9F9FA;
-  box-shadow: inset 0 0 0 1px rgba(0,0,0,.1);
-  border-radius: 6px;
-  margin-top: 10px;
-  margin-inline-start: 10px;
-  margin-bottom: -52px; /* margin-top + paddings + height */
-}
-
-#editBookmarkPanelImage {
-  border-radius: 4px;
-  height: 150px;
-  background-image: -moz-element(#editBookmarkPanelImageCanvas);
-  background-repeat: no-repeat;
-  background-size: cover;
-  margin: 0;
-}
-
 /* Implements editBookmarkPanel resizing on folderTree un-collapse. */
 #editBMPanel_folderTree {
   min-width: 27em;
 }
 
 #editBMPanel_newFolderButton {
   appearance: none;
   margin: 0;
@@ -78,18 +46,17 @@ html|img#editBookmarkPanelFavicon[src] {
 #editBMPanel_newFolderButton:hover {
   background-color: var(--button-hover-bgcolor);
 }
 
 #editBMPanel_newFolderButton:hover:active {
   background-color: var(--button-active-bgcolor);
 }
 
-#editBookmarkPanel > #editBookmarkHeaderSeparator,
-#editBookmarkPanel > .panel-subview-body > #editBookmarkSeparator {
+#editBookmarkPanel > #editBookmarkHeaderSeparator {
   margin-bottom: 0;
   margin-inline: 16px;
 }
 
 #editBookmarkPanel {
   font: caption;
 }