[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
beidson at apple.com
beidson at apple.com
Wed Dec 22 15:24:14 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 9d6bcaec14f6484cc69dd6973e3b3e0f1b2690cb
Author: beidson at apple.com <beidson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 2 21:02:23 2010 +0000
<rdar://problem/8346191> and https://bugs.webkit.org/show_bug.cgi?id=48868
Implement IMutableWebRequest::setTimeoutInterval
Reviewed by Anders Carlsson.
* WebMutableURLRequest.cpp:
(WebMutableURLRequest::setTimeoutInterval):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71165 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 640d51d..2a04708 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-02 Brady Eidson <beidson at apple.com>
+
+ Reviewed by Anders Carlsson.
+
+ <rdar://problem/8346191> and https://bugs.webkit.org/show_bug.cgi?id=48868
+ Implement IMutableWebRequest::setTimeoutInterval
+
+ * WebMutableURLRequest.cpp:
+ (WebMutableURLRequest::setTimeoutInterval):
+
2010-11-02 Daniel Bates <dbates at rim.com>
Reviewed by Martin Robinson.
diff --git a/WebKit/win/WebMutableURLRequest.cpp b/WebKit/win/WebMutableURLRequest.cpp
index 655b411..02829d7 100644
--- a/WebKit/win/WebMutableURLRequest.cpp
+++ b/WebKit/win/WebMutableURLRequest.cpp
@@ -320,10 +320,10 @@ HRESULT STDMETHODCALLTYPE WebMutableURLRequest::setMainDocumentURL(
}
HRESULT STDMETHODCALLTYPE WebMutableURLRequest::setTimeoutInterval(
- /* [in] */ double /*timeoutInterval*/)
+ /* [in] */ double timeoutInterval)
{
- ASSERT_NOT_REACHED();
- return E_NOTIMPL;
+ m_request.setTimeoutInterval(timeoutInterval);
+ return S_OK;
}
HRESULT STDMETHODCALLTYPE WebMutableURLRequest::setURL(
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list