Changeset 116429 in webkit

Timestamp:

May 8, 2012 9:21:24 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Over-scroll image should be tiled
​https://bugs.webkit.org/show_bug.cgi?id=85860

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

Implement tiling for over-scroll image if image dimension don't match
the surface dimensions.

• Api/BackingStore.cpp:

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

• Api/BackingStore_p.h:

(BackingStorePrivate):

Location:

trunk/Source/WebKit/blackberry

Files:

• Api/BackingStore.cpp (modified) (7 diffs)
• Api/BackingStore_p.h (modified) (1 diff)
• ChangeLog (modified) (1 diff)

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

@@ -80 +80 @@
 Platform::Graphics::Buffer* BackingStorePrivate::s_overScrollImage = 0;
 std::string BackingStorePrivate::s_overScrollImagePath;
+Platform::IntSize BackingStorePrivate::s_overScrollImageSize;
 
 typedef std::pair<int, int> Divisor;
@@ -1211 +1212 @@
 
     SkBitmap bitmap;
-
     if (!SkImageDecoder::DecodeFile(imagePath.c_str(), &bitmap)) {
         BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical,
@@ -1218 +1218 @@
     }
 
-    // FIXME: Make it orientation and resolution agnostic.
-    // For now we fallback to solid color if sizes don't match, later we can implement tiling.
-    if (bitmap.width() != surfaceSize().width() || bitmap.height() != surfaceSize().height())
-        return false;
-
     destroyBuffer(s_overScrollImage);
     s_overScrollImage = createBuffer(Platform::IntSize(bitmap.width(), bitmap.height()), Platform::Graphics::TemporaryBuffer);
 
     SkCanvas* canvas = Platform::Graphics::lockBufferDrawable(s_overScrollImage);
-
     if (!canvas) {
         destroyBuffer(s_overScrollImage);
@@ -1233 +1227 @@
         return false;
     }
+
     SkPaint paint;
     paint.setXfermodeMode(SkXfermode::kSrc_Mode);
@@ -1239 +1234 @@
 
     SkRect rect = SkRect::MakeXYWH(0, 0, bitmap.width(), bitmap.height());
-
     canvas->save();
     canvas->drawBitmapRect(bitmap, 0, rect, &paint);
@@ -1246 +1240 @@
     Platform::Graphics::releaseBufferDrawable(s_overScrollImage);
 
+    s_overScrollImageSize = Platform::IntSize(bitmap.width(), bitmap.height());
     s_overScrollImagePath = path;
 
@@ -1280 +1275 @@
         }
 
-        if (ensureOverScrollImage())
-            blitToWindow(overScrollRect, s_overScrollImage, overScrollRect, false, 255);
-        else
+        if (ensureOverScrollImage()) {
+            // Tile the image on the window region.
+            Platform::IntRect dstRect;
+            for (int y = overScrollRect.y(); y < overScrollRect.y() + overScrollRect.height(); y += dstRect.height()) {
+                for (int x = overScrollRect.x(); x < overScrollRect.x() + overScrollRect.width(); x += dstRect.width()) {
+                    Platform::IntRect imageRect = Platform::IntRect(Platform::IntPoint(x - (x % s_overScrollImageSize.width()),
+                            y - (y % s_overScrollImageSize.height())), s_overScrollImageSize);
+                    dstRect = imageRect;
+                    dstRect.intersect(overScrollRect);
+                    Platform::IntRect srcRect = Platform::IntRect(x - imageRect.x(), y - imageRect.y(), dstRect.width(), dstRect.height());
+                    blitToWindow(dstRect, s_overScrollImage, srcRect, false, 255);
+                }
+            }
+        } else
             clearWindow(overScrollRect, color.red(), color.green(), color.blue(), color.alpha());
     }

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

@@ -372 +372 @@
     static Platform::Graphics::Buffer* s_overScrollImage;
     static std::string s_overScrollImagePath;
+    static Platform::IntSize s_overScrollImageSize;
 
 protected:

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-05-08  Andrew Lo  <anlo@rim.com>
+
+        [BlackBerry] Over-scroll image should be tiled
+        https://bugs.webkit.org/show_bug.cgi?id=85860
+
+        Reviewed by Rob Buis.
+
+        Implement tiling for over-scroll image if image dimension don't match
+        the surface dimensions.
+
+        * Api/BackingStore.cpp:
+        (WebKit):
+        (BlackBerry::WebKit::BackingStorePrivate::ensureOverScrollImage):
+        (BlackBerry::WebKit::BackingStorePrivate::paintDefaultBackground):
+        * Api/BackingStore_p.h:
+        (BackingStorePrivate):
+
 2012-05-08  Chris Guan  <chris.guan@torchmobile.com.cn>