WebKit Bugzilla
Attachment 370637 Details for
Bug 198202
: [iOS] WebPage::positionInformation() may set InteractionInformationAtPosition.isImage to true but leave image unset
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-198202-20190525112146.patch (text/plain), 26.37 KB, created by
Said Abou-Hallawa
on 2019-05-25 11:21:47 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Said Abou-Hallawa
Created:
2019-05-25 11:21:47 PDT
Size:
26.37 KB
patch
obsolete
>Subversion Revision: 245667 >diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog >index aaf592599604e4571c936340da1f3e25fc200a5a..cff682b26a9ac2fb0acdf267b8cdf7a3cbd474e7 100644 >--- a/Source/WebKit/ChangeLog >+++ b/Source/WebKit/ChangeLog >@@ -1,3 +1,33 @@ >+2019-05-24 Said Abou-Hallawa <sabouhallawa@apple.com> >+ >+ [iOS] WebPage::positionInformation() may set InteractionInformationAtPosition.isImage to true but leave image unset >+ https://bugs.webkit.org/show_bug.cgi?id=198202 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ r192037 added the flags isLink and isImage to InteractionInformationAtPosition. >+ It also made WebPage::positionInformation() set isImage to true but before >+ ensuring there is a valid image at the position. >+ >+ Safari WebKit additions assumes if isImage is true then the image has to >+ hold a valid ShareableBitmap pointer. Since WebPage::positionInformation() >+ is the only place that sets isImage, the fix is to set isImage to true >+ only after passing all the image validation checks. >+ >+ Since WebPage::positionInformation() is a little bit difficult to read >+ (182 lines), It was re-factored by splitting it to static functions. >+ >+ * WebProcess/WebPage/ios/WebPageIOS.mm: >+ (WebKit::focusedElementPositionInformation): >+ (WebKit::linkIndicatorPositionInformation): >+ (WebKit::dataDetectorLinkPositionInformation): >+ (WebKit::imagePositionInformation): >+ (WebKit::boundsPositionInformation): >+ (WebKit::elementPositionInformation): >+ (WebKit::selectionPositionInformation): >+ (WebKit::textInteractionPositionInformation): >+ (WebKit::WebPage::positionInformation): >+ > 2019-05-22 Ryosuke Niwa <rniwa@webkit.org> > > REGRESSION(r245148): Removing inputmode="none" does not bring up software keyboard >diff --git a/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm b/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm >index 3255974127a2681f5b82cfde083838ebb91ae64f..e1620d43f4e99fdccecdd8691427ece665babb13 100644 >--- a/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm >+++ b/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm >@@ -2456,187 +2456,244 @@ void WebPage::getPositionInformation(const InteractionInformationRequest& reques > if (auto reply = WTFMove(m_pendingSynchronousPositionInformationReply)) > reply(WTFMove(information)); > } >+ >+static void focusedElementPositionInformation(WebPage& page, Element& focusedElement, const InteractionInformationRequest& request, InteractionInformationAtPosition& info) >+{ >+ const Frame& frame = page.corePage()->focusController().focusedOrMainFrame(); >+ if (!frame.editor().hasComposition()) >+ return; > >-InteractionInformationAtPosition WebPage::positionInformation(const InteractionInformationRequest& request) >+ const uint32_t kHitAreaWidth = 66; >+ const uint32_t kHitAreaHeight = 66; >+ FrameView& view = *frame.view(); >+ IntPoint adjustedPoint(view.rootViewToContents(request.point)); >+ IntPoint constrainedPoint = constrainPoint(adjustedPoint, frame, focusedElement); >+ VisiblePosition position = frame.visiblePositionForPoint(constrainedPoint); >+ >+ RefPtr<Range> compositionRange = frame.editor().compositionRange(); >+ if (position < compositionRange->startPosition()) >+ position = compositionRange->startPosition(); >+ else if (position > compositionRange->endPosition()) >+ position = compositionRange->endPosition(); >+ IntRect caretRect = view.contentsToRootView(position.absoluteCaretBounds()); >+ float deltaX = abs(caretRect.x() + (caretRect.width() / 2) - request.point.x()); >+ float deltaYFromTheTop = abs(caretRect.y() - request.point.y()); >+ float deltaYFromTheBottom = abs(caretRect.y() + caretRect.height() - request.point.y()); >+ >+ info.isNearMarkedText = !(deltaX > kHitAreaWidth || deltaYFromTheTop > kHitAreaHeight || deltaYFromTheBottom > kHitAreaHeight); >+} >+ >+static void linkIndicatorPositionInformation(WebPage& page, Element& element, Element& linkElement, const InteractionInformationRequest& request, InteractionInformationAtPosition& info) > { >- InteractionInformationAtPosition info; >- info.request = request; >+ if (!request.includeLinkIndicator) >+ return; > >- FloatPoint adjustedPoint; >- Node* hitNode = m_page->mainFrame().nodeRespondingToClickEvents(request.point, adjustedPoint); >+ auto linkRange = rangeOfContents(linkElement); >+ float deviceScaleFactor = page.corePage()->deviceScaleFactor(); >+ const float marginInPoints = 4; > >- info.nodeAtPositionIsFocusedElement = hitNode == m_focusedElement; >- if (m_focusedElement) { >- const Frame& frame = m_page->focusController().focusedOrMainFrame(); >- if (frame.editor().hasComposition()) { >- const uint32_t kHitAreaWidth = 66; >- const uint32_t kHitAreaHeight = 66; >- FrameView& view = *frame.view(); >- IntPoint adjustedPoint(view.rootViewToContents(request.point)); >- IntPoint constrainedPoint = m_focusedElement ? constrainPoint(adjustedPoint, frame, *m_focusedElement) : adjustedPoint; >- VisiblePosition position = frame.visiblePositionForPoint(constrainedPoint); >- >- RefPtr<Range> compositionRange = frame.editor().compositionRange(); >- if (position < compositionRange->startPosition()) >- position = compositionRange->startPosition(); >- else if (position > compositionRange->endPosition()) >- position = compositionRange->endPosition(); >- IntRect caretRect = view.contentsToRootView(position.absoluteCaretBounds()); >- float deltaX = abs(caretRect.x() + (caretRect.width() / 2) - request.point.x()); >- float deltaYFromTheTop = abs(caretRect.y() - request.point.y()); >- float deltaYFromTheBottom = abs(caretRect.y() + caretRect.height() - request.point.y()); >- >- info.isNearMarkedText = !(deltaX > kHitAreaWidth || deltaYFromTheTop > kHitAreaHeight || deltaYFromTheBottom > kHitAreaHeight); >- } >- } >- bool elementIsLinkOrImage = false; >- if (hitNode) { >- Element* element = is<Element>(*hitNode) ? downcast<Element>(hitNode) : nullptr; >- if (element) { >- info.isElement = true; >- info.idAttribute = element->getIdAttribute(); >- Element* linkElement = nullptr; >- if (element->renderer() && element->renderer()->isRenderImage()) { >- elementIsLinkOrImage = true; >- linkElement = containingLinkElement(element); >- } else if (element->isLink()) { >- linkElement = element; >- elementIsLinkOrImage = true; >- } >+ auto textIndicator = TextIndicator::createWithRange(linkRange.get(), >+ TextIndicatorOptionTightlyFitContent | TextIndicatorOptionRespectTextColor | TextIndicatorOptionPaintBackgrounds | >+ TextIndicatorOptionUseBoundingRectAndPaintAllContentForComplexRanges | TextIndicatorOptionIncludeMarginIfRangeMatchesSelection, >+ TextIndicatorPresentationTransition::None, FloatSize(marginInPoints * deviceScaleFactor, marginInPoints * deviceScaleFactor)); >+ >+ if (textIndicator) >+ info.linkIndicator = textIndicator->data(); >+} >+ >+#if ENABLE(DATA_DETECTION) >+static void dataDetectorLinkPositionInformation(Element& element, InteractionInformationAtPosition& info) >+{ >+ if (!DataDetection::isDataDetectorLink(element)) >+ return; >+ >+ info.isDataDetectorLink = true; >+ const int dataDetectionExtendedContextLength = 350; >+ info.dataDetectorIdentifier = DataDetection::dataDetectorIdentifier(element); >+ info.dataDetectorResults = element.document().frame()->dataDetectionResults(); >+ >+ if (!DataDetection::requiresExtendedContext(element)) >+ return; >+ >+ auto linkRange = Range::create(element.document()); >+ linkRange->selectNodeContents(element); >+ info.textBefore = plainTextReplacingNoBreakSpace(rangeExpandedByCharactersInDirectionAtWordBoundary(linkRange->startPosition(), >+ dataDetectionExtendedContextLength, DirectionBackward).get(), TextIteratorDefaultBehavior, true); >+ info.textAfter = plainTextReplacingNoBreakSpace(rangeExpandedByCharactersInDirectionAtWordBoundary(linkRange->endPosition(), >+ dataDetectionExtendedContextLength, DirectionForward).get(), TextIteratorDefaultBehavior, true); >+} >+#endif >+ >+static void imagePositionInformation(WebPage& page, Element& element, const InteractionInformationRequest& request, InteractionInformationAtPosition& info) >+{ >+ auto& renderImage = downcast<RenderImage>(*(element.renderer())); >+ if (!renderImage.cachedImage() || renderImage.cachedImage()->errorOccurred()) >+ return; >+ >+ auto* image = renderImage.cachedImage()->imageForRenderer(&renderImage); >+ if (!image || image->width() <= 1 || image->height() <= 1) >+ return; >+ >+ info.isImage = true; >+ info.imageURL = element.document().completeURL(renderImage.cachedImage()->url()); >+ info.isAnimatedImage = image->isAnimated(); >+ >+ if (!request.includeSnapshot) >+ return; >+ >+ FloatSize screenSizeInPixels = screenSize(); >+ screenSizeInPixels.scale(page.corePage()->deviceScaleFactor()); >+ FloatSize scaledSize = largestRectWithAspectRatioInsideRect(image->size().width() / image->size().height(), FloatRect(0, 0, screenSizeInPixels.width(), screenSizeInPixels.height())).size(); >+ FloatSize bitmapSize = scaledSize.width() < image->size().width() ? scaledSize : image->size(); >+ // FIXME: Only select ExtendedColor on images known to need wide gamut >+ ShareableBitmap::Configuration bitmapConfiguration; >+ bitmapConfiguration.colorSpace.cgColorSpace = screenColorSpace(page.corePage()->mainFrame().view()); >+ >+ auto sharedBitmap = ShareableBitmap::createShareable(IntSize(bitmapSize), bitmapConfiguration); >+ if (!sharedBitmap) >+ return; > >- if (elementIsLinkOrImage) { >- if (linkElement) { >- info.isLink = true; >+ auto graphicsContext = sharedBitmap->createGraphicsContext(); >+ if (!graphicsContext) >+ return; > >- if (request.includeSnapshot) { >- // Ensure that the image contains at most 600K pixels, so that it is not too big. >- if (RefPtr<WebImage> snapshot = snapshotNode(*element, SnapshotOptionsShareable, 600 * 1024)) >- info.image = &snapshot->bitmap(); >- } >+ graphicsContext->drawImage(*image, FloatRect(0, 0, bitmapSize.width(), bitmapSize.height())); >+ info.image = sharedBitmap; >+} > >- if (request.includeLinkIndicator) { >- auto linkRange = rangeOfContents(*linkElement); >- float deviceScaleFactor = corePage()->deviceScaleFactor(); >- const float marginInPoints = 4; >+static void boundsPositionInformation(RenderElement& renderer, InteractionInformationAtPosition& info) >+{ >+ if (renderer.isRenderImage()) >+ info.bounds = downcast<RenderImage>(renderer).absoluteContentQuad().enclosingBoundingBox(); >+ else >+ info.bounds = renderer.absoluteBoundingBoxRect(); > >- auto textIndicator = TextIndicator::createWithRange(linkRange.get(), TextIndicatorOptionTightlyFitContent | TextIndicatorOptionRespectTextColor | TextIndicatorOptionPaintBackgrounds | TextIndicatorOptionUseBoundingRectAndPaintAllContentForComplexRanges | >- TextIndicatorOptionIncludeMarginIfRangeMatchesSelection, TextIndicatorPresentationTransition::None, FloatSize(marginInPoints * deviceScaleFactor, marginInPoints * deviceScaleFactor)); >+ if (!renderer.document().frame()->isMainFrame()) { >+ FrameView *view = renderer.document().frame()->view(); >+ info.bounds = view->contentsToRootView(info.bounds); >+ } >+} > >- if (textIndicator) >- info.linkIndicator = textIndicator->data(); >- } >+static void elementPositionInformation(WebPage& page, Element& element, const InteractionInformationRequest& request, InteractionInformationAtPosition& info) >+{ >+ Element* linkElement = nullptr; >+ if (element.renderer() && element.renderer()->isRenderImage()) >+ linkElement = containingLinkElement(&element); >+ else if (element.isLink()) >+ linkElement = &element; >+ >+ info.isElement = true; >+ info.idAttribute = element.getIdAttribute(); >+ >+ info.title = element.attributeWithoutSynchronization(HTMLNames::titleAttr).string(); >+ if (linkElement && info.title.isEmpty()) >+ info.title = element.innerText(); >+ if (element.renderer()) >+ info.touchCalloutEnabled = element.renderer()->style().touchCalloutEnabled(); > >+ if (linkElement) { >+ info.isLink = true; >+ info.url = linkElement->document().completeURL(stripLeadingAndTrailingHTMLSpaces(linkElement->getAttribute(HTMLNames::hrefAttr))); >+ >+ linkIndicatorPositionInformation(page, element, *linkElement, request, info); > #if ENABLE(DATA_DETECTION) >- info.isDataDetectorLink = DataDetection::isDataDetectorLink(*element); >- if (info.isDataDetectorLink) { >- const int dataDetectionExtendedContextLength = 350; >- info.dataDetectorIdentifier = DataDetection::dataDetectorIdentifier(*element); >- info.dataDetectorResults = element->document().frame()->dataDetectionResults(); >- if (DataDetection::requiresExtendedContext(*element)) { >- auto linkRange = Range::create(element->document()); >- linkRange->selectNodeContents(*element); >- info.textBefore = plainTextReplacingNoBreakSpace(rangeExpandedByCharactersInDirectionAtWordBoundary(linkRange->startPosition(), dataDetectionExtendedContextLength, DirectionBackward).get(), TextIteratorDefaultBehavior, true); >- info.textAfter = plainTextReplacingNoBreakSpace(rangeExpandedByCharactersInDirectionAtWordBoundary(linkRange->endPosition(), dataDetectionExtendedContextLength, DirectionForward).get(), TextIteratorDefaultBehavior, true); >- } >- } >+ dataDetectorLinkPositionInformation(element, info); > #endif >- } >- if (element->renderer() && element->renderer()->isRenderImage()) { >- info.isImage = true; >- auto& renderImage = downcast<RenderImage>(*(element->renderer())); >- if (renderImage.cachedImage() && !renderImage.cachedImage()->errorOccurred()) { >- if (Image* image = renderImage.cachedImage()->imageForRenderer(&renderImage)) { >- if (image->width() > 1 && image->height() > 1) { >- info.imageURL = element->document().completeURL(renderImage.cachedImage()->url()); >- info.isAnimatedImage = image->isAnimated(); >- >- if (request.includeSnapshot) { >- FloatSize screenSizeInPixels = screenSize(); >- screenSizeInPixels.scale(corePage()->deviceScaleFactor()); >- FloatSize scaledSize = largestRectWithAspectRatioInsideRect(image->size().width() / image->size().height(), FloatRect(0, 0, screenSizeInPixels.width(), screenSizeInPixels.height())).size(); >- FloatSize bitmapSize = scaledSize.width() < image->size().width() ? scaledSize : image->size(); >- // FIXME: Only select ExtendedColor on images known to need wide gamut >- ShareableBitmap::Configuration bitmapConfiguration; >- bitmapConfiguration.colorSpace.cgColorSpace = screenColorSpace(m_page->mainFrame().view()); >- if (auto sharedBitmap = ShareableBitmap::createShareable(IntSize(bitmapSize), bitmapConfiguration)) { >- auto graphicsContext = sharedBitmap->createGraphicsContext(); >- graphicsContext->drawImage(*image, FloatRect(0, 0, bitmapSize.width(), bitmapSize.height())); >- info.image = sharedBitmap; >- } >- } >- } >- } >- } >- } >- } >- if (linkElement) >- info.url = linkElement->document().completeURL(stripLeadingAndTrailingHTMLSpaces(linkElement->getAttribute(HTMLNames::hrefAttr))); >- info.title = element->attributeWithoutSynchronization(HTMLNames::titleAttr).string(); >- if (linkElement && info.title.isEmpty()) >- info.title = element->innerText(); >- if (element->renderer()) >- info.touchCalloutEnabled = element->renderer()->style().touchCalloutEnabled(); >- >- if (RenderElement* renderer = element->renderer()) { >- if (renderer->isRenderImage()) >- info.bounds = downcast<RenderImage>(*renderer).absoluteContentQuad().enclosingBoundingBox(); >- else >- info.bounds = renderer->absoluteBoundingBoxRect(); >+ } > >- if (!renderer->document().frame()->isMainFrame()) { >- FrameView *view = renderer->document().frame()->view(); >- info.bounds = view->contentsToRootView(info.bounds); >- } >- } >- } >+ if (auto* renderer = element.renderer()) { >+ if (renderer->isRenderImage()) >+ imagePositionInformation(page, element, request, info); >+ boundsPositionInformation(*renderer, info); >+ } >+} >+ >+static void selectionPositionInformation(WebPage& page, const InteractionInformationRequest& request, InteractionInformationAtPosition& info) >+{ >+ HitTestResult result = page.corePage()->mainFrame().eventHandler().hitTestResultAtPoint(request.point, HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::DisallowUserAgentShadowContent | HitTestRequest::AllowChildFrameContent); >+ Node* hitNode = result.innerNode(); >+ >+ // Hit test could return HTMLHtmlElement that has no renderer, if the body is smaller than the document. >+ if (!hitNode || !hitNode->renderer()) >+ return; >+ >+ RenderObject* renderer = hitNode->renderer(); >+ if (!request.readonly) >+ page.corePage()->focusController().setFocusedFrame(result.innerNodeFrame()); >+ >+ info.bounds = renderer->absoluteBoundingBoxRect(true); >+ // We don't want to select blocks that are larger than 97% of the visible area of the document. >+ if (is<HTMLAttachmentElement>(*hitNode)) { >+ info.isAttachment = true; >+ const HTMLAttachmentElement& attachment = downcast<HTMLAttachmentElement>(*hitNode); >+ info.title = attachment.attachmentTitle(); >+ if (attachment.file()) >+ info.url = URL::fileURLWithFileSystemPath(downcast<HTMLAttachmentElement>(*hitNode).file()->path()); >+ } else { >+ info.isSelectable = renderer->style().userSelect() != UserSelect::None; >+ if (info.isSelectable && !hitNode->isTextNode()) >+ info.isSelectable = !isAssistableElement(*downcast<Element>(hitNode)) && !rectIsTooBigForSelection(info.bounds, *result.innerNodeFrame()); > } > >- if (!elementIsLinkOrImage) { >- HitTestResult result = m_page->mainFrame().eventHandler().hitTestResultAtPoint(request.point, HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::DisallowUserAgentShadowContent | HitTestRequest::AllowChildFrameContent); >- hitNode = result.innerNode(); >- // Hit test could return HTMLHtmlElement that has no renderer, if the body is smaller than the document. >- if (hitNode && hitNode->renderer()) { >- RenderObject* renderer = hitNode->renderer(); >- if (!request.readonly) >- m_page->focusController().setFocusedFrame(result.innerNodeFrame()); >- info.bounds = renderer->absoluteBoundingBoxRect(true); >- // We don't want to select blocks that are larger than 97% of the visible area of the document. >- if (is<HTMLAttachmentElement>(*hitNode)) { >- info.isAttachment = true; >- const HTMLAttachmentElement& attachment = downcast<HTMLAttachmentElement>(*hitNode); >- info.title = attachment.attachmentTitle(); >- if (attachment.file()) >- info.url = URL::fileURLWithFileSystemPath(downcast<HTMLAttachmentElement>(*hitNode).file()->path()); >- } else { >- info.isSelectable = renderer->style().userSelect() != UserSelect::None; >- if (info.isSelectable && !hitNode->isTextNode()) >- info.isSelectable = !isAssistableElement(*downcast<Element>(hitNode)) && !rectIsTooBigForSelection(info.bounds, *result.innerNodeFrame()); >- } > #if PLATFORM(IOSMAC) >- bool isInsideFixedPosition; >- VisiblePosition caretPosition(renderer->positionForPoint(request.point, nullptr)); >- info.caretRect = caretPosition.absoluteCaretBounds(&isInsideFixedPosition); >+ bool isInsideFixedPosition; >+ VisiblePosition caretPosition(renderer->positionForPoint(request.point, nullptr)); >+ info.caretRect = caretPosition.absoluteCaretBounds(&isInsideFixedPosition); >+#endif >+} >+ >+#if ENABLE(DATALIST_ELEMENT) >+static void textInteractionPositionInformation(WebPage& page, const HTMLInputElement& input, const InteractionInformationRequest& request, InteractionInformationAtPosition& info) >+{ >+ if (!input.list()) >+ return; >+ >+ HitTestResult result = page.corePage()->mainFrame().eventHandler().hitTestResultAtPoint(request.point, HitTestRequest::ReadOnly | HitTestRequest::Active); >+ if (result.innerNode() == input.dataListButtonElement()) >+ info.preventTextInteraction = true; >+} > #endif >+ >+InteractionInformationAtPosition WebPage::positionInformation(const InteractionInformationRequest& request) >+{ >+ InteractionInformationAtPosition info; >+ info.request = request; >+ >+ FloatPoint adjustedPoint; >+ Node* hitNode = m_page->mainFrame().nodeRespondingToClickEvents(request.point, adjustedPoint); >+ >+ info.nodeAtPositionIsFocusedElement = hitNode == m_focusedElement; >+ info.adjustedPointForNodeRespondingToClickEvents = adjustedPoint; >+ >+#if ENABLE(DATA_INTERACTION) >+ info.hasSelectionAtPosition = m_page->hasSelectionAtPosition(adjustedPoint); >+#endif >+ >+ if (m_focusedElement) >+ focusedElementPositionInformation(*this, *m_focusedElement, request, info); >+ >+ if (is<Element>(hitNode)) { >+ Element& element = downcast<Element>(*hitNode); >+ elementPositionInformation(*this, element, request, info); >+ >+ if (info.isLink && !info.isImage && request.includeSnapshot) { >+ // Ensure that the image contains at most 600K pixels, so that it is not too big. >+ if (RefPtr<WebImage> snapshot = snapshotNode(element, SnapshotOptionsShareable, 600 * 1024)) >+ info.image = &snapshot->bitmap(); > } > } > >+ if (!(info.isLink || info.isImage)) >+ selectionPositionInformation(*this, request, info); >+ > // Prevent the callout bar from showing when tapping on the datalist button. > #if ENABLE(DATALIST_ELEMENT) > if (is<HTMLInputElement>(hitNode)) { > const HTMLInputElement& input = downcast<HTMLInputElement>(*hitNode); >- if (input.list()) { >- HitTestResult result = m_page->mainFrame().eventHandler().hitTestResultAtPoint(request.point, HitTestRequest::ReadOnly | HitTestRequest::Active); >- if (result.innerNode() == input.dataListButtonElement()) >- info.preventTextInteraction = true; >- } >+ textInteractionPositionInformation(*this, input, request, info); > } > #endif > >-#if ENABLE(DATA_INTERACTION) >- info.hasSelectionAtPosition = m_page->hasSelectionAtPosition(adjustedPoint); >-#endif >- info.adjustedPointForNodeRespondingToClickEvents = adjustedPoint; >- > return info; > } > >diff --git a/Tools/ChangeLog b/Tools/ChangeLog >index 14d5ac9e8281bc2e145832cbe6dc1484b9f2b781..87ad1fb31d5f88fda3d4f2ab3f51b8a518cbc6d0 100644 >--- a/Tools/ChangeLog >+++ b/Tools/ChangeLog >@@ -1,3 +1,16 @@ >+2019-05-24 Said Abou-Hallawa <sabouhallawa@apple.com> >+ >+ [iOS] WebPage::positionInformation() may set InteractionInformationAtPosition.isImage to true but leave image unset >+ https://bugs.webkit.org/show_bug.cgi?id=198202 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ The new test ensures InteractionInformationAtPosition::isImage will not >+ be to true for a broken image. >+ >+ * TestWebKitAPI/Tests/WebKitCocoa/WKRequestActivatedElementInfo.mm: >+ (TestWebKitAPI::TEST): >+ > 2019-05-22 Nikita Vasilyev <nvasilyev@apple.com> > > Web Inspector: Provide UIString descriptions to improve localizations >diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKRequestActivatedElementInfo.mm b/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKRequestActivatedElementInfo.mm >index 94061fc765d8cfd7a995aefa6f80f9e2c68c5358..f85dba1cc7d66886a7d80b0c5beae7e798c2d8de 100644 >--- a/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKRequestActivatedElementInfo.mm >+++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKRequestActivatedElementInfo.mm >@@ -114,7 +114,26 @@ TEST(WebKit, RequestActivatedElementInfoForBlank) > > TestWebKitAPI::Util::run(&finished); > } >+ >+TEST(WebKit, RequestActivatedElementInfoForBrokenImage) >+{ >+ auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 320, 500)]); >+ [webView loadHTMLString:@"<html><head><meta name='viewport' content='initial-scale=1'></head><body style = 'margin: 0px;'><img src='missing.gif' height='100' width='100'></body></html>" baseURL:nil]; >+ [webView _test_waitForDidFinishNavigation]; > >+ __block bool finished = false; >+ [webView _requestActivatedElementAtPosition:CGPointMake(50, 50) completionBlock: ^(_WKActivatedElementInfo *elementInfo) { >+ >+ EXPECT_TRUE(elementInfo.type == _WKActivatedElementTypeUnspecified); >+ EXPECT_EQ(elementInfo.boundingRect.size.width, 100); >+ EXPECT_EQ(elementInfo.boundingRect.size.height, 100); >+ >+ finished = true; >+ }]; >+ >+ TestWebKitAPI::Util::run(&finished); >+} >+ > TEST(WebKit, RequestActivatedElementInfoWithNestedSynchronousUpdates) > { > auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 320, 500)]);
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=370637">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 198202
:
370537
|
370555
|
370608
| 370637