diff options
| -rw-r--r-- | WebCore/loader/FrameLoader.cpp | 2 | ||||
| -rw-r--r-- | WebCore/platform/graphics/cg/ImageBufferCG.cpp | 11 | ||||
| -rw-r--r-- | WebCore/platform/wx/MouseWheelEventWx.cpp | 4 | ||||
| -rw-r--r-- | WebCore/platform/wx/ScrollViewWx.cpp | 17 |
4 files changed, 26 insertions, 8 deletions
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp index 02376ba..d81fee0 100644 --- a/WebCore/loader/FrameLoader.cpp +++ b/WebCore/loader/FrameLoader.cpp @@ -592,7 +592,9 @@ void FrameLoader::stopLoading(bool sendUnload) XMLHttpRequest::cancelRequests(doc); +#if ENABLE(DATABASE) doc->stopDatabases(); +#endif } // tell all subframes to stop as well diff --git a/WebCore/platform/graphics/cg/ImageBufferCG.cpp b/WebCore/platform/graphics/cg/ImageBufferCG.cpp index 2e48ceb..7cb28e3 100644 --- a/WebCore/platform/graphics/cg/ImageBufferCG.cpp +++ b/WebCore/platform/graphics/cg/ImageBufferCG.cpp @@ -142,10 +142,11 @@ PassRefPtr<ImageData> ImageBuffer::getImageData(const IntRect& rect) const unsigned char* destRows = data + desty * destBytesPerRow + destx * 4; for (int y = 0; y < numRows; ++y) { for (int x = 0; x < numColumns; x++) { - if (unsigned char alpha = srcRows[3]) { - destRows[0] = (srcRows[0] * 255) / alpha; - destRows[1] = (srcRows[1] * 255) / alpha; - destRows[2] = (srcRows[2] * 255) / alpha; + int basex = x * 4; + if (unsigned char alpha = srcRows[basex + 3]) { + destRows[0] = (srcRows[basex] * 255) / alpha; + destRows[1] = (srcRows[basex + 1] * 255) / alpha; + destRows[2] = (srcRows[basex + 2] * 255) / alpha; destRows[3] = alpha; } else { reinterpret_cast<uint32_t*>(destRows)[0] = reinterpret_cast<uint32_t*>(srcRows)[0]; @@ -182,7 +183,7 @@ void ImageBuffer::putImageData(ImageData* source, const IntRect& sourceRect, con ASSERT(originy <= sourceRect.bottom()); int endy = destPoint.y() + sourceRect.bottom(); - ASSERT(endx <= m_size.height()); + ASSERT(endy <= m_size.height()); int numRows = endy - desty; unsigned srcBytesPerRow = 4 * source->width(); diff --git a/WebCore/platform/wx/MouseWheelEventWx.cpp b/WebCore/platform/wx/MouseWheelEventWx.cpp index 0bfbd4a..6064176 100644 --- a/WebCore/platform/wx/MouseWheelEventWx.cpp +++ b/WebCore/platform/wx/MouseWheelEventWx.cpp @@ -40,6 +40,10 @@ PlatformWheelEvent::PlatformWheelEvent(const wxMouseEvent& event, const wxPoint& , m_metaKey(event.MetaDown()) // FIXME: We'll have to test other browsers , m_deltaX(0) // wx doesn't support horizontal mouse wheel scrolling , m_deltaY(event.GetWheelRotation() / event.GetWheelDelta()) + , m_isAccepted(false) + , m_isContinuous(false) + , m_continuousDeltaX(0) + , m_continuousDeltaY(0) { } diff --git a/WebCore/platform/wx/ScrollViewWx.cpp b/WebCore/platform/wx/ScrollViewWx.cpp index b6c5ae4..8726fc3 100644 --- a/WebCore/platform/wx/ScrollViewWx.cpp +++ b/WebCore/platform/wx/ScrollViewWx.cpp @@ -68,7 +68,6 @@ public: win->Connect(wxEVT_SCROLLWIN_PAGEDOWN, wxScrollWinEventHandler(ScrollViewPrivate::OnScrollWinEvents), NULL, this); win->Connect(wxEVT_SCROLLWIN_THUMBTRACK, wxScrollWinEventHandler(ScrollViewPrivate::OnScrollWinEvents), NULL, this); win->Connect(wxEVT_SCROLLWIN_THUMBRELEASE, wxScrollWinEventHandler(ScrollViewPrivate::OnScrollWinEvents), NULL, this); - win->Connect(wxEVT_SCROLLWIN_TOP, wxScrollWinEventHandler(ScrollViewPrivate::OnScrollWinEvents), NULL, this); } void OnScrollWinEvents(wxScrollWinEvent& e) @@ -84,18 +83,30 @@ public: else pos.y = e.GetPosition(); } - else if ( scrollType == wxEVT_SCROLLWIN_LINEDOWN ) { + else if (scrollType == wxEVT_SCROLLWIN_LINEDOWN) { if (horiz) pos.x += LINE_STEP; else pos.y += LINE_STEP; } - else if ( scrollType == wxEVT_SCROLLWIN_LINEUP ) { + else if (scrollType == wxEVT_SCROLLWIN_LINEUP) { if (horiz) pos.x -= LINE_STEP; else pos.y -= LINE_STEP; } + else if (scrollType == wxEVT_SCROLLWIN_PAGEUP) { + if (horiz) + pos.x -= m_scrollView->visibleWidth() - PAGE_KEEP; + else + pos.y -= m_scrollView->visibleHeight() - PAGE_KEEP; + } + else if (scrollType == wxEVT_SCROLLWIN_PAGEDOWN) { + if (horiz) + pos.x += m_scrollView->visibleWidth() - PAGE_KEEP; + else + pos.y += m_scrollView->visibleHeight() - PAGE_KEEP; + } else return e.Skip(); |