[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 22:47:29 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit f3453501e3f909939fe888df3767e2d5c796f083
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jan 11 18:36:22 2011 +0000
2011-01-10 Anders Carlsson <andersca at apple.com>
Reviewed by Sam Weinig.
Pass the view size to the DrawingAreaProxy constructor
https://bugs.webkit.org/show_bug.cgi?id=52189
* UIProcess/DrawingAreaProxy.cpp:
(WebKit::DrawingAreaProxy::DrawingAreaProxy):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::viewSize):
* UIProcess/WebPageProxy.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75512 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index aa0bf68..581aa6a 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-10 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by Sam Weinig.
+
+ Pass the view size to the DrawingAreaProxy constructor
+ https://bugs.webkit.org/show_bug.cgi?id=52189
+
+ * UIProcess/DrawingAreaProxy.cpp:
+ (WebKit::DrawingAreaProxy::DrawingAreaProxy):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::viewSize):
+ * UIProcess/WebPageProxy.h:
+
2011-01-11 Sam Weinig <sam at webkit.org>
Roll r75460 back in with build fix.
diff --git a/WebKit2/UIProcess/DrawingAreaProxy.cpp b/WebKit2/UIProcess/DrawingAreaProxy.cpp
index c026968..fa16641 100644
--- a/WebKit2/UIProcess/DrawingAreaProxy.cpp
+++ b/WebKit2/UIProcess/DrawingAreaProxy.cpp
@@ -25,6 +25,8 @@
#include "DrawingAreaProxy.h"
+#include "WebPageProxy.h"
+
using namespace WebCore;
namespace WebKit {
@@ -32,6 +34,7 @@ namespace WebKit {
DrawingAreaProxy::DrawingAreaProxy(DrawingAreaInfo::Type type, WebPageProxy* webPageProxy)
: m_info(type, nextIdentifier())
, m_webPageProxy(webPageProxy)
+ , m_size(webPageProxy->viewSize())
{
}
diff --git a/WebKit2/UIProcess/WebPageProxy.cpp b/WebKit2/UIProcess/WebPageProxy.cpp
index d029b5e..a541763 100644
--- a/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/WebKit2/UIProcess/WebPageProxy.cpp
@@ -476,6 +476,11 @@ void WebPageProxy::viewStateDidChange(ViewStateFlags flags)
}
}
+IntSize WebPageProxy::viewSize() const
+{
+ return m_pageClient->viewSize();
+}
+
void WebPageProxy::setInitialFocus(bool forward)
{
if (!isValid())
diff --git a/WebKit2/UIProcess/WebPageProxy.h b/WebKit2/UIProcess/WebPageProxy.h
index 622d991..80ee07d 100644
--- a/WebKit2/UIProcess/WebPageProxy.h
+++ b/WebKit2/UIProcess/WebPageProxy.h
@@ -178,6 +178,8 @@ public:
typedef unsigned ViewStateFlags;
void viewStateDidChange(ViewStateFlags flags);
+ WebCore::IntSize viewSize() const;
+
void executeEditCommand(const String& commandName);
void validateMenuItem(const String& commandName);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list