[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
andersca at apple.com
andersca at apple.com
Sun Feb 20 23:00:57 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 452c40ce922e00be30e93d6ef1f619a95839770e
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Jan 15 01:31:09 2011 +0000
2011-01-14 Anders Carlsson <andersca at apple.com>
Reviewed by Dan Bernstein.
Add a new PageClient::displayView function and expose it on WebPageProxy
https://bugs.webkit.org/show_bug.cgi?id=52500
* UIProcess/API/mac/PageClientImpl.h:
* UIProcess/API/mac/PageClientImpl.mm:
(WebKit::PageClientImpl::displayView):
* UIProcess/API/qt/qwkpage.cpp:
(QWKPagePrivate::displayView):
* UIProcess/API/qt/qwkpage_p.h:
* UIProcess/PageClient.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::displayView):
* UIProcess/WebPageProxy.h:
* UIProcess/win/WebView.cpp:
(WebKit::WebView::displayView):
* UIProcess/win/WebView.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75853 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 013432f..4e44c7e 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,26 @@
2011-01-14 Anders Carlsson <andersca at apple.com>
+ Reviewed by Dan Bernstein.
+
+ Add a new PageClient::displayView function and expose it on WebPageProxy
+ https://bugs.webkit.org/show_bug.cgi?id=52500
+
+ * UIProcess/API/mac/PageClientImpl.h:
+ * UIProcess/API/mac/PageClientImpl.mm:
+ (WebKit::PageClientImpl::displayView):
+ * UIProcess/API/qt/qwkpage.cpp:
+ (QWKPagePrivate::displayView):
+ * UIProcess/API/qt/qwkpage_p.h:
+ * UIProcess/PageClient.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::displayView):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/win/WebView.cpp:
+ (WebKit::WebView::displayView):
+ * UIProcess/win/WebView.h:
+
+2011-01-14 Anders Carlsson <andersca at apple.com>
+
Reviewed by Sam Weinig.
Implement the "should paint bounds instead of indiviual rects" algorithm from WebKit1
diff --git a/WebKit2/UIProcess/API/mac/PageClientImpl.h b/WebKit2/UIProcess/API/mac/PageClientImpl.h
index 609039f..8322465 100644
--- a/WebKit2/UIProcess/API/mac/PageClientImpl.h
+++ b/WebKit2/UIProcess/API/mac/PageClientImpl.h
@@ -50,7 +50,8 @@ private:
virtual PassOwnPtr<DrawingAreaProxy> createDrawingAreaProxy();
virtual void setViewNeedsDisplay(const WebCore::IntRect&);
-
+ virtual void displayView();
+
virtual WebCore::IntSize viewSize();
virtual bool isViewWindowActive();
virtual bool isViewFocused();
diff --git a/WebKit2/UIProcess/API/mac/PageClientImpl.mm b/WebKit2/UIProcess/API/mac/PageClientImpl.mm
index ae59eba..c37b641 100644
--- a/WebKit2/UIProcess/API/mac/PageClientImpl.mm
+++ b/WebKit2/UIProcess/API/mac/PageClientImpl.mm
@@ -128,6 +128,11 @@ void PageClientImpl::setViewNeedsDisplay(const WebCore::IntRect& rect)
[m_wkView setNeedsDisplayInRect:rect];
}
+void PageClientImpl::displayView()
+{
+ [m_wkView displayIfNeeded];
+}
+
IntSize PageClientImpl::viewSize()
{
return IntSize([m_wkView bounds].size);
diff --git a/WebKit2/UIProcess/API/qt/qwkpage.cpp b/WebKit2/UIProcess/API/qt/qwkpage.cpp
index a03d896..638d9e3 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.cpp
+++ b/WebKit2/UIProcess/API/qt/qwkpage.cpp
@@ -142,6 +142,11 @@ void QWKPagePrivate::setViewNeedsDisplay(const WebCore::IntRect& rect)
view->update(QRect(rect));
}
+void QWKPagePrivate::displayView()
+{
+ // FIXME: Implement.
+}
+
WebCore::IntSize QWKPagePrivate::viewSize()
{
// FIXME: Implement.
diff --git a/WebKit2/UIProcess/API/qt/qwkpage_p.h b/WebKit2/UIProcess/API/qt/qwkpage_p.h
index c844151..85135c2 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage_p.h
+++ b/WebKit2/UIProcess/API/qt/qwkpage_p.h
@@ -46,6 +46,7 @@ public:
// PageClient
virtual PassOwnPtr<WebKit::DrawingAreaProxy> createDrawingAreaProxy();
virtual void setViewNeedsDisplay(const WebCore::IntRect&);
+ virtual void displayView();
virtual WebCore::IntSize viewSize();
virtual bool isViewWindowActive();
diff --git a/WebKit2/UIProcess/PageClient.h b/WebKit2/UIProcess/PageClient.h
index f413342..5767b3c 100644
--- a/WebKit2/UIProcess/PageClient.h
+++ b/WebKit2/UIProcess/PageClient.h
@@ -55,6 +55,9 @@ public:
// Tell the view to invalidate the given rect. The rect is in view coordinates.
virtual void setViewNeedsDisplay(const WebCore::IntRect&) = 0;
+ // Tell the view to immediately display its invalid rect.
+ virtual void displayView() = 0;
+
// Return the size of the view the page is associated with.
virtual WebCore::IntSize viewSize() = 0;
diff --git a/WebKit2/UIProcess/WebPageProxy.cpp b/WebKit2/UIProcess/WebPageProxy.cpp
index 4be0a17..650bd57 100644
--- a/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/WebKit2/UIProcess/WebPageProxy.cpp
@@ -468,6 +468,11 @@ void WebPageProxy::setViewNeedsDisplay(const IntRect& rect)
m_pageClient->setViewNeedsDisplay(rect);
}
+void WebPageProxy::displayView()
+{
+ m_pageClient->displayView();
+}
+
void WebPageProxy::viewStateDidChange(ViewStateFlags flags)
{
if (!isValid())
diff --git a/WebKit2/UIProcess/WebPageProxy.h b/WebKit2/UIProcess/WebPageProxy.h
index f0b4ce6..74678ca 100644
--- a/WebKit2/UIProcess/WebPageProxy.h
+++ b/WebKit2/UIProcess/WebPageProxy.h
@@ -171,6 +171,7 @@ public:
void setWindowResizerSize(const WebCore::IntSize&);
void setViewNeedsDisplay(const WebCore::IntRect&);
+ void displayView();
enum {
ViewWindowIsActive = 1 << 0,
diff --git a/WebKit2/UIProcess/win/WebView.cpp b/WebKit2/UIProcess/win/WebView.cpp
index 831392c..4b3992c 100644
--- a/WebKit2/UIProcess/win/WebView.cpp
+++ b/WebKit2/UIProcess/win/WebView.cpp
@@ -586,6 +586,11 @@ void WebView::setViewNeedsDisplay(const WebCore::IntRect& rect)
::InvalidateRect(m_window, &r, false);
}
+void WebView::displayView()
+{
+ ::UpdateWindow(m_window);
+}
+
WebCore::IntSize WebView::viewSize()
{
RECT clientRect;
diff --git a/WebKit2/UIProcess/win/WebView.h b/WebKit2/UIProcess/win/WebView.h
index 8bf8a5c..c80334e 100644
--- a/WebKit2/UIProcess/win/WebView.h
+++ b/WebKit2/UIProcess/win/WebView.h
@@ -106,6 +106,8 @@ private:
// PageClient
virtual PassOwnPtr<DrawingAreaProxy> createDrawingAreaProxy();
virtual void setViewNeedsDisplay(const WebCore::IntRect&);
+ virtual void displayView();
+
virtual WebCore::IntSize viewSize();
virtual bool isViewWindowActive();
virtual bool isViewFocused();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list