Changeset 116199 in webkit

Timestamp:

May 4, 2012 6:12:54 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Blackberry] Implement over-scroll background image
​https://bugs.webkit.org/show_bug.cgi?id=85538

Patch by Andrew Lo <​anlo@rim.com> on 2012-05-04
Reviewed by Rob Buis.

Use over-scroll image when set instead of the solid colour.
Internal PR146652

• Api/BackingStore.cpp:

(WebKit):
(BlackBerry::WebKit::BackingStorePrivate::ensureOverScrollImage):
(BlackBerry::WebKit::BackingStorePrivate::paintDefaultBackground):

• Api/BackingStore_p.h:

(BackingStorePrivate):

• Api/WebSettings.cpp:

(WebKit):
(BlackBerry::WebKit::WebSettings::standardSettings):
(BlackBerry::WebKit::WebSettings::overScrollImagePath):
(BlackBerry::WebKit::WebSettings::setOverScrollImagePath):

• Api/WebSettings.h:

Location:

trunk/Source/WebKit/blackberry

Files:

• Api/BackingStore.cpp (modified) (6 diffs)
• Api/BackingStore_p.h (modified) (2 diffs)
• Api/WebSettings.cpp (modified) (3 diffs)
• Api/WebSettings.h (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/Source/WebKit/blackberry/Api/BackingStore.cpp

@@ -38 +38 @@
 #include "WebSettings.h"
 
+#include <BlackBerryPlatformClient.h>
 #include <BlackBerryPlatformExecutableMessage.h>
+#include <BlackBerryPlatformGraphics.h>
 #include <BlackBerryPlatformIntRectRegion.h>
 #include <BlackBerryPlatformLog.h>
@@ -44 +46 @@
 #include <BlackBerryPlatformMessageClient.h>
 #include <BlackBerryPlatformScreen.h>
+#include <BlackBerryPlatformSettings.h>
 #include <BlackBerryPlatformWindow.h>
+
+#include <SkImageDecoder.h>
 
 #include <wtf/CurrentTime.h>
@@ -73 +78 @@
 const int s_renderTimerTimeout = 1.0;
 WebPage* BackingStorePrivate::s_currentBackingStoreOwner = 0;
+Platform::Graphics::Buffer* BackingStorePrivate::s_overScrollImage = 0;
+std::string BackingStorePrivate::s_overScrollImagePath;
 
 typedef std::pair<int, int> Divisor;
@@ -1192 +1199 @@
 }
 
+bool BackingStorePrivate::ensureOverScrollImage()
+{
+    std::string path = m_webPage->settings()->overScrollImagePath().utf8();
+    if (path == "")
+        return false;
+
+    if (s_overScrollImage && path == s_overScrollImagePath)
+        return true;
+
+    std::string imagePath = Platform::Client::get()->getApplicationDirectory() + path;
+
+    SkBitmap bitmap;
+
+    if (!SkImageDecoder::DecodeFile(imagePath.c_str(), &bitmap)) {
+        BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical,
+                    "BackingStorePrivate::ensureOverScrollImage could not decode overscroll image: %s", imagePath.c_str());
+        return false;
+    }
+
+    // FIXME: Make it orientation and resolution agnostic
+    if (bitmap.width() != surfaceSize().width() || bitmap.height() != surfaceSize().height())
+        return false;
+
+    // FIXME: For now we fallback to solid color if sizes don't match, later we can implement tiling
+    s_overScrollImage = createBuffer(Platform::IntSize(bitmap.width(), bitmap.height()), Platform::Graphics::TemporaryBuffer);
+
+    SkCanvas* canvas = Platform::Graphics::lockBufferDrawable(s_overScrollImage);
+
+    if (!canvas) {
+        destroyBuffer(s_overScrollImage);
+        s_overScrollImage = 0;
+        return false;
+    }
+    SkPaint paint;
+    paint.setXfermodeMode(SkXfermode::kSrc_Mode);
+    paint.setFlags(SkPaint::kAntiAlias_Flag);
+    paint.setFilterBitmap(true);
+
+    SkRect rect = SkRect::MakeXYWH(0, 0, bitmap.width(), bitmap.height());
+
+    canvas->save();
+    canvas->drawBitmapRect(bitmap, 0, rect, &paint);
+    canvas->restore();
+
+    Platform::Graphics::releaseBufferDrawable(s_overScrollImage);
+
+    s_overScrollImagePath = path;
+
+    return true;
+}
+
 void BackingStorePrivate::paintDefaultBackground(const Platform::IntRect& contents,
                                                  const WebCore::TransformationMatrix& transformation,
@@ -1199 +1257 @@
     Platform::IntPoint origin = contents.location();
     Platform::IntRect contentsClipped = contents;
+
 
     // We have to paint the default background in the case of overzoom and
@@ -1220 +1279 @@
         }
 
-        clearWindow(overScrollRect, color.red(), color.green(), color.blue(), color.alpha());
+        if (ensureOverScrollImage())
+            blitToWindow(overScrollRect, s_overScrollImage, overScrollRect, false, 255);
+        else
+            clearWindow(overScrollRect, color.red(), color.green(), color.blue(), color.alpha());
     }
 }

trunk/Source/WebKit/blackberry/Api/BackingStore_p.h

@@ -327 +327 @@
     BlackBerry::Platform::Graphics::Buffer* buffer() const;
 
+    bool ensureOverScrollImage();
+
     static WebPage* s_currentBackingStoreOwner;
 
@@ -368 +370 @@
 #endif
 
+    static Platform::Graphics::Buffer* s_overScrollImage;
+    static std::string s_overScrollImagePath;
+
 protected:
     virtual ~BackingStorePrivate();

trunk/Source/WebKit/blackberry/Api/WebSettings.cpp

@@ -45 +45 @@
 DEFINE_STATIC_LOCAL(String, BlackBerryMaxPluginInstances, ("BlackBerryMaxPluginInstances"));
 DEFINE_STATIC_LOCAL(String, BlackBerryOverZoomColor, ("BlackBerryOverZoomColor"));
+DEFINE_STATIC_LOCAL(String, BlackBerryOverScrollImagePath, ("BlackBerryOverScrollImagePath"));
 DEFINE_STATIC_LOCAL(String, BlackBerryRenderAnimationsOnScrollOrZoomEnabled, ("BlackBerryRenderAnimationsOnScrollOrZoomEnabled"));
 DEFINE_STATIC_LOCAL(String, BlackBerryScrollbarsEnabled, ("BlackBerryScrollbarsEnabled"));
@@ -153 +154 @@
     settings->m_private->setUnsigned(BlackBerryMaxPluginInstances, 1);
     settings->m_private->setUnsigned(BlackBerryOverZoomColor, WebCore::Color::white);
+    settings->m_private->setString(BlackBerryOverScrollImagePath, "");
     settings->m_private->setBoolean(BlackBerryScrollbarsEnabled, true);
 
@@ -662 +664 @@
 }
 
+WebString WebSettings::overScrollImagePath() const
+{
+    return m_private->getString(BlackBerryOverScrollImagePath);
+}
+
+void WebSettings::setOverScrollImagePath(const char* path)
+{
+    m_private->setString(BlackBerryOverScrollImagePath, path);
+}
+
 unsigned WebSettings::backgroundColor() const
 {

trunk/Source/WebKit/blackberry/Api/WebSettings.h

@@ -194 +194 @@
     void setOverZoomColor(unsigned);
 
+    WebString overScrollImagePath() const;
+    void setOverScrollImagePath(const char*);
+
     unsigned backgroundColor() const;
     void setBackgroundColor(unsigned);

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-05-04  Andrew Lo  <anlo@rim.com>
+
+        [Blackberry] Implement over-scroll background image
+        https://bugs.webkit.org/show_bug.cgi?id=85538
+
+        Reviewed by Rob Buis.
+
+        Use over-scroll image when set instead of the solid colour.
+        Internal PR146652
+
+        * Api/BackingStore.cpp:
+        (WebKit):
+        (BlackBerry::WebKit::BackingStorePrivate::ensureOverScrollImage):
+        (BlackBerry::WebKit::BackingStorePrivate::paintDefaultBackground):
+        * Api/BackingStore_p.h:
+        (BackingStorePrivate):
+        * Api/WebSettings.cpp:
+        (WebKit):
+        (BlackBerry::WebKit::WebSettings::standardSettings):
+        (BlackBerry::WebKit::WebSettings::overScrollImagePath):
+        (BlackBerry::WebKit::WebSettings::setOverScrollImagePath):
+        * Api/WebSettings.h:
+
 2012-05-04  Rob Buis  <rbuis@rim.com>