Title: [143250] tags/Safari-537.31.3/Source/WebKit2
- Revision
- 143250
- Author
- lforsch...@apple.com
- Date
- 2013-02-18 12:08:40 -0800 (Mon, 18 Feb 2013)
Log Message
Merged r142836. <rdar://problem/13211893>
Modified Paths
Diff
Modified: tags/Safari-537.31.3/Source/WebKit2/ChangeLog (143249 => 143250)
--- tags/Safari-537.31.3/Source/WebKit2/ChangeLog 2013-02-18 20:05:48 UTC (rev 143249)
+++ tags/Safari-537.31.3/Source/WebKit2/ChangeLog 2013-02-18 20:08:40 UTC (rev 143250)
@@ -1,3 +1,18 @@
+2013-02-18 Lucas Forschler <lforsch...@apple.com>
+
+ Merge r142836
+
+ 2013-02-13 Dean Jackson <d...@apple.com>
+
+ PlugIn Autostart should expire in 30 days, not half a day
+ https://bugs.webkit.org/show_bug.cgi?id=109767
+
+ Reviewed by Brian Weinstein.
+
+ We forgot to multiply by 60 seconds in a minute.
+
+ * UIProcess/Plugins/PlugInAutoStartProvider.cpp:
+
2013-02-14 Lucas Forschler <lforsch...@apple.com>
Merge r142900
Modified: tags/Safari-537.31.3/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.cpp (143249 => 143250)
--- tags/Safari-537.31.3/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.cpp 2013-02-18 20:05:48 UTC (rev 143249)
+++ tags/Safari-537.31.3/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.cpp 2013-02-18 20:08:40 UTC (rev 143250)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2012, 2013 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,7 +32,7 @@
using namespace WebCore;
-static const double plugInAutoStartExpirationTimeThreshold = 30 * 24 * 60;
+static const double plugInAutoStartExpirationTimeThreshold = 30 * 24 * 60 * 60;
namespace WebKit {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
