Modified: trunk/Tools/ChangeLog (202033 => 202034)
--- trunk/Tools/ChangeLog 2016-06-14 06:57:15 UTC (rev 202033)
+++ trunk/Tools/ChangeLog 2016-06-14 07:10:20 UTC (rev 202034)
@@ -1,3 +1,16 @@
+2016-06-14 David Kilzer <[email protected]>
+
+ Modernize DumpRenderTreeMac.h
+ <https://webkit.org/b/158721>
+
+ Reviewed by Andy Estes.
+
+ * DumpRenderTree/mac/DumpRenderTreeMac.h:
+ - Update copyright.
+ - Update license.
+ - Use #pragma once.
+ - Use OBJC_CLASS macro.
+
2016-06-13 David Kilzer <[email protected]>
False-positive over-release of WebView in destroyWebViewAndOffscreenWindow() in DumpRenderTree.mm
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTreeMac.h (202033 => 202034)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTreeMac.h 2016-06-14 06:57:15 UTC (rev 202033)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTreeMac.h 2016-06-14 07:10:20 UTC (rev 202034)
@@ -1,60 +1,44 @@
/*
- * Copyright (C) 2007 Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2016 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
+ * notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
+ * documentation and/or other materials provided with the distribution.
*
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef DumpRenderTreeMac_h
-#define DumpRenderTreeMac_h
+#pragma once
#include <CoreFoundation/CoreFoundation.h>
+
#if PLATFORM(IOS) && defined(__OBJC__)
#import <UIKit/UIKit.h>
#endif
+OBJC_CLASS DefaultPolicyDelegate;
+OBJC_CLASS DumpRenderTreeDraggingInfo;
+OBJC_CLASS NavigationController;
+OBJC_CLASS PolicyDelegate;
+OBJC_CLASS StorageTrackerDelegate;
+OBJC_CLASS WebFrame;
+OBJC_CLASS WebScriptWorld;
+OBJC_CLASS WebView;
-#ifdef __OBJC__
-@class DefaultPolicyDelegate;
-@class DumpRenderTreeDraggingInfo;
-@class NavigationController;
-@class PolicyDelegate;
-@class StorageTrackerDelegate;
-@class WebFrame;
-@class WebScriptWorld;
-@class WebView;
-#else
-class DefaultPolicyDelegate;
-class DumpRenderTreeDraggingInfo;
-class NavigationController;
-class PolicyDelegate;
-class StorageTrackerDelegate;
-class WebFrame;
-class WebScriptWorld;
-class WebView;
-#endif
-
extern CFMutableArrayRef openWindowsRef;
extern CFMutableSetRef disallowedURLs;
extern WebFrame* mainFrame;
@@ -90,5 +74,3 @@
#endif
int DumpRenderTreeMain(int, const char *[]);
-
-#endif // DumpRenderTreeMac_h
