Changeset 187311 in webkit

Timestamp:

Jul 24, 2015, 12:54:09 AM (11 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r187173. rdar://problem/21637698

Location:

branches/safari-601.1-branch/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/BitmapImage.h (modified) (1 diff)
• WebCore/platform/graphics/Image.h (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/InteractionInformationAtPosition.cpp (modified) (2 diffs)
• WebKit2/Shared/InteractionInformationAtPosition.h (modified) (1 diff)
• WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h (modified) (3 diffs)
• WebKit2/UIProcess/ios/WKContentViewInteraction.mm (modified) (1 diff)
• WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (modified) (1 diff)

branches/safari-601.1-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2015-07-24  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r187173. rdar://problem/21637698
+
+    2015-07-22  Beth Dakin  <bdakin@apple.com>
+
+            Animated images should animate in previews
+            https://bugs.webkit.org/show_bug.cgi?id=147173
+            -and corresponding-
+            rdar://problem/21637698
+
+            Reviewed by Dan Bernstein.
+
+            New virtual function to indicate whether or not the image is animated.
+            * platform/graphics/BitmapImage.h:
+            * platform/graphics/Image.h:
+            (WebCore::Image::isAnimated):
+
 2015-07-24  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-601.1-branch/Source/WebCore/platform/graphics/BitmapImage.h

@@ -179 +179 @@
 
     virtual bool currentFrameKnownToBeOpaque() override;
+
+    virtual bool isAnimated() override { return m_frameCount > 1; }
     
     bool canAnimate();

branches/safari-601.1-branch/Source/WebCore/platform/graphics/Image.h

@@ -86 +86 @@
     virtual bool currentFrameKnownToBeOpaque() = 0;
 
+    virtual bool isAnimated() { return false; }
+
     // Derived classes should override this if they can assure that 
     // the image contains only resources from its own security origin.

branches/safari-601.1-branch/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-07-24  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r187173. rdar://problem/21637698
+
+    2015-07-22  Beth Dakin  <bdakin@apple.com>
+
+            Animated images should animate in previews
+            https://bugs.webkit.org/show_bug.cgi?id=147173
+            -and corresponding-
+            rdar://problem/21637698
+
+            Reviewed by Dan Bernstein.
+
+            InteractionInformationAtPosition needs to know if it’s an animated image.
+            * Shared/InteractionInformationAtPosition.cpp:
+            (WebKit::InteractionInformationAtPosition::encode):
+            (WebKit::InteractionInformationAtPosition::decode):
+            * Shared/InteractionInformationAtPosition.h:
+
+            New delegate method to create a link preview view controller for animated
+            images.
+            * UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
+
+            Treat animated images more like link previews.
+            * UIProcess/ios/WKContentViewInteraction.mm:
+            (-[WKContentView previewViewControllerForPosition:inSourceView:]):
+
+            Set info.isAnimatedImage
+            * WebProcess/WebPage/ios/WebPageIOS.mm:
+            (WebKit::WebPage::getPositionInformation):
+
 2015-07-24  Lucas Forschler  <lforschler@apple.com>
 

branches/safari-601.1-branch/Source/WebKit2/Shared/InteractionInformationAtPosition.cpp

@@ -40 +40 @@
     encoder << isNearMarkedText;
     encoder << touchCalloutEnabled;
+    encoder << isAnimatedImage;
     encoder << clickableElementName;
     encoder << url;
@@ -68 +69 @@
 
     if (!decoder.decode(result.touchCalloutEnabled))
+        return false;
+
+    if (!decoder.decode(result.isAnimatedImage))
         return false;
     

branches/safari-601.1-branch/Source/WebKit2/Shared/InteractionInformationAtPosition.h

@@ -44 +44 @@
     bool isNearMarkedText { false };
     bool touchCalloutEnabled { true };
+    bool isAnimatedImage { false };
     String clickableElementName;
     String url;

branches/safari-601.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h

@@ -34 +34 @@
 @class UIViewController;
 @class _WKActivatedElementInfo;
+@class _WKElementAction;
 @class _WKFrameHandle;
 
@@ -57 +58 @@
 #if TARGET_OS_IPHONE
 - (BOOL)_webView:(WKWebView *)webView shouldIncludeAppLinkActionsForElement:(_WKActivatedElementInfo *)element WK_AVAILABLE(NA, WK_IOS_TBA);
-- (NSArray *)_webView:(WKWebView *)webView actionsForElement:(_WKActivatedElementInfo *)element defaultActions:(NSArray *)defaultActions;
+- (NSArray *)_webView:(WKWebView *)webView actionsForElement:(_WKActivatedElementInfo *)element defaultActions:(WK_ARRAY(_WKElementAction *) *)defaultActions;
 - (void)_webView:(WKWebView *)webView didNotHandleTapAsClickAtPoint:(CGPoint)point;
 - (BOOL)_webView:(WKWebView *)webView shouldRequestGeolocationAuthorizationForURL:(NSURL *)url isMainFrame:(BOOL)isMainFrame mainFrameURL:(NSURL *)mainFrameURL;
@@ -66 +67 @@
 - (void)_webView:(WKWebView *)webView didDismissPreviewViewController:(UIViewController *)previewedViewController;
 - (UIEdgeInsets)_webView:(WKWebView *)webView finalObscuredInsetsForScrollView:(UIScrollView *)scrollView withVelocity:(CGPoint)velocity targetContentOffset:(inout CGPoint *)targetContentOffset;
-- (UIViewController *)_webView:(WKWebView *)webView previewViewControllerForURL:(NSURL *)url defaultActions:(NSArray *)actions elementInfo:(_WKActivatedElementInfo *)elementInfo WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+- (UIViewController *)_webView:(WKWebView *)webView previewViewControllerForURL:(NSURL *)url defaultActions:(WK_ARRAY(_WKElementAction *) *)actions elementInfo:(_WKActivatedElementInfo *)elementInfo WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+- (UIViewController *)_webView:(WKWebView *)webView previewViewControllerForAnimatedImageAtURL:(NSURL *)url defaultActions:(WK_ARRAY(_WKElementAction *) *)actions elementInfo:(_WKActivatedElementInfo *)elementInfo imageSize:(CGSize)imageSize WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
 #endif
 

branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm

@@ -3268 +3268 @@
         if (absoluteImageURL.isEmpty() || !(WebCore::protocolIsInHTTPFamily(absoluteImageURL) || WebCore::protocolIs(absoluteImageURL, "data")))
             return nil;
+
+        NSURL *targetURL = [NSURL _web_URLWithWTFString:_positionInformation.imageURL];
+        RetainPtr<_WKActivatedElementInfo> elementInfo = adoptNS([[_WKActivatedElementInfo alloc] _initWithType:_WKActivatedElementTypeImage URL:targetURL location:_positionInformation.point title:_positionInformation.title rect:_positionInformation.bounds image:_positionInformation.image.get()]);
+        _page->startInteractionWithElementAtPosition(_positionInformation.point);
+
+        // Treat animated images like a link preview
+        if (_positionInformation.isAnimatedImage) {
+            if ([uiDelegate respondsToSelector:@selector(_webView:previewViewControllerForAnimatedImageAtURL:defaultActions:elementInfo:imageSize:)]) {
+                _previewType = PreviewElementType::Link;
+                RetainPtr<NSArray> actions = [_actionSheetAssistant defaultActionsForImageSheet:elementInfo.get()];
+                _highlightLongPressCanClick = NO;
+                return [uiDelegate _webView:_webView previewViewControllerForAnimatedImageAtURL:targetURL defaultActions:actions.get() elementInfo:elementInfo.get() imageSize:_positionInformation.image->size()];
+            }
+        }
+
         _previewType = PreviewElementType::Image;
-        NSURL *targetURL = [NSURL _web_URLWithWTFString:_positionInformation.imageURL];
         if ([uiDelegate respondsToSelector:@selector(_webView:willPreviewImageWithURL:)])
             [uiDelegate _webView:_webView willPreviewImageWithURL:targetURL];
-        RetainPtr<_WKActivatedElementInfo> elementInfo = adoptNS([[_WKActivatedElementInfo alloc] _initWithType:_WKActivatedElementTypeImage URL:targetURL location:_positionInformation.point title:_positionInformation.title rect:_positionInformation.bounds image:_positionInformation.image.get()]);
-        _page->startInteractionWithElementAtPosition(_positionInformation.point);
         return [[[WKImagePreviewViewController alloc] initWithCGImage:_positionInformation.image->makeCGImageCopy() defaultActions:[_actionSheetAssistant defaultActionsForImageSheet:elementInfo.get()] elementInfo:elementInfo] autorelease];
     }

branches/safari-601.1-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm

@@ -2187 +2187 @@
                         info.imageURL = [(NSURL *)element->document().completeURL(renderImage.cachedImage()->url()) absoluteString];
                         if (Image* image = renderImage.cachedImage()->imageForRenderer(&renderImage)) {
+                            info.isAnimatedImage = image->isAnimated();
                             FloatSize screenSizeInPixels = screenSize();
                             screenSizeInPixels.scale(corePage()->deviceScaleFactor());