[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
weinig at apple.com
weinig at apple.com
Wed Dec 22 14:29:06 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 6e21dbc3a6e77b151e4595c50f7e1c7aee3a88d4
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Oct 11 18:12:12 2010 +0000
Rename transformToDeviceSpace to convertToDeviceSpace and
transformToUserSpace to convertToUserSpace at Simon's request.
Reviewed by Simon Fraser.
* UIProcess/API/mac/PageClientImpl.h:
* UIProcess/API/mac/PageClientImpl.mm:
(WebKit::PageClientImpl::convertToDeviceSpace):
(WebKit::PageClientImpl::convertToUserSpace):
* UIProcess/API/mac/WKView.mm:
(-[WKView _convertToDeviceSpace:]):
(-[WKView _convertToUserSpace:]):
* UIProcess/API/mac/WKViewInternal.h:
* UIProcess/API/qt/qwkpage.cpp:
(QWKPagePrivate::convertToDeviceSpace):
(QWKPagePrivate::convertToUserSpace):
* UIProcess/API/qt/qwkpage_p.h:
* UIProcess/PageClient.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::setWindowFrame):
(WebKit::WebPageProxy::getWindowFrame):
* UIProcess/win/WebView.cpp:
(WebKit::WebView::convertToDeviceSpace):
(WebKit::WebView::convertToUserSpace):
* UIProcess/win/WebView.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69508 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 9a93407..b4822f1 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,33 @@
2010-10-11 Sam Weinig <sam at webkit.org>
+ Reviewed by Simon Fraser.
+
+ Rename transformToDeviceSpace to convertToDeviceSpace and
+ transformToUserSpace to convertToUserSpace at Simon's request.
+
+ * UIProcess/API/mac/PageClientImpl.h:
+ * UIProcess/API/mac/PageClientImpl.mm:
+ (WebKit::PageClientImpl::convertToDeviceSpace):
+ (WebKit::PageClientImpl::convertToUserSpace):
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _convertToDeviceSpace:]):
+ (-[WKView _convertToUserSpace:]):
+ * UIProcess/API/mac/WKViewInternal.h:
+ * UIProcess/API/qt/qwkpage.cpp:
+ (QWKPagePrivate::convertToDeviceSpace):
+ (QWKPagePrivate::convertToUserSpace):
+ * UIProcess/API/qt/qwkpage_p.h:
+ * UIProcess/PageClient.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::setWindowFrame):
+ (WebKit::WebPageProxy::getWindowFrame):
+ * UIProcess/win/WebView.cpp:
+ (WebKit::WebView::convertToDeviceSpace):
+ (WebKit::WebView::convertToUserSpace):
+ * UIProcess/win/WebView.h:
+
+2010-10-11 Sam Weinig <sam at webkit.org>
+
Try to fix the Mac release build.
* UIProcess/API/mac/WKView.mm:
diff --git a/WebKit2/UIProcess/API/mac/PageClientImpl.h b/WebKit2/UIProcess/API/mac/PageClientImpl.h
index f72cc07..f539d47 100644
--- a/WebKit2/UIProcess/API/mac/PageClientImpl.h
+++ b/WebKit2/UIProcess/API/mac/PageClientImpl.h
@@ -57,8 +57,8 @@ private:
void clearAllEditCommands();
void setEditCommandState(const String& commandName, bool isEnabled, int state);
- WebCore::FloatRect transformToDeviceSpace(const WebCore::FloatRect&);
- WebCore::FloatRect transformToUserSpace(const WebCore::FloatRect&);
+ WebCore::FloatRect convertToDeviceSpace(const WebCore::FloatRect&);
+ WebCore::FloatRect convertToUserSpace(const WebCore::FloatRect&);
#if USE(ACCELERATED_COMPOSITING)
void pageDidEnterAcceleratedCompositing();
diff --git a/WebKit2/UIProcess/API/mac/PageClientImpl.mm b/WebKit2/UIProcess/API/mac/PageClientImpl.mm
index 507401e..a522c3d 100644
--- a/WebKit2/UIProcess/API/mac/PageClientImpl.mm
+++ b/WebKit2/UIProcess/API/mac/PageClientImpl.mm
@@ -211,14 +211,14 @@ void PageClientImpl::setEditCommandState(const String& commandName, bool isEnabl
[m_wkView _setUserInterfaceItemState:nsStringFromWebCoreString(commandName) enabled:isEnabled state:newState];
}
-FloatRect PageClientImpl::transformToDeviceSpace(const FloatRect& rect)
+FloatRect PageClientImpl::convertToDeviceSpace(const FloatRect& rect)
{
- return [m_wkView _transformToDeviceSpace:rect];
+ return [m_wkView _convertToDeviceSpace:rect];
}
-FloatRect PageClientImpl::transformToUserSpace(const FloatRect& rect)
+FloatRect PageClientImpl::convertToUserSpace(const FloatRect& rect)
{
- return [m_wkView _transformToUserSpace:rect];
+ return [m_wkView _convertToUserSpace:rect];
}
#if USE(ACCELERATED_COMPOSITING)
diff --git a/WebKit2/UIProcess/API/mac/WKView.mm b/WebKit2/UIProcess/API/mac/WKView.mm
index 63d858d..9b8d440 100644
--- a/WebKit2/UIProcess/API/mac/WKView.mm
+++ b/WebKit2/UIProcess/API/mac/WKView.mm
@@ -534,12 +534,12 @@ static bool isViewVisible(NSView *view)
_data->_menuList.clear();
}
-- (NSRect)_transformToDeviceSpace:(NSRect)rect
+- (NSRect)_convertToDeviceSpace:(NSRect)rect
{
return toDeviceSpace(rect, [self window]);
}
-- (NSRect)_transformToUserSpace:(NSRect)rect
+- (NSRect)_convertToUserSpace:(NSRect)rect
{
return toUserSpace(rect, [self window]);
}
diff --git a/WebKit2/UIProcess/API/mac/WKViewInternal.h b/WebKit2/UIProcess/API/mac/WKViewInternal.h
index e0c7049..95ceab7 100644
--- a/WebKit2/UIProcess/API/mac/WKViewInternal.h
+++ b/WebKit2/UIProcess/API/mac/WKViewInternal.h
@@ -33,8 +33,8 @@
- (void)_setCursor:(NSCursor *)cursor;
- (void)_setUserInterfaceItemState:(NSString *)commandName enabled:(BOOL)isEnabled state:(int)newState;
-- (NSRect)_transformToDeviceSpace:(NSRect)rect;
-- (NSRect)_transformToUserSpace:(NSRect)rect;
+- (NSRect)_convertToDeviceSpace:(NSRect)rect;
+- (NSRect)_convertToUserSpace:(NSRect)rect;
#if USE(ACCELERATED_COMPOSITING)
- (void)_startAcceleratedCompositing:(CALayer *)rootLayer;
diff --git a/WebKit2/UIProcess/API/qt/qwkpage.cpp b/WebKit2/UIProcess/API/qt/qwkpage.cpp
index 79b1a9c..b54d628 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.cpp
+++ b/WebKit2/UIProcess/API/qt/qwkpage.cpp
@@ -98,12 +98,12 @@ void QWKPagePrivate::clearAllEditCommands()
{
}
-FloatRect QWKPagePrivate::transformToDeviceSpace(const FloatRect& rect)
+FloatRect QWKPagePrivate::convertToDeviceSpace(const FloatRect& rect)
{
return rect;
}
-FloatRect QWKPagePrivate::transformToUserSpace(const FloatRect& rect)
+FloatRect QWKPagePrivate::convertToUserSpace(const FloatRect& rect)
{
return rect;
}
diff --git a/WebKit2/UIProcess/API/qt/qwkpage_p.h b/WebKit2/UIProcess/API/qt/qwkpage_p.h
index af7ede6..4299052 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage_p.h
+++ b/WebKit2/UIProcess/API/qt/qwkpage_p.h
@@ -56,8 +56,8 @@ public:
virtual void toolTipChanged(const WTF::String&, const WTF::String&);
virtual void registerEditCommand(PassRefPtr<WebKit::WebEditCommandProxy>, WebKit::WebPageProxy::UndoOrRedo);
virtual void clearAllEditCommands();
- virtual WebCore::FloatRect transformToDeviceSpace(const WebCore::FloatRect&);
- virtual WebCore::FloatRect transformToUserSpace(const WebCore::FloatRect&);
+ virtual WebCore::FloatRect convertToDeviceSpace(const WebCore::FloatRect&);
+ virtual WebCore::FloatRect convertToUserSpace(const WebCore::FloatRect&);
void paint(QPainter* painter, QRect);
diff --git a/WebKit2/UIProcess/PageClient.h b/WebKit2/UIProcess/PageClient.h
index 3c0134f..e880a93 100644
--- a/WebKit2/UIProcess/PageClient.h
+++ b/WebKit2/UIProcess/PageClient.h
@@ -55,8 +55,8 @@ public:
virtual void clearAllEditCommands() = 0;
virtual void setEditCommandState(const String& commandName, bool isEnabled, int state) = 0;
- virtual WebCore::FloatRect transformToDeviceSpace(const WebCore::FloatRect&) = 0;
- virtual WebCore::FloatRect transformToUserSpace(const WebCore::FloatRect&) = 0;
+ virtual WebCore::FloatRect convertToDeviceSpace(const WebCore::FloatRect&) = 0;
+ virtual WebCore::FloatRect convertToUserSpace(const WebCore::FloatRect&) = 0;
#if USE(ACCELERATED_COMPOSITING)
virtual void pageDidEnterAcceleratedCompositing() = 0;
diff --git a/WebKit2/UIProcess/WebPageProxy.cpp b/WebKit2/UIProcess/WebPageProxy.cpp
index b2d78fb..2a14fc1 100644
--- a/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/WebKit2/UIProcess/WebPageProxy.cpp
@@ -868,12 +868,12 @@ void WebPageProxy::contentsSizeChanged(uint64_t frameID, const WebCore::IntSize&
void WebPageProxy::setWindowFrame(const FloatRect& newWindowFrame)
{
- m_uiClient.setWindowFrame(this, m_pageClient->transformToDeviceSpace(newWindowFrame));
+ m_uiClient.setWindowFrame(this, m_pageClient->convertToDeviceSpace(newWindowFrame));
}
void WebPageProxy::getWindowFrame(FloatRect& newWindowFrame)
{
- newWindowFrame = m_pageClient->transformToUserSpace(m_uiClient.windowFrame(this));
+ newWindowFrame = m_pageClient->convertToUserSpace(m_uiClient.windowFrame(this));
}
void WebPageProxy::canRunBeforeUnloadConfirmPanel(bool& canRun)
diff --git a/WebKit2/UIProcess/win/WebView.cpp b/WebKit2/UIProcess/win/WebView.cpp
index a1096f1..3aff3b2 100644
--- a/WebKit2/UIProcess/win/WebView.cpp
+++ b/WebKit2/UIProcess/win/WebView.cpp
@@ -589,12 +589,12 @@ void WebView::setEditCommandState(const String&, bool, int)
{
}
-FloatRect WebView::transformToDeviceSpace(const FloatRect& rect)
+FloatRect WebView::convertToDeviceSpace(const FloatRect& rect)
{
return rect;
}
-FloatRect WebView::transformToUserSpace(const FloatRect& rect)
+FloatRect WebView::convertToUserSpace(const FloatRect& rect)
{
return rect;
}
diff --git a/WebKit2/UIProcess/win/WebView.h b/WebKit2/UIProcess/win/WebView.h
index 66deccf..efd53a7 100644
--- a/WebKit2/UIProcess/win/WebView.h
+++ b/WebKit2/UIProcess/win/WebView.h
@@ -99,8 +99,8 @@ private:
virtual void registerEditCommand(PassRefPtr<WebEditCommandProxy>, WebPageProxy::UndoOrRedo);
virtual void clearAllEditCommands();
virtual void setEditCommandState(const WTF::String&, bool, int);
- virtual WebCore::FloatRect transformToDeviceSpace(const WebCore::FloatRect&);
- virtual WebCore::FloatRect transformToUserSpace(const WebCore::FloatRect&);
+ virtual WebCore::FloatRect convertToDeviceSpace(const WebCore::FloatRect&);
+ virtual WebCore::FloatRect convertToUserSpace(const WebCore::FloatRect&);
#if USE(ACCELERATED_COMPOSITING)
virtual void pageDidEnterAcceleratedCompositing();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list