Changeset 24509 in webkit

Timestamp:

Jul 21, 2007 4:41:48 AM (17 years ago)

Author:

bdash

Message:

Merge r24468.

2007-07-20 Mark Rowe <​mrowe@apple.com>

Reviewed by Maciej.

Move FTPDirectoryTokenizer::m_templateDocumentData to be a function-scoped static
to avoid creating a global initializer. This fixes the build for x86_64.

• loader/FTPDirectoryDocument.cpp: (WebCore::FTPDirectoryTokenizer::loadDocumentTemplate):

Location:

tags/Safari-5522.12/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/FTPDirectoryDocument.cpp (modified) (3 diffs)

tags/Safari-5522.12/WebCore/ChangeLog

@@ +1 @@
+2007-07-20  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Maciej.
+
+        Move FTPDirectoryTokenizer::m_templateDocumentData to be a function-scoped static
+        to avoid creating a global initializer.  This fixes the build for x86_64.
+
+        * loader/FTPDirectoryDocument.cpp:
+        (WebCore::FTPDirectoryTokenizer::loadDocumentTemplate):
+
 2007-07-18  Maciej Stachowiak  <mjs@apple.com>
 

tags/Safari-5522.12/WebCore/loader/FTPDirectoryDocument.cpp

@@ -94 +94 @@
     
     ListState m_listState;
-
-    static RefPtr<SharedBuffer> m_templateDocumentData;
-    // FIXME: Instead of storing the data, we'd rather actually parse the template data into the template Document once,
-    // store that document, then "copy" it whenever we get an FTP directory listing.  There are complexities with this 
-    // approach that make it worth putting this off.
 };
-
-RefPtr<SharedBuffer> FTPDirectoryTokenizer::m_templateDocumentData;
 
 FTPDirectoryTokenizer::FTPDirectoryTokenizer(HTMLDocument* doc)
@@ -303 +296 @@
 
 bool FTPDirectoryTokenizer::loadDocumentTemplate()
-{        
-    if (!m_templateDocumentData) {
+{
+    static RefPtr<SharedBuffer> templateDocumentData;
+    // FIXME: Instead of storing the data, we'd rather actually parse the template data into the template Document once,
+    // store that document, then "copy" it whenever we get an FTP directory listing.  There are complexities with this 
+    // approach that make it worth putting this off.
+
+    if (!templateDocumentData) {
         Settings* settings = m_doc->settings();
         if (settings)
-            m_templateDocumentData = SharedBuffer::createWithContentsOfFile(settings->ftpDirectoryTemplatePath());
-        if (m_templateDocumentData)
-            LOG(FTP, "Loaded FTPDirectoryTemplate of length %i\n", m_templateDocumentData->size());
-    }
-    
-    if (!m_templateDocumentData) {
+            templateDocumentData = SharedBuffer::createWithContentsOfFile(settings->ftpDirectoryTemplatePath());
+        if (templateDocumentData)
+            LOG(FTP, "Loaded FTPDirectoryTemplate of length %i\n", templateDocumentData->size());
+    }
+    
+    if (!templateDocumentData) {
         LOG_ERROR("Could not load templateData");
         return false;
@@ -319 +317 @@
     // Tokenize the template as an HTML document synchronously
     setForceSynchronous(true);
-    HTMLTokenizer::write(String(m_templateDocumentData->data(), m_templateDocumentData->size()), true);
+    HTMLTokenizer::write(String(templateDocumentData->data(), templateDocumentData->size()), true);
     setForceSynchronous(false);