Changeset 65835 in webkit

Timestamp:

Aug 23, 2010 3:12:03 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-08-23 Patrick Gansterer <​paroga@paroga.com>

Reviewed by Adam Roben.

Move filehandling into fileLoadTimer callback
​https://bugs.webkit.org/show_bug.cgi?id=43714

Also add mimetype detection for local files.

• platform/network/ResourceHandleInternal.h: (WebCore::ResourceHandleInternal::ResourceHandleInternal):
• platform/network/win/ResourceHandleWin.cpp: (WebCore::ResourceHandle::start): (WebCore::ResourceHandle::fileLoadTimer):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/ResourceHandleInternal.h (modified) (2 diffs)
• platform/network/win/ResourceHandleWin.cpp (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-23  Patrick Gansterer  <paroga@paroga.com>
+
+        Reviewed by Adam Roben.
+
+        Move filehandling into fileLoadTimer callback
+        https://bugs.webkit.org/show_bug.cgi?id=43714
+
+        Also add mimetype detection for local files.
+
+        * platform/network/ResourceHandleInternal.h:
+        (WebCore::ResourceHandleInternal::ResourceHandleInternal):
+        * platform/network/win/ResourceHandleWin.cpp:
+        (WebCore::ResourceHandle::start):
+        (WebCore::ResourceHandle::fileLoadTimer):
+
 2010-08-23  Iain Merrick  <husky@google.com>
 

trunk/WebCore/platform/network/ResourceHandleInternal.h

@@ -93 +93 @@
 #endif
 #if USE(WININET)
-            , m_fileHandle(INVALID_HANDLE_VALUE)
             , m_fileLoadTimer(loader, &ResourceHandle::fileLoadTimer)
             , m_resourceHandle(0)
@@ -171 +170 @@
 #endif
 #if USE(WININET)
-        HANDLE m_fileHandle;
         Timer<ResourceHandle> m_fileLoadTimer;
         HINTERNET m_resourceHandle;

trunk/WebCore/platform/network/win/ResourceHandleWin.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2004, 2006 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -334 +335 @@
     ref();
     if (request().url().isLocalFile()) {
-        String path = request().url().path();
-        // windows does not enjoy a leading slash on paths
-        if (path[0] == '/')
-            path = path.substring(1);
-        // FIXME: This is wrong. Need to use wide version of this call.
-        d->m_fileHandle = CreateFileA(path.utf8().data(), GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-
-        // FIXME: perhaps this error should be reported asynchronously for
-        // consistency.
-        if (d->m_fileHandle == INVALID_HANDLE_VALUE) {
-            delete this;
-            return false;
-        }
-
         d->m_fileLoadTimer.startOneShot(0.0);
         return true;
@@ -410 +397 @@
 }
 
-void ResourceHandle::fileLoadTimer(Timer<ResourceHandle>* timer)
-{
+void ResourceHandle::fileLoadTimer(Timer<ResourceHandle>*)
+{
+    RefPtr<ResourceHandle> protector(this);
+    deref(); // balances ref in start
+
+    String fileName = firstRequest().url().fileSystemPath();
+    HANDLE fileHandle = CreateFileW(fileName.charactersWithNullTermination(), GENERIC_READ, 0, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
+
+    if (fileHandle == INVALID_HANDLE_VALUE) {
+        client()->didFail(this, ResourceError());
+        return;
+    }
+
     ResourceResponse response;
+
+    int dotPos = fileName.reverseFind('.');
+    int slashPos = fileName.reverseFind('/');
+
+    if (slashPos < dotPos && dotPos != -1) {
+        String ext = fileName.substring(dotPos + 1);
+        response.setMimeType(MIMETypeRegistry::getMIMETypeForExtension(ext));
+    }
+
     client()->didReceiveResponse(this, response);
 
@@ -421 +428 @@
         const int bufferSize = 8192;
         char buffer[bufferSize];
-        result = ReadFile(d->m_fileHandle, &buffer, bufferSize, &bytesRead, NULL); 
+        result = ReadFile(fileHandle, &buffer, bufferSize, &bytesRead, 0);
         if (result && bytesRead)
             client()->didReceiveData(this, buffer, bytesRead, 0);
-        // Check for end of file. 
+        // Check for end of file.
     } while (result && bytesRead);
 
-    // FIXME: handle errors better
-
-    CloseHandle(d->m_fileHandle);
-    d->m_fileHandle = INVALID_HANDLE_VALUE;
+    CloseHandle(fileHandle);
 
     client()->didFinishLoading(this);