[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
ossy at webkit.org
ossy at webkit.org
Sun Feb 20 22:46:05 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 00e619ec177da69409d85117f2b2656d6e91364d
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jan 11 04:29:05 2011 +0000
Unreviewed, rolling out r75459
http://trac.webkit.org/changeset/75459
Work towards having the WebPageProxy decide when to create the DrawingAreaProxy
https://bugs.webkit.org/show_bug.cgi?id=52184
* UIProcess/API/mac/PageClientImpl.h:
* UIProcess/API/mac/PageClientImpl.mm:
* UIProcess/API/mac/WKView.mm:
* UIProcess/API/mac/WKViewInternal.h:
* UIProcess/API/qt/qwkpage.cpp:
* UIProcess/API/qt/qwkpage_p.h:
* UIProcess/PageClient.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::initializeWebPage):
(WebKit::WebPageProxy::reinitializeWebPage):
* UIProcess/win/WebView.cpp:
(WebKit::WebView::WebView):
* UIProcess/win/WebView.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75473 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 8f380f3..079e495 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,25 @@
+2011-01-10 Csaba Osztrogonác <ossy at webkit.org>
+
+ Unreviewed, rolling out r75459
+ http://trac.webkit.org/changeset/75459
+
+ Work towards having the WebPageProxy decide when to create the DrawingAreaProxy
+ https://bugs.webkit.org/show_bug.cgi?id=52184
+
+ * UIProcess/API/mac/PageClientImpl.h:
+ * UIProcess/API/mac/PageClientImpl.mm:
+ * UIProcess/API/mac/WKView.mm:
+ * UIProcess/API/mac/WKViewInternal.h:
+ * UIProcess/API/qt/qwkpage.cpp:
+ * UIProcess/API/qt/qwkpage_p.h:
+ * UIProcess/PageClient.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::initializeWebPage):
+ (WebKit::WebPageProxy::reinitializeWebPage):
+ * UIProcess/win/WebView.cpp:
+ (WebKit::WebView::WebView):
+ * UIProcess/win/WebView.h:
+
2011-01-10 Anders Carlsson <andersca at apple.com>
Reviewed by Sam Weinig.
diff --git a/WebKit2/UIProcess/API/mac/PageClientImpl.h b/WebKit2/UIProcess/API/mac/PageClientImpl.h
index 609039f..a8752c0 100644
--- a/WebKit2/UIProcess/API/mac/PageClientImpl.h
+++ b/WebKit2/UIProcess/API/mac/PageClientImpl.h
@@ -48,9 +48,6 @@ public:
private:
PageClientImpl(WKView*);
- virtual PassOwnPtr<DrawingAreaProxy> createDrawingAreaProxy();
- virtual void setViewNeedsDisplay(const WebCore::IntRect&);
-
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..8779f2f 100644
--- a/WebKit2/UIProcess/API/mac/PageClientImpl.mm
+++ b/WebKit2/UIProcess/API/mac/PageClientImpl.mm
@@ -118,16 +118,6 @@ PageClientImpl::~PageClientImpl()
{
}
-PassOwnPtr<DrawingAreaProxy> PageClientImpl::createDrawingAreaProxy()
-{
- return [m_wkView _createDrawingAreaProxy];
-}
-
-void PageClientImpl::setViewNeedsDisplay(const WebCore::IntRect& rect)
-{
- [m_wkView setNeedsDisplayInRect:rect];
-}
-
IntSize PageClientImpl::viewSize()
{
return IntSize([m_wkView bounds].size);
diff --git a/WebKit2/UIProcess/API/mac/WKView.mm b/WebKit2/UIProcess/API/mac/WKView.mm
index 5322d7e..7c2dfeb 100644
--- a/WebKit2/UIProcess/API/mac/WKView.mm
+++ b/WebKit2/UIProcess/API/mac/WKView.mm
@@ -166,6 +166,7 @@ typedef HashMap<String, ValidationVector> ValidationMap;
_data->_pageClient = PageClientImpl::create(self);
_data->_page = toImpl(contextRef)->createWebPage(_data->_pageClient.get(), toImpl(pageGroupRef));
+ _data->_page->setDrawingArea(ChunkedUpdateDrawingAreaProxy::create(self, _data->_page.get()));
_data->_page->initializeWebPage();
WebContext::statistics().wkViewCount++;
@@ -1198,11 +1199,6 @@ static void extractUnderlines(NSAttributedString *string, Vector<CompositionUnde
@implementation WKView (Internal)
-- (PassOwnPtr<WebKit::DrawingAreaProxy>)_createDrawingAreaProxy
-{
- return ChunkedUpdateDrawingAreaProxy::create(self, _data->_page.get());
-}
-
- (BOOL)_isFocused
{
if (_data->_inBecomeFirstResponder)
diff --git a/WebKit2/UIProcess/API/mac/WKViewInternal.h b/WebKit2/UIProcess/API/mac/WKViewInternal.h
index 1c70b38..4939d91 100644
--- a/WebKit2/UIProcess/API/mac/WKViewInternal.h
+++ b/WebKit2/UIProcess/API/mac/WKViewInternal.h
@@ -28,12 +28,10 @@
#import <WebCore/KeyboardEvent.h>
namespace WebKit {
- class DrawingAreaProxy;
class FindIndicator;
}
@interface WKView (Internal)
-- (PassOwnPtr<WebKit::DrawingAreaProxy>)_createDrawingAreaProxy;
- (BOOL)_isFocused;
- (void)_processDidCrash;
- (void)_didRelaunchProcess;
diff --git a/WebKit2/UIProcess/API/qt/qwkpage.cpp b/WebKit2/UIProcess/API/qt/qwkpage.cpp
index db4adbb..f98569f 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.cpp
+++ b/WebKit2/UIProcess/API/qt/qwkpage.cpp
@@ -120,16 +120,6 @@ void QWKPagePrivate::takeFocus(bool direction)
emit q->focusNextPrevChild(direction);
}
-PassOwnPtr<DrawingAreaProxy> QWKPagePrivate::createDrawingAreaProxy()
-{
- // FIXME: Implement. See https://bugs.webkit.org/show_bug.cgi?id=52183.
-}
-
-void QWKPagePrivate::setViewNeedsDisplay(const WebCore::IntRect& rect)
-{
- // FIXME: Implement. See https://bugs.webkit.org/show_bug.cgi?id=52183.
-}
-
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 e26d0e0..bbae5d6 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage_p.h
+++ b/WebKit2/UIProcess/API/qt/qwkpage_p.h
@@ -43,9 +43,6 @@ public:
void init(const QSize& viewportSize, WTF::PassOwnPtr<WebKit::DrawingAreaProxy>);
// PageClient
- virtual PassOwnPtr<DrawingAreaProxy> createDrawingAreaProxy();
- virtual void setViewNeedsDisplay(const WebCore::IntRect&);
-
virtual WebCore::IntSize viewSize();
virtual bool isViewWindowActive();
virtual bool isViewFocused();
diff --git a/WebKit2/UIProcess/PageClient.h b/WebKit2/UIProcess/PageClient.h
index f413342..2af6677 100644
--- a/WebKit2/UIProcess/PageClient.h
+++ b/WebKit2/UIProcess/PageClient.h
@@ -37,7 +37,6 @@ namespace WebCore {
namespace WebKit {
-class DrawingAreaProxy;
class FindIndicator;
class NativeWebKeyboardEvent;
class NativeWebKeyboardEvent;
@@ -49,12 +48,6 @@ class PageClient {
public:
virtual ~PageClient() { }
- // Create a new drawing area proxy for the given page.
- virtual PassOwnPtr<DrawingAreaProxy> createDrawingAreaProxy() = 0;
-
- // Tell the view to invalidate the given rect. The rect is in view coordinates.
- virtual void setViewNeedsDisplay(const WebCore::IntRect&) = 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 d029b5e..097283b 100644
--- a/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/WebKit2/UIProcess/WebPageProxy.cpp
@@ -219,7 +219,6 @@ void WebPageProxy::initializeWebPage()
return;
}
- m_drawingArea = m_pageClient->createDrawingAreaProxy();
ASSERT(m_drawingArea);
process()->send(Messages::WebProcess::CreateWebPage(m_pageID, creationParameters()), 0);
@@ -230,7 +229,6 @@ void WebPageProxy::reinitializeWebPage(const WebCore::IntSize& size)
if (!isValid())
return;
- m_drawingArea = m_pageClient->createDrawingAreaProxy();
ASSERT(m_drawingArea);
process()->send(Messages::WebProcess::CreateWebPage(m_pageID, creationParameters()), 0);
diff --git a/WebKit2/UIProcess/win/WebView.cpp b/WebKit2/UIProcess/win/WebView.cpp
index c22d54d..c49637a 100644
--- a/WebKit2/UIProcess/win/WebView.cpp
+++ b/WebKit2/UIProcess/win/WebView.cpp
@@ -236,6 +236,7 @@ WebView::WebView(RECT rect, WebContext* context, WebPageGroup* pageGroup, HWND p
registerWebViewWindowClass();
m_page = context->createWebPage(this, pageGroup);
+ m_page->setDrawingArea(ChunkedUpdateDrawingAreaProxy::create(this, m_page.get()));
m_window = ::CreateWindowEx(0, kWebKit2WebViewWindowClassName, 0, WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN,
rect.top, rect.left, rect.right - rect.left, rect.bottom - rect.top, parentWindow ? parentWindow : HWND_MESSAGE, 0, instanceHandle(), this);
@@ -574,17 +575,6 @@ void WebView::close()
// PageClient
-PassOwnPtr<DrawingAreaProxy> WebView::createDrawingAreaProxy()
-{
- return ChunkedUpdateDrawingAreaProxy::create(this, m_page.get());
-}
-
-void WebView::setViewNeedsDisplay(const WebCore::IntRect& rect)
-{
- RECT r = rect;
- ::InvalidateRect(m_window, &r, false);
-}
-
WebCore::IntSize WebView::viewSize()
{
RECT clientRect;
diff --git a/WebKit2/UIProcess/win/WebView.h b/WebKit2/UIProcess/win/WebView.h
index 8bf8a5c..bfff344 100644
--- a/WebKit2/UIProcess/win/WebView.h
+++ b/WebKit2/UIProcess/win/WebView.h
@@ -104,8 +104,6 @@ private:
void updateNativeCursor();
// PageClient
- virtual PassOwnPtr<DrawingAreaProxy> createDrawingAreaProxy();
- virtual void setViewNeedsDisplay(const WebCore::IntRect&);
virtual WebCore::IntSize viewSize();
virtual bool isViewWindowActive();
virtual bool isViewFocused();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list