3 files changed, 50 insertions, 6 deletions

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index cd0f234..9a20e51 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,47 @@
+2010-08-24  Ada Chan  <adachan@apple.com>
+
+        Reviewed by Steve Falkenburg.
+
+        <rdar://problem/8185379> Possible null dereference in WebView::canShowMIMEType.
+        https://bugs.webkit.org/show_bug.cgi?id=44564
+
+        * WebView.cpp:
+        (WebView::canShowMIMEType): Null check m_page->pluginData() since that can return NULL
+        if plugins are disabled.
+
+2010-08-22  Daniel Bates  <dbates@rim.com>
+
+        Reviewed by Eric Seidel.
+
+        Encapsulate document marker management into DocumentMarkerController
+        https://bugs.webkit.org/show_bug.cgi?id=44383
+
+        Modify call sites in the Apple Windows port to use DocumentMarkerController.
+
+        No functionality was changed, so no new tests.
+
+        * WebFrame.cpp:
+        (WebFrame::unmarkAllMisspellings):
+        (WebFrame::unmarkAllBadGrammar):
+        * WebView.cpp:
+        (WebView::rectsForTextMatches):
+
+2010-08-18  Jessie Berlin  <jberlin@apple.com>
+
+        Reviewed by Adam Roben.
+
+        Bug 44180 - WebView::paint fails to paint a child WebView of a Layered Window.
+        https://bugs.webkit.org/show_bug.cgi?id=44180
+        
+        Decide to end painting if the m_backingStoreBitmap is null after the call to
+        ensureBackingStore() instead of when the rcPaint rect filled by BeginPaint is empty.
+        The rcPaint rect filled by BeginPaint is always empty for a child WebView of a Layered 
+        Window, even if GetUpdateRect and GetUpdateRgn report a non-empty region that needs
+        painting.
+
+        * WebView.cpp:
+        (WebView::paint):
+
 2010-08-17  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
 
         Reviewed by Darin Adler.
diff --git a/WebKit/win/WebFrame.cpp b/WebKit/win/WebFrame.cpp
index 500a643..d0cd1e8 100644
--- a/WebKit/win/WebFrame.cpp
+++ b/WebKit/win/WebFrame.cpp
@@ -2564,7 +2564,7 @@ void WebFrame::unmarkAllMisspellings()
         if (!doc)
             return;
 
-        doc->removeMarkers(DocumentMarker::Spelling);
+        doc->markers()->removeMarkers(DocumentMarker::Spelling);
     }
 }
 
@@ -2576,7 +2576,7 @@ void WebFrame::unmarkAllBadGrammar()
         if (!doc)
             return;
 
-        doc->removeMarkers(DocumentMarker::Grammar);
+        doc->markers()->removeMarkers(DocumentMarker::Grammar);
     }
 }
 
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);