[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
tony at chromium.org
tony at chromium.org
Wed Dec 22 13:44:38 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 081bf7488c80f2e448d51b88bf3eb12f56f8368c
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Sep 24 18:38:00 2010 +0000
2010-09-24 Tony Chang <tony at chromium.org>
Unreviewed, fix chromium compile after r68276 which renamed
Render*::minPrefWidth to minPreferredLogicalWidth.
* src/WebFrameImpl.cpp:
(WebKit::WebFrameImpl::contentsPreferredWidth):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68279 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index c8bed2e..416ca31 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-24 Tony Chang <tony at chromium.org>
+
+ Unreviewed, fix chromium compile after r68276 which renamed
+ Render*::minPrefWidth to minPreferredLogicalWidth.
+
+ * src/WebFrameImpl.cpp:
+ (WebKit::WebFrameImpl::contentsPreferredWidth):
+
2010-09-24 Eric Uhrhane <ericu at chromium.org>
Reviewed by David Levin.
diff --git a/WebKit/chromium/src/WebFrameImpl.cpp b/WebKit/chromium/src/WebFrameImpl.cpp
index c8aa1a7..d8f559e 100644
--- a/WebKit/chromium/src/WebFrameImpl.cpp
+++ b/WebKit/chromium/src/WebFrameImpl.cpp
@@ -553,7 +553,7 @@ WebSize WebFrameImpl::contentsSize() const
int WebFrameImpl::contentsPreferredWidth() const
{
if (m_frame->document() && m_frame->document()->renderView())
- return m_frame->document()->renderView()->minPrefWidth();
+ return m_frame->document()->renderView()->minPreferredLogicalWidth();
return 0;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list