Changeset 224900 in webkit

Timestamp:

Nov 15, 2017 2:07:10 PM (6 years ago)

Author:

achristensen@apple.com

Message:

Revert r224885
​https://bugs.webkit.org/show_bug.cgi?id=179719

• UIProcess/API/APIContentRuleListStore.cpp:

(API::compiledToFile):
r224885 was a speculative fix that did not fix anything on the bots.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/APIContentRuleListStore.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-11-15  Alex Christensen  <achristensen@webkit.org>
+
+        Revert r224885
+        https://bugs.webkit.org/show_bug.cgi?id=179719
+
+        * UIProcess/API/APIContentRuleListStore.cpp:
+        (API::compiledToFile):
+        r224885 was a speculative fix that did not fix anything on the bots.
+
 2017-11-15  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebKit/UIProcess/API/APIContentRuleListStore.cpp

@@ -351 +351 @@
     }
 
-    if (!moveFile(temporaryFilePath, finalFilePath)) {
-        WTFLogAlways("Content Rule List compiling failed: Moving file failed.");
-        return ContentRuleListStore::Error::CompileFailed;
-    }
-
     mappedData = adoptAndMapFile(temporaryFileHandle, 0, metaData.fileSize());
     if (mappedData.isNull()) {
         WTFLogAlways("Content Rule List compiling failed: Mapping file failed.");
-        deleteFile(finalFilePath);
+        return ContentRuleListStore::Error::CompileFailed;
+    }
+
+    if (!moveFile(temporaryFilePath, finalFilePath)) {
+        WTFLogAlways("Content Rule List compiling failed: Moving file failed.");
         return ContentRuleListStore::Error::CompileFailed;
     }