Changeset 24395 in webkit

Timestamp:

Jul 17, 2007 7:39:03 PM (17 years ago)

Author:

beidson

Message:

WebCore: 2007-07-17 Brady Eidson <​beidson@apple.com>

Reviewed by Steve

Required for <rdar://problem/4516185> - FTP Directory Listings

• WebCore.vcproj/WebCore.vcproj: Added SharedBufferWin

• platform/SharedBuffer.cpp: Windows doesn't get the default empty resource anymore
• platform/win/SharedBufferWin.cpp: Added. (WebCore::SharedBuffer::createWithContentsOfFile):

WebKit/win: 2007-07-17 Brady Eidson <​beidson@apple.com>

Reviewed by Steve

<rdar://problem/4516185> - FTP Directory Listings

• Interfaces/IWebUIDelegate.idl: Add IWebUIDelegate2 method for getting the path to the template

• WebView.cpp: (WebView::initWithFrame): Set the preference for the template path in WebCore when the first WebView is initialized

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.vcproj/WebCore.vcproj (modified) (1 diff)
• WebCore/platform/SharedBuffer.cpp (modified) (2 diffs)
• WebCore/platform/win/SharedBufferWin.cpp (added)
• WebKit/win/ChangeLog (modified) (1 diff)
• WebKit/win/Interfaces/IWebUIDelegate.idl (modified) (1 diff)
• WebKit/win/WebView.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-07-17  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Steve
+
+        Required for <rdar://problem/4516185> - FTP Directory Listings
+
+        * WebCore.vcproj/WebCore.vcproj: Added SharedBufferWin
+        
+        * platform/SharedBuffer.cpp: Windows doesn't get the default empty resource anymore
+        * platform/win/SharedBufferWin.cpp: Added.
+        (WebCore::SharedBuffer::createWithContentsOfFile):
+
 2007-07-17  Brady Eidson  <beidson@apple.com>
 

trunk/WebCore/WebCore.vcproj/WebCore.vcproj

@@ -3553 +3553 @@
                                         >
                                 </File>
-                                <File
+                <File
+                                        RelativePath="..\platform\win\SharedBufferWin.cpp"
+                                        >
+                </File>
+                <File
                                         RelativePath="..\platform\win\SharedTimerWin.cpp"
                                         >

trunk/WebCore/platform/SharedBuffer.cpp

@@ -69 +69 @@
 
 #if !PLATFORM(MAC)
+
 inline void SharedBuffer::clearPlatformData()
 {
@@ -96 +97 @@
 }
 
+#endif
+
+#if !PLATFORM(MAC) && !PLATFORM(WIN)
+
 PassRefPtr<SharedBuffer> SharedBuffer::createWithContentsOfFile(const String& filePath)
 {

trunk/WebKit/win/ChangeLog

@@ +1 @@
+2007-07-17  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Steve
+        
+        <rdar://problem/4516185> - FTP Directory Listings
+
+        * Interfaces/IWebUIDelegate.idl: Add IWebUIDelegate2 method for getting the path to the template
+        
+        * WebView.cpp:
+          (WebView::initWithFrame): Set the preference for the template path in WebCore when the first
+          WebView is initialized
+
 2007-07-17  Ada Chan  <adachan@apple.com>
 

trunk/WebKit/win/Interfaces/IWebUIDelegate.idl

@@ -727 +727 @@
     HRESULT printFrame([in] IWebView* webView, [in] IWebFrame* frame);
 
+/*!
+    @method webView:ftpDirectoryTemplatePath
+    @abstract Returns the path to the FTP directory listing template document
+    @param webView The WebView sending the delegate method
+    @param path The path to the template document
+    @discussion This method is called when an FTP directory listing is viewed in a webView.  
+    In practice, all WebViews show the same template document data that was loaded for the very
+    first WebView that displayed a directory listing, so this will only be called once.
+*/
+    HRESULT ftpDirectoryTemplatePath([in] IWebView* webView, [out, retval] BSTR* path);
 }

trunk/WebKit/win/WebView.cpp

@@ -1770 +1770 @@
     m_page->settings()->setUsesPageCache(false);
 
+    // Try to set the FTP Directory template path in WebCore when the first WebView is initialized
+    static bool setFTPDirectoryTemplatePathOnce = false;
+
+    if (!setFTPDirectoryTemplatePathOnce && m_uiDelegate) {
+        COMPtr<IWebUIDelegate2> uiDelegate2;
+        if (SUCCEEDED(m_uiDelegate->QueryInterface(IID_IWebUIDelegate2, (void**)&uiDelegate2))) {
+            BString path;        
+            if (SUCCEEDED(uiDelegate2->ftpDirectoryTemplatePath(this, &path))) {
+                m_page->settings()->setFTPDirectoryTemplatePath(String(path, SysStringLen(path)));
+                SysFreeString(path);
+                setFTPDirectoryTemplatePathOnce = true;
+            }
+        }
+    }
+
     WebFrame* webFrame = WebFrame::createInstance();
     webFrame->initWithWebFrameView(0 /*FIXME*/, this, m_page, 0);