Title: [224900] trunk/Source/WebKit
- Revision
- 224900
- Author
- achristen...@apple.com
- Date
- 2017-11-15 14:07:10 -0800 (Wed, 15 Nov 2017)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (224899 => 224900)
--- trunk/Source/WebKit/ChangeLog 2017-11-15 21:50:04 UTC (rev 224899)
+++ trunk/Source/WebKit/ChangeLog 2017-11-15 22:07:10 UTC (rev 224900)
@@ -1,3 +1,12 @@
+2017-11-15 Alex Christensen <achristen...@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 <bfulg...@apple.com>
Unreviewed build fix after r224830.
Modified: trunk/Source/WebKit/UIProcess/API/APIContentRuleListStore.cpp (224899 => 224900)
--- trunk/Source/WebKit/UIProcess/API/APIContentRuleListStore.cpp 2017-11-15 21:50:04 UTC (rev 224899)
+++ trunk/Source/WebKit/UIProcess/API/APIContentRuleListStore.cpp 2017-11-15 22:07:10 UTC (rev 224900)
@@ -350,18 +350,17 @@
return ContentRuleListStore::Error::CompileFailed;
}
- 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;
+ }
+
return { };
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
