Changeset 225798 in webkit

Timestamp:

Dec 12, 2017 1:01:26 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

[WK2] Expose image via WKBundleHitTestResult API.
​https://bugs.webkit.org/show_bug.cgi?id=180552.
rdar://problem/23951521

Patch by Zach Li <​zachli@apple.com> on 2017-12-12
Reviewed by Simon Fraser.

Source/WebCore:

• platform/graphics/ImageSource.h:

This method will be used by clients outside WebCore, so
add WEBCORE_EXPORT.

Source/WebKit:

• WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp:

(WKBundleHitTestResultGetImage):

• WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h:

• WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp:

(WebKit::InjectedBundleHitTestResult::image const):
Convert from WebCore::Image to WebImage by creating a WebImage
and paint the WebCore::Image into its graphics context. For now,
only handle bitmap images.

• WebProcess/InjectedBundle/InjectedBundleHitTestResult.h:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/ImageSource.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp (modified) (2 diffs)
• WebKit/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h (modified) (1 diff)
• WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp (modified) (3 diffs)
• WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-12-12  Zach Li  <zachli@apple.com>
+        [WK2] Expose image via WKBundleHitTestResult API.
+        https://bugs.webkit.org/show_bug.cgi?id=180552.
+        rdar://problem/23951521
+
+        Reviewed by Simon Fraser.
+
+        * platform/graphics/ImageSource.h:
+        This method will be used by clients outside WebCore, so
+        add WEBCORE_EXPORT.
+
 2017-12-12  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/platform/graphics/ImageSource.h

@@ -96 +96 @@
 
     // Image metadata which is calculated from the first ImageFrame.
-    IntSize size();
+    WEBCORE_EXPORT IntSize size();
     IntSize sizeRespectingOrientation();
     Color singlePixelSolidColor();

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-12-12  Zach Li  <zachli@apple.com>
+
+        [WK2] Expose image via WKBundleHitTestResult API.
+        https://bugs.webkit.org/show_bug.cgi?id=180552.
+        rdar://problem/23951521
+
+        Reviewed by Simon Fraser.
+
+        * WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp:
+        (WKBundleHitTestResultGetImage):
+        * WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h:
+
+        * WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp:
+        (WebKit::InjectedBundleHitTestResult::image const):
+        Convert from WebCore::Image to WebImage by creating a WebImage
+        and paint the WebCore::Image into its graphics context. For now,
+        only handle bitmap images.
+        * WebProcess/InjectedBundle/InjectedBundleHitTestResult.h:
+
 2017-12-12  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp

@@ -32 +32 @@
 #include "WKBundleAPICast.h"
 #include "WebFrame.h"
+#include "WebImage.h"
 
 using namespace WebKit;
@@ -107 +108 @@
 }
 
+WKImageRef WKBundleHitTestResultCopyImage(WKBundleHitTestResultRef hitTestResultRef)
+{
+    RefPtr<WebImage> webImage = toImpl(hitTestResultRef)->image();
+    return toAPI(webImage.leakRef());
+}
+
 bool WKBundleHitTestResultGetIsSelected(WKBundleHitTestResultRef hitTestResultRef)
 {

trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h

@@ -59 +59 @@
 
 WK_EXPORT WKRect WKBundleHitTestResultGetImageRect(WKBundleHitTestResultRef hitTestResult);
+WK_EXPORT WKImageRef WKBundleHitTestResultCopyImage(WKBundleHitTestResultRef hitTestResult);
 WK_EXPORT bool WKBundleHitTestResultGetIsSelected(WKBundleHitTestResultRef hitTestResult);
 

trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp

@@ -30 +30 @@
 #include "WebFrame.h"
 #include "WebFrameLoaderClient.h"
+#include "WebImage.h"
+#include <WebCore/BitmapImage.h>
 #include <WebCore/Document.h>
 #include <WebCore/Element.h>
@@ -35 +37 @@
 #include <WebCore/FrameLoader.h>
 #include <WebCore/FrameView.h>
+#include <WebCore/GraphicsContext.h>
 #include <WebCore/URL.h>
 #include <wtf/text/WTFString.h>
@@ -168 +171 @@
 }
 
+RefPtr<WebImage> InjectedBundleHitTestResult::image() const
+{
+    Image* image = m_hitTestResult.image();
+    // For now, we only handle bitmap images.
+    if (!is<BitmapImage>(image))
+        return nullptr;
+
+    BitmapImage& bitmapImage = downcast<BitmapImage>(*image);
+    IntSize size(bitmapImage.size());
+    auto webImage = WebImage::create(size, static_cast<ImageOptions>(0));
+
+    // FIXME: need to handle EXIF rotation.
+    auto graphicsContext = webImage->bitmap().createGraphicsContext();
+    graphicsContext->drawImage(bitmapImage, {{ }, size});
+
+    return webImage;
+}
+
 bool InjectedBundleHitTestResult::isSelected() const
 {

trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.h

@@ -38 +38 @@
 class InjectedBundleNodeHandle;
 class WebFrame;
+class WebImage;
 
 class InjectedBundleHitTestResult : public API::ObjectImpl<API::Object::Type::BundleHitTestResult> {
@@ -64 +65 @@
     
     WebCore::IntRect imageRect() const;
+    RefPtr<WebImage> image() const;
     
     bool isSelected() const;