Title: [208034] releases/WebKitGTK/webkit-2.14/Source/WebCore
- Revision
- 208034
- Author
- carlo...@webkit.org
- Date
- 2016-10-27 22:53:08 -0700 (Thu, 27 Oct 2016)
Log Message
Merge r205894 - Remove a .rej file.
* animation/DocumentTimeline.h.rej: Removed.
Modified Paths
Removed Paths
Diff
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (208033 => 208034)
--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-10-28 05:34:34 UTC (rev 208033)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-10-28 05:53:08 UTC (rev 208034)
@@ -1,3 +1,9 @@
+2016-09-13 Dean Jackson <d...@apple.com>
+
+ Remove a .rej file.
+
+ * animation/DocumentTimeline.h.rej: Removed.
+
2016-10-25 Daniel Bates <daba...@apple.com>
REGRESSION (r178265): XSS Auditor fails to block document.write() of incomplete tag
Deleted: releases/WebKitGTK/webkit-2.14/Source/WebCore/animation/DocumentTimeline.h.rej (208033 => 208034)
--- releases/WebKitGTK/webkit-2.14/Source/WebCore/animation/DocumentTimeline.h.rej 2016-10-28 05:34:34 UTC (rev 208033)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/animation/DocumentTimeline.h.rej 2016-10-28 05:53:08 UTC (rev 208034)
@@ -1,36 +0,0 @@
-diff a/Source/WebCore/animation/DocumentTimeline.h b/Source/WebCore/animation/DocumentTimeline.h (rejected hunks)
-@@ -26,24 +26,30 @@
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
--#ifndef DocumentTimeline_h
--#define DocumentTimeline_h
-+#pragma once
-
- #if ENABLE(WEB_ANIMATIONS)
-
- #include "AnimationTimeline.h"
-+#include <wtf/WeakPtr.h>
-
- namespace WebCore {
-
-+class Document;
-+
- class DocumentTimeline final : public AnimationTimeline {
- public:
-- static Ref<DocumentTimeline> create(double);
-+ static Ref<DocumentTimeline> create(Document&, double);
- ~DocumentTimeline();
-
-+ void attach(WebAnimation&);
-+ void detach(WebAnimation&);
-+
- protected:
-- DocumentTimeline(double);
-+ DocumentTimeline(Document&, double);
-
- private:
-+ WeakPtr<Document> m_document;
- double m_originTime;
- };
-
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
