Build fixes.
* WebCore.vcproj/WebCore/WebCore.vcproj: Fix malformed XML.
* platform/ResourceLoader.h: Store whether a particular job
has received a response within the ResourceLoader object itself, since
it's possible that we will enter the InternetReadFileExA while loop
twice for the same job.
* platform/ResourceLoaderInternal.h: Add private instance variable to
store whether we've received a response.
(WebCore::ResourceLoaderInternal::ResourceLoaderInternal):
* platform/win/GraphicsContextWin.cpp: Fix order of preprocessor
directives.
* platform/win/ResourceLoaderWin.cpp:
(WebCore::ResourceLoader::onRequestComplete): Ask the ResourceLoader
whether it has received a response instead of assuming it hasn't.
(WebCore::ResourceLoader::setHasReceivedResponse): Added.
(WebCore::ResourceLoader::hasReceivedResponse): Added.
* platform/win/TemporaryLinkStubs.cpp: Rename setKnobProportion to
setProportion
(ScrollBar::setProportion):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16566
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2006-09-25 Adam Roben <aroben@apple.com>
+
+ Reviewed by Brady.
+
+ Build fixes.
+
+ * WebCore.vcproj/WebCore/WebCore.vcproj: Fix malformed XML.
+ * platform/ResourceLoader.h: Store whether a particular job
+ has received a response within the ResourceLoader object itself, since
+ it's possible that we will enter the InternetReadFileExA while loop
+ twice for the same job.
+ * platform/ResourceLoaderInternal.h: Add private instance variable to
+ store whether we've received a response.
+ (WebCore::ResourceLoaderInternal::ResourceLoaderInternal):
+ * platform/win/GraphicsContextWin.cpp: Fix order of preprocessor
+ directives.
+ * platform/win/ResourceLoaderWin.cpp:
+ (WebCore::ResourceLoader::onRequestComplete): Ask the ResourceLoader
+ whether it has received a response instead of assuming it hasn't.
+ (WebCore::ResourceLoader::setHasReceivedResponse): Added.
+ (WebCore::ResourceLoader::hasReceivedResponse): Added.
+ * platform/win/TemporaryLinkStubs.cpp: Rename setKnobProportion to
+ setProportion
+ (ScrollBar::setProportion):
+
2006-09-25 Brady Eidson <beidson@apple.com>
Requested by ggaren
</File>
<File
RelativePath="..\..\platform\win\GraphicsContextWin.cpp"
+ >
</File>
<File
RelativePath="..\..\platform\win\ImageWin.cpp"
#endif
#if USE(WININET)
+ void setHasReceivedResponse(bool b = true);
+ bool hasReceivedResponse() const;
void fileLoadTimer(Timer<ResourceLoader>* timer);
void onHandleCreated(LPARAM);
void onRequestRedirected(LPARAM);
, m_formDataString(0)
, m_formDataLength(0)
, m_bytesRemainingToWrite(0)
+ , m_hasReceivedResponse(false)
#endif
#if PLATFORM(GDK)
, m_handle(0)
, m_formDataString(0)
, m_formDataLength(0)
, m_bytesRemainingToWrite(0)
+ , m_hasReceivedResponse(false)
#endif
#if PLATFORM(GDK)
, m_handle(0)
int m_formDataLength;
int m_bytesRemainingToWrite;
String m_postReferrer;
+ bool m_hasReceivedResponse;
#endif
#if PLATFORM(GDK)
CURL *m_handle;
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if PLATFORM(CAIRO)
-
#include "config.h"
#include "GraphicsContext.h"
+
+#if PLATFORM(CAIRO)
+
#include <cairo-win32.h>
namespace WebCore
bool receivedAnyData = false;
while ((ok = InternetReadFileExA(handle, &buffers, IRF_NO_WAIT, (DWORD_PTR)this)) && buffers.dwBufferLength) {
- if (!receivedAnyData) {
- receivedAnyData = true;
+ if (!hasReceivedResponse()) {
+ setHasReceivedResponse();
client()->receivedResponse(this, 0);
}
client()->receivedData(this, buffer, buffers.dwBufferLength);
setError(1);
}
+void ResourceLoader::setHasReceivedResponse(bool b)
+{
+ d->m_hasReceivedResponse = b;
+}
+
+bool ResourceLoader::hasReceivedResponse() const
+{
+ return d->m_hasReceivedResponse;
+}
+
} // namespace WebCore
void ScrollBar::setSteps(int, int) { }
bool ScrollBar::scroll(ScrollDirection, ScrollGranularity, float) { return false; }
bool ScrollBar::setValue(int) { return false; }
-void ScrollBar::setKnobProportion(int, int) { }
+void ScrollBar::setProportion(int, int) { }
ListBox::ListBox() { }
ListBox::~ListBox() { }