Title: [264580] trunk/Tools
Revision
264580
Author
[email protected]
Date
2020-07-19 12:05:53 -0700 (Sun, 19 Jul 2020)

Log Message

Fix -Wdeprecated-declarations under Tools
https://bugs.webkit.org/show_bug.cgi?id=214534

Patch by Michael Catanzaro <[email protected]> on 2020-07-19
Reviewed by Darin Adler.

* TestWebKitAPI/Tests/WebKit/ReloadPageAfterCrash.cpp:
(TestWebKitAPI::didCrashCheckFrames):
* TestWebKitAPI/Tests/WebKit/WKPreferences.cpp:
(TestWebKitAPI::TEST):
* WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
(WTR::InjectedBundle::didCreatePage):
* WebKitTestRunner/InjectedBundle/TestRunner.cpp:

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (264579 => 264580)


--- trunk/Tools/ChangeLog	2020-07-19 18:45:07 UTC (rev 264579)
+++ trunk/Tools/ChangeLog	2020-07-19 19:05:53 UTC (rev 264580)
@@ -1,5 +1,20 @@
 2020-07-19  Michael Catanzaro  <[email protected]>
 
+        Fix -Wdeprecated-declarations under Tools
+        https://bugs.webkit.org/show_bug.cgi?id=214534
+
+        Reviewed by Darin Adler.
+
+        * TestWebKitAPI/Tests/WebKit/ReloadPageAfterCrash.cpp:
+        (TestWebKitAPI::didCrashCheckFrames):
+        * TestWebKitAPI/Tests/WebKit/WKPreferences.cpp:
+        (TestWebKitAPI::TEST):
+        * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
+        (WTR::InjectedBundle::didCreatePage):
+        * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+
+2020-07-19  Michael Catanzaro  <[email protected]>
+
         pep8.py:110: FutureWarning: Possible nested set at position 1
         https://bugs.webkit.org/show_bug.cgi?id=214531
 

Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/ReloadPageAfterCrash.cpp (264579 => 264580)


--- trunk/Tools/TestWebKitAPI/Tests/WebKit/ReloadPageAfterCrash.cpp	2020-07-19 18:45:07 UTC (rev 264579)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/ReloadPageAfterCrash.cpp	2020-07-19 19:05:53 UTC (rev 264580)
@@ -104,7 +104,9 @@
 
     EXPECT_TRUE(!WKPageGetMainFrame(page));
     EXPECT_TRUE(!WKPageGetFocusedFrame(page));
+    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     EXPECT_TRUE(!WKPageGetFrameSetLargestFrame(page));
+    ALLOW_DEPRECATED_DECLARATIONS_END
 
     calledCrashHandler = true;
 }

Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPreferences.cpp (264579 => 264580)


--- trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPreferences.cpp	2020-07-19 18:45:07 UTC (rev 264579)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPreferences.cpp	2020-07-19 19:05:53 UTC (rev 264580)
@@ -90,7 +90,9 @@
     EXPECT_WK_STREQ(expectedFantasyFontFamily, adoptWK(WKPreferencesCopyFantasyFontFamily(preference)));
     EXPECT_WK_STREQ(expectedPictographFontFamily, adoptWK(WKPreferencesCopyPictographFontFamily(preference)));
     EXPECT_EQ(0u, WKPreferencesGetMinimumFontSize(preference));
+    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     EXPECT_FALSE(WKPreferencesGetPrivateBrowsingEnabled(preference));
+    ALLOW_DEPRECATED_DECLARATIONS_END
     EXPECT_FALSE(WKPreferencesGetDeveloperExtrasEnabled(preference));
     EXPECT_TRUE(WKPreferencesGetTextAreasAreResizable(preference));
 

Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp (264579 => 264580)


--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp	2020-07-19 18:45:07 UTC (rev 264579)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp	2020-07-19 19:05:53 UTC (rev 264580)
@@ -120,7 +120,9 @@
 
     WKRetainPtr<WKStringRef> messsageName = adoptWK(WKStringCreateWithUTF8CString("Initialization"));
     WKTypeRef result = nullptr;
+    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     WKBundlePostSynchronousMessage(m_bundle, messsageName.get(), nullptr, &result);
+    ALLOW_DEPRECATED_DECLARATIONS_END
     ASSERT(WKGetTypeID(result) == WKDictionaryGetTypeID());
     WKRetainPtr<WKDictionaryRef> initializationDictionary = adoptWK(static_cast<WKDictionaryRef>(result));
 

Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (264579 => 264580)


--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp	2020-07-19 18:45:07 UTC (rev 264579)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp	2020-07-19 19:05:53 UTC (rev 264580)
@@ -61,6 +61,8 @@
 
 namespace WTR {
 
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
+
 Ref<TestRunner> TestRunner::create()
 {
     return adoptRef(*new TestRunner);
@@ -3049,4 +3051,6 @@
     callTestRunnerCallback(DidSetAppBoundDomainsCallbackID);
 }
 
+ALLOW_DEPRECATED_DECLARATIONS_END
+
 } // namespace WTR
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to