logo

etc_portage

Unnamed repository; edit this file 'description' to name the repository. git clone https://hacktivis.me/git/etc_portage.git

0008-WebCore-html-ImageDocument.cpp-Enhance-Image-Viewer.patch (3210B)

    

  1. From 577a193afca81b7c367e84737efd39901f0cb136 Mon Sep 17 00:00:00 2001
  2. From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
  3. Date: Wed, 13 Mar 2019 07:55:17 +0100
  4. Subject: [PATCH 8/8] WebCore/html/ImageDocument.cpp: Enhance Image Viewer
  6. The following chances allows to center the image when viewed and avoids
  7. setting the now useless width/height attributes.
  8. ---
  9.  Source/WebCore/html/ImageDocument.cpp | 24 ++++++++++--------------
  10.  1 file changed, 10 insertions(+), 14 deletions(-)
  12. diff --git a/Source/WebCore/html/ImageDocument.cpp b/Source/WebCore/html/ImageDocument.cpp
  13. index 0518ff867d..cd2a0c67aa 100644
  14. --- a/Source/WebCore/html/ImageDocument.cpp
  15. +++ b/Source/WebCore/html/ImageDocument.cpp
  16. @@ -226,16 +226,17 @@ void ImageDocument::createDocumentStructure()
  17.      rootElement->appendChild(head);
  18.  
  19.      auto body = HTMLBodyElement::create(*this);
  20. -    body->setAttribute(styleAttr, "margin: 0px");
  21. +    body->setAttribute(styleAttr, "margin: 0; display: flex;");
  22.      if (MIMETypeRegistry::isPDFMIMEType(document().loader()->responseMIMEType()))
  23.          body->setInlineStyleProperty(CSSPropertyBackgroundColor, "white");
  24.      rootElement->appendChild(body);
  25.      
  26.      auto imageElement = ImageDocumentElement::create(*this);
  27. -    if (m_shouldShrinkImage)
  28. -        imageElement->setAttribute(styleAttr, "-webkit-user-select:none; display:block; margin:auto;");
  29. -    else
  30. -        imageElement->setAttribute(styleAttr, "-webkit-user-select:none;");
  31. +    //imageElement->setAttribute(styleAttr, "-webkit-user-select:none; display:block; margin:auto; object-fit:contain;");
  32. +    imageElement->setInlineStyleProperty(CSSPropertyWebkitUserSelect, "none");
  33. +    imageElement->setInlineStyleProperty(CSSPropertyDisplay, "block");
  34. +    imageElement->setInlineStyleProperty(CSSPropertyMargin, "auto");
  35. +    imageElement->setInlineStyleProperty(CSSPropertyObjectFit, "contain");
  36.      imageElement->setLoadManually(true);
  37.      imageElement->setSrc(url().string());
  38.      imageElement->cachedImage()->setResponse(loader()->response());
  39. @@ -307,13 +308,9 @@ void ImageDocument::resizeImageToFit()
  40.      if (!m_imageElement)
  41.          return;
  42.  
  43. -    LayoutSize imageSize = this->imageSize();
  44. -
  45. -    float scale = this->scale();
  46. -    m_imageElement->setWidth(static_cast<int>(imageSize.width() * scale));
  47. -    m_imageElement->setHeight(static_cast<int>(imageSize.height() * scale));
  48. -
  49.      m_imageElement->setInlineStyleProperty(CSSPropertyCursor, CSSValueZoomIn);
  50. +    m_imageElement->setInlineStyleProperty(CSSPropertyMaxWidth, "100%");
  51. +    m_imageElement->setInlineStyleProperty(CSSPropertyMaxHeight, "100%");
  52.  }
  53.  
  54.  void ImageDocument::restoreImageSize()
  55. @@ -321,9 +318,8 @@ void ImageDocument::restoreImageSize()
  56.      if (!m_imageElement || !m_imageSizeIsKnown)
  57.          return;
  58.  
  59. -    LayoutSize imageSize = this->imageSize();
  60. -    m_imageElement->setWidth(imageSize.width().toUnsigned());
  61. -    m_imageElement->setHeight(imageSize.height().toUnsigned());
  62. +    m_imageElement->removeInlineStyleProperty(CSSPropertyMaxWidth);
  63. +    m_imageElement->removeInlineStyleProperty(CSSPropertyMaxHeight);
  64.  
  65.      if (imageFitsInWindow())
  66.          m_imageElement->removeInlineStyleProperty(CSSPropertyCursor);
  67. -- 
  68. 2.19.2