[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
dumi at chromium.org
dumi at chromium.org
Wed Dec 22 12:41:12 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit c123b614f79650d1181a86063a909b3fc5f8fce9
Author: dumi at chromium.org <dumi at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Aug 27 04:27:40 2010 +0000
Unreviewed, Chromium build fix.
* src/WebFrameImpl.cpp:
(WebKit::WebFrameImpl::markerTextForListItem):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66180 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 1ad5160..3bc93dd 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,5 +1,12 @@
2010-08-26 Dumitru Daniliuc <dumi at chromium.org>
+ Unreviewed, Chromium build fix.
+
+ * src/WebFrameImpl.cpp:
+ (WebKit::WebFrameImpl::markerTextForListItem):
+
+2010-08-26 Dumitru Daniliuc <dumi at chromium.org>
+
Reviewed by Darin Fisher.
Add support for markerTextForListItem() to Chromium's LayoutTestController.
diff --git a/WebKit/chromium/src/WebFrameImpl.cpp b/WebKit/chromium/src/WebFrameImpl.cpp
index 8c70d73..4af7aa2 100644
--- a/WebKit/chromium/src/WebFrameImpl.cpp
+++ b/WebKit/chromium/src/WebFrameImpl.cpp
@@ -1692,7 +1692,7 @@ WebString WebFrameImpl::counterValueForElementById(const WebString& id) const
WebString WebFrameImpl::markerTextForListItem(const WebElement& webElement) const
{
- return WebCore::markerTextForListItem(webElement.unwrap<Element>());
+ return WebCore::markerTextForListItem(const_cast<Element*>(webElement.constUnwrap<Element>()));
}
int WebFrameImpl::pageNumberForElementById(const WebString& id,
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list