diff options
| author | Steve Block <steveblock@google.com> | 2010-08-27 11:02:25 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-09-02 17:17:20 +0100 |
| commit | e8b154fd68f9b33be40a3590e58347f353835f5c (patch) | |
| tree | 0733ce26384183245aaa5656af26c653636fe6c1 /WebKit/win/WebView.cpp | |
| parent | da56157816334089526a7a115a85fd85a6e9a1dc (diff) | |
| download | external_webkit-e8b154fd68f9b33be40a3590e58347f353835f5c.zip external_webkit-e8b154fd68f9b33be40a3590e58347f353835f5c.tar.gz external_webkit-e8b154fd68f9b33be40a3590e58347f353835f5c.tar.bz2 | |
Merge WebKit at r66079 : Initial merge by git
Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
Diffstat (limited to 'WebKit/win/WebView.cpp')
| -rw-r--r-- | WebKit/win/WebView.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/WebKit/win/WebView.cpp b/WebKit/win/WebView.cpp index 6d610a1..c682e91 100644 --- a/WebKit/win/WebView.cpp +++ b/WebKit/win/WebView.cpp @@ -977,7 +977,8 @@ void WebView::paint(HDC dc, LPARAM options) windowsToPaint = PaintWebViewAndChildren; } - if (::IsRectEmpty(&rcPaint)) { + bool backingStoreCompletelyDirty = ensureBackingStore(); + if (!m_backingStoreBitmap) { if (!dc) EndPaint(m_viewWindow, &ps); return; @@ -986,7 +987,6 @@ void WebView::paint(HDC dc, LPARAM options) m_paintCount++; HDC bitmapDC = ::CreateCompatibleDC(hdc); - bool backingStoreCompletelyDirty = ensureBackingStore(); ::SelectObject(bitmapDC, m_backingStoreBitmap->handle()); // Update our backing store if needed. @@ -2432,7 +2432,7 @@ HRESULT STDMETHODCALLTYPE WebView::canShowMIMEType( *canShow = MIMETypeRegistry::isSupportedImageMIMEType(mimeTypeStr) || MIMETypeRegistry::isSupportedNonImageMIMEType(mimeTypeStr) || - (m_page && m_page->pluginData()->supportsMimeType(mimeTypeStr)) || + (m_page && m_page->pluginData() && m_page->pluginData()->supportsMimeType(mimeTypeStr)) || shouldUseEmbeddedView(mimeTypeStr); return S_OK; @@ -3362,7 +3362,7 @@ HRESULT STDMETHODCALLTYPE WebView::rectsForTextMatches( do { if (Document* document = frame->document()) { IntRect visibleRect = frame->view()->visibleContentRect(); - Vector<IntRect> frameRects = document->renderedRectsForMarkers(DocumentMarker::TextMatch); + Vector<IntRect> frameRects = document->markers()->renderedRectsForMarkers(DocumentMarker::TextMatch); IntPoint frameOffset(-frame->view()->scrollOffset().width(), -frame->view()->scrollOffset().height()); frameOffset = frame->view()->convertToContainingWindow(frameOffset); |