Changeset 38685 in webkit

Timestamp:

Nov 21, 2008 7:08:15 PM (15 years ago)

Author:

kevino@webkit.org

Message:

Reviewed by Kevin Ollivier.

Improve wx image drawing performance considerably when using wxGraphicsContext
by avoiding unnecessary copies and drawing.

​https://bugs.webkit.org/show_bug.cgi?id=22404

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/wx/ImageWx.cpp (modified) (6 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-11-15  Kevin Watters  <kevinwatters@gmail.com>
+
+        Reviewed by Kevin Ollivier.
+
+        Improve wx image drawing performance considerably when using wxGraphicsContext
+        by avoiding unnecessary copies and drawing.
+        
+        https://bugs.webkit.org/show_bug.cgi?id=22404
+
+        * platform/graphics/wx/ImageWx.cpp:
+        (WebCore::BitmapImage::draw):
+        (WebCore::BitmapImage::drawPattern):
+
+
 2008-11-21  Kevin Watters  <kevinwatters@gmail.com>
 

trunk/WebCore/platform/graphics/wx/ImageWx.cpp

@@ -96 +96 @@
 #if USE(WXGC)
     wxGCDC* context = (wxGCDC*)ctxt->platformContext();
+    wxGraphicsContext* gc = context->GetGraphicsContext();
 #else
     wxWindowDC* context = ctxt->platformContext();
@@ -115 +116 @@
     // Set the compositing operation.
     ctxt->setCompositeOperation(op);
-
+    
+#if USE(WXGC)
+    float scaleX = src.width() / dst.width();
+    float scaleY = src.height() / dst.height();
+
+    FloatRect adjustedDestRect = dst;
+    FloatSize selfSize = currentFrameSize();
+    
+    if (src.size() != selfSize) {
+        adjustedDestRect.setLocation(FloatPoint(dst.x() - src.x() / scaleX, dst.y() - src.y() / scaleY));
+        adjustedDestRect.setSize(FloatSize(selfSize.width() / scaleX, selfSize.height() / scaleY));
+    }
+    
+    // If the image is only partially loaded, then shrink the destination rect that we're drawing into accordingly.
+    int currHeight = bitmap->GetHeight(); 
+    if (currHeight < selfSize.height())
+        adjustedDestRect.setHeight(adjustedDestRect.height() * currHeight / selfSize.height());
+
+    gc->DrawBitmap(*bitmap, adjustedDestRect.x(), adjustedDestRect.y(), adjustedDestRect.width(), adjustedDestRect.height());
+#else
     IntRect srcIntRect(src);
     IntRect dstIntRect(dst);
@@ -125 +145 @@
         img.Rescale(dstIntRect.width(), dstIntRect.height());
         bitmap = new wxBitmap(img);
-    }   
+    } 
+    
     wxMemoryDC mydc; 
     ASSERT(bitmap->GetRefData());
@@ -144 +165 @@
         bitmap = NULL;
     }
+#endif
+
     ctxt->restore();
 }
@@ -170 +193 @@
     wxGraphicsContext* gc = context->GetGraphicsContext();
     gc->ConcatTransform(patternTransform);
-#endif
-
+#else
     wxMemoryDC mydc;
     mydc.SelectObject(*bitmap);
-
-    while ( currentW < dstRect.width() ) {
-        while ( currentH < dstRect.height() ) {
+#endif
+
+    wxPoint origin(context->GetDeviceOrigin());
+    wxSize clientSize(context->GetSize());
+
+    while ( currentW < dstRect.width()  && currentW < clientSize.x - origin.x ) {
+        while ( currentH < dstRect.height() && currentH < clientSize.y - origin.y) {
+#if USE(WXGC)
+            gc->DrawBitmap(*bitmap, (wxDouble)dstRect.x() + currentW, (wxDouble)dstRect.y() + currentH, (wxDouble)srcRect.width(), (wxDouble)srcRect.height());
+#else
             context->Blit((wxCoord)dstRect.x() + currentW, (wxCoord)dstRect.y() + currentH,  
                             (wxCoord)srcRect.width(), (wxCoord)srcRect.height(), &mydc, 
                             (wxCoord)srcRect.x(), (wxCoord)srcRect.y(), wxCOPY, true); 
+#endif
             currentH += srcRect.height();
         }
@@ -186 +216 @@
     }
     ctxt->restore();
+
+#if !USE(WXGC)
     mydc.SelectObject(wxNullBitmap);
+#endif    
     
     // NB: delete is causing crashes during page load, but not during the deletion