-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
UnifiedPDF: Add instructions and icon to unlock UI
https://bugs.webkit.org/show_bug.cgi?id=269345 rdar://122929864 Reviewed by Simon Fraser. * Source/WebCore/WebCore.xcodeproj/project.pbxproj: Export XMLNSNames.h. * Source/WebCore/en.lproj/Localizable.strings: * Source/WebCore/platform/LocalizedStrings.cpp: (WebCore::pdfPasswordFormTitle): (WebCore::pdfPasswordFormSubtitle): (WebCore::pdfPasswordFormInvalidPasswordSubtitle): * Source/WebCore/platform/LocalizedStrings.h: Add some strings. * Source/WebKit/SourcesCocoa.txt: * Source/WebKit/WebKit.xcodeproj/project.pbxproj: * Source/WebKit/WebProcess/Plugins/PDF/PDFPluginAnnotation.mm: (WebKit::PDFPluginAnnotation::attach): If a PDFPluginAnnotation subclass puts a class on its element, don't overwrite it. * Source/WebKit/WebProcess/Plugins/PDF/PDFPluginBase.h: Update our inline style and add some new rules for the password form. * Source/WebKit/WebProcess/Plugins/PDF/PDFPluginPasswordField.h: (WebKit::PDFPluginPasswordField::PDFPluginPasswordField): * Source/WebKit/WebProcess/Plugins/PDF/PDFPluginPasswordField.mm: (WebKit::PDFPluginPasswordField::resetField): Add a method to clear the field. * Source/WebKit/WebProcess/Plugins/PDF/PDFPluginTextAnnotation.h: * Source/WebKit/WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm: (WebKit::PDFPluginTextAnnotation::createAnnotationElement): (WebKit::PDFPluginTextAnnotation::setValue): Factor out setValue (and implement it in a simpler way). * Source/WebKit/WebProcess/Plugins/PDF/UnifiedPDF/UnifiedPDFPlugin.h: * Source/WebKit/WebProcess/Plugins/PDF/UnifiedPDF/UnifiedPDFPlugin.mm: (WebKit::UnifiedPDFPlugin::createPasswordEntryForm): Install the form (UnifiedPDF only) ahead of the field (used by both plugins). (WebKit::UnifiedPDFPlugin::attemptToUnlockPDF): If the unlock fails, clear the field and change the form's instructions to note that. * Source/WebKit/WebProcess/Plugins/PDF/PDFPluginPasswordForm.h: Added. * Source/WebKit/WebProcess/Plugins/PDF/PDFPluginPasswordForm.mm: Added. Add PDFPluginPasswordForm, which vends the UI above the password entry field for UnifiedPDF. Canonical link: https://commits.webkit.org/274609@main
- Loading branch information
1 parent
ba02cc6
commit 77ac337
Showing
16 changed files
with
265 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
56 changes: 56 additions & 0 deletions
56
Source/WebKit/WebProcess/Plugins/PDF/PDFPluginPasswordForm.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| /* | ||
| * Copyright (C) 2024 Apple Inc. All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions | ||
| * are met: | ||
| * 1. Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * 2. Redistributions in binary form must reproduce the above copyright | ||
| * notice, this list of conditions and the following disclaimer in the | ||
| * documentation and/or other materials provided with the distribution. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' | ||
| * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, | ||
| * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS | ||
| * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
| * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
| * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
| * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
| * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF | ||
| * THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
|
|
||
| #pragma once | ||
|
|
||
| #if PLATFORM(MAC) | ||
|
|
||
| #include "PDFPluginAnnotation.h" | ||
|
|
||
| namespace WebKit { | ||
|
|
||
| class PDFPluginPasswordForm : public PDFPluginAnnotation { | ||
| public: | ||
| static Ref<PDFPluginPasswordForm> create(PDFPluginBase*); | ||
| virtual ~PDFPluginPasswordForm(); | ||
|
|
||
| void updateGeometry() override; | ||
|
|
||
| void unlockFailed(); | ||
|
|
||
| private: | ||
| PDFPluginPasswordForm(PDFPluginBase* plugin) | ||
| : PDFPluginAnnotation(nullptr, plugin) | ||
| { | ||
| } | ||
|
|
||
| Ref<WebCore::Element> createAnnotationElement() override; | ||
|
|
||
| RefPtr<WebCore::Element> m_subtitleElement; | ||
| }; | ||
|
|
||
| } // namespace WebKit | ||
|
|
||
| #endif // PLATFORM(MAC) |
91 changes: 91 additions & 0 deletions
91
Source/WebKit/WebProcess/Plugins/PDF/PDFPluginPasswordForm.mm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| /* | ||
| * Copyright (C) 2024 Apple Inc. All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions | ||
| * are met: | ||
| * 1. Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * 2. Redistributions in binary form must reproduce the above copyright | ||
| * notice, this list of conditions and the following disclaimer in the | ||
| * documentation and/or other materials provided with the distribution. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' | ||
| * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, | ||
| * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS | ||
| * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
| * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
| * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
| * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
| * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF | ||
| * THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
|
|
||
| #import "config.h" | ||
| #import "PDFPluginPasswordForm.h" | ||
|
|
||
| #if PLATFORM(MAC) | ||
|
|
||
| #import <WebCore/ElementInlines.h> | ||
| #import <WebCore/HTMLElement.h> | ||
| #import <WebCore/SVGNames.h> | ||
| #import <WebCore/XMLNSNames.h> | ||
|
|
||
| namespace WebKit { | ||
| using namespace WebCore; | ||
| using namespace HTMLNames; | ||
| using namespace SVGNames; | ||
| using namespace XMLNSNames; | ||
|
|
||
| Ref<PDFPluginPasswordForm> PDFPluginPasswordForm::create(PDFPluginBase* plugin) | ||
| { | ||
| return adoptRef(*new PDFPluginPasswordForm(plugin)); | ||
| } | ||
|
|
||
| PDFPluginPasswordForm::~PDFPluginPasswordForm() = default; | ||
|
|
||
| Ref<Element> PDFPluginPasswordForm::createAnnotationElement() | ||
| { | ||
| Ref document = parent()->document(); | ||
| Ref element = downcast<StyledElement>(document->createElement(divTag, false)); | ||
| element->setAttributeWithoutSynchronization(classAttr, "password-form"_s); | ||
|
|
||
| auto iconElement = document->createElement(svgTag, false); | ||
| iconElement->setAttributeWithoutSynchronization(classAttr, "lock-icon"_s); | ||
| iconElement->setAttributeWithoutSynchronization(xmlnsAttr, "http://www.w3.org/2000/svg"_s); | ||
| iconElement->setAttributeWithoutSynchronization(viewBoxAttr, "0 -10 106.51 106.51"_s); | ||
| element->appendChild(iconElement); | ||
|
|
||
| auto iconPathElement = document->createElement(pathTag, false); | ||
| iconPathElement->setAttributeWithoutSynchronization(dAttr, "M30.898 91.338H75.599C82.77 91.338 86.57 87.454 86.57 79.725V46.13C86.57 38.442 82.77 34.558 75.6 34.558H30.898C23.738 34.558 19.938 38.442 19.938 46.13V79.725C19.938 87.454 23.738 91.338 30.898 91.338ZM31.166 84.002C29.084 84.002 27.813 82.678 27.813 80.263V45.592C27.813 43.177 29.083 41.894 31.166 41.894H75.34C77.465 41.894 78.695 43.177 78.695 45.592V80.263C78.695 82.678 77.465 84.002 75.34 84.002ZM28.516 38.309H36.237V21.845C36.236 9.505 44.13 2.984 53.228 2.984 62.356 2.984 70.312 9.504 70.312 21.844V38.31H78.032V22.899C78.032 4.5 66.025-4.351 53.228-4.351 40.47-4.352 28.517 4.5 28.517 22.9Z"_s); | ||
| iconPathElement->setAttributeWithoutSynchronization(fillAttr, "#4B4B4B"_s); | ||
| iconElement->appendChild(iconPathElement); | ||
|
|
||
| auto titleElement = document->createElement(pTag, false); | ||
| titleElement->setTextContent(pdfPasswordFormTitle()); | ||
| titleElement->setAttributeWithoutSynchronization(classAttr, "title"_s); | ||
| element->appendChild(titleElement); | ||
|
|
||
| m_subtitleElement = document->createElement(pTag, false); | ||
| m_subtitleElement->setTextContent(pdfPasswordFormSubtitle()); | ||
| m_subtitleElement->setAttributeWithoutSynchronization(classAttr, "subtitle"_s); | ||
| element->appendChild(*m_subtitleElement); | ||
|
|
||
| return element; | ||
| } | ||
|
|
||
| void PDFPluginPasswordForm::unlockFailed() | ||
| { | ||
| m_subtitleElement->setTextContent(pdfPasswordFormInvalidPasswordSubtitle()); | ||
| } | ||
|
|
||
| void PDFPluginPasswordForm::updateGeometry() | ||
| { | ||
| // Intentionally do not call the superclass. | ||
| } | ||
|
|
||
| } // namespace WebKit | ||
|
|
||
| #endif // PLATFORM(MAC) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.