WebKit Bugzilla
Attachment 357133 Details for
Bug 192627
: REGRESSION(r239103): It broke the built because it depends on another patch that didn't land yet (Requested by KaL on #webkit).
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
ROLLOUT of r239103
bug-192627-20181212082520.patch (text/plain), 13.68 KB, created by
WebKit Commit Bot
on 2018-12-12 08:25:20 PST
(
hide
)
Description:
ROLLOUT of r239103
Filename:
MIME Type:
Creator:
WebKit Commit Bot
Created:
2018-12-12 08:25:20 PST
Size:
13.68 KB
patch
obsolete
>Subversion Revision: 239104 >diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog >index 4a78961f7ba25a5e9f5d06ce9ae54a96144a825c..fc72f6b58f1d769c9f05c0533246e8fa329d114e 100644 >--- a/Source/WebKit/ChangeLog >+++ b/Source/WebKit/ChangeLog >@@ -1,3 +1,18 @@ >+2018-12-12 Commit Queue <commit-queue@webkit.org> >+ >+ Unreviewed, rolling out r239103. >+ https://bugs.webkit.org/show_bug.cgi?id=192627 >+ >+ It broke the built because it depends on another patch that >+ didn't land yet (Requested by KaL on #webkit). >+ >+ Reverted changeset: >+ >+ "[WPE] Add API to notify about frame displayed view backend >+ callback" >+ https://bugs.webkit.org/show_bug.cgi?id=192224 >+ https://trac.webkit.org/changeset/239103 >+ > 2018-12-12 Chris Dumez <cdumez@apple.com> > > Restore MESSAGE_CHECK_URL() security check on sourceURL in didPerformClientRedirect() >diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp >index f5d4fb6883b86bc2e3fa0d8578484fffa0d55ace..f6bffadcd762a805b3de1f7683ca513c6aa0ad9a 100644 >--- a/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp >+++ b/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp >@@ -71,7 +71,6 @@ > #include <WebCore/RefPtrCairo.h> > #include <WebCore/URLSoup.h> > #include <glib/gi18n-lib.h> >-#include <wtf/SetForScope.h> > #include <wtf/URL.h> > #include <wtf/glib/GRefPtr.h> > #include <wtf/glib/WTFGType.h> >@@ -198,34 +197,6 @@ typedef HashMap<uint64_t, GRefPtr<GTask> > SnapshotResultsMap; > > class PageLoadStateObserver; > >-#if PLATFORM(WPE) >-static unsigned frameDisplayCallbackID; >-struct FrameDisplayedCallback { >- FrameDisplayedCallback(WebKitFrameDisplayedCallback callback, gpointer userData = nullptr, GDestroyNotify destroyNotifyFunction = nullptr) >- : id(++frameDisplayCallbackID) >- , callback(callback) >- , userData(userData) >- , destroyNotifyFunction(destroyNotifyFunction) >- { >- } >- >- ~FrameDisplayedCallback() >- { >- if (destroyNotifyFunction) >- destroyNotifyFunction(userData); >- } >- >- FrameDisplayedCallback(FrameDisplayedCallback&&) = default; >- FrameDisplayedCallback(const FrameDisplayedCallback&) = delete; >- FrameDisplayedCallback& operator=(const FrameDisplayedCallback&) = delete; >- >- unsigned id { 0 }; >- WebKitFrameDisplayedCallback callback { nullptr }; >- gpointer userData { nullptr }; >- GDestroyNotify destroyNotifyFunction { nullptr }; >-}; >-#endif // PLATFORM(WPE) >- > struct _WebKitWebViewPrivate { > ~_WebKitWebViewPrivate() > { >@@ -237,9 +208,6 @@ struct _WebKitWebViewPrivate { > #if PLATFORM(WPE) > GRefPtr<WebKitWebViewBackend> backend; > std::unique_ptr<WKWPE::View> view; >- Vector<FrameDisplayedCallback> frameDisplayedCallbacks; >- bool inFrameDisplayed; >- HashSet<unsigned> frameDisplayedCallbacksToRemove; > #endif > > WebKitWebView* relatedView; >@@ -406,24 +374,6 @@ private: > webkitWebViewHandleDownloadRequest(m_webView, &downloadProxy); > } > >- void frameDisplayed(WKWPE::View&) override >- { >- { >- SetForScope<bool> inFrameDisplayedGuard(m_webView->priv->inFrameDisplayed, true); >- for (const auto& callback : m_webView->priv->frameDisplayedCallbacks) { >- if (!m_webView->priv->frameDisplayedCallbacksToRemove.contains(callback.id)) >- callback.callback(m_webView, callback.userData); >- } >- } >- >- while (!m_webView->priv->frameDisplayedCallbacksToRemove.isEmpty()) { >- auto id = m_webView->priv->frameDisplayedCallbacksToRemove.takeAny(); >- m_webView->priv->frameDisplayedCallbacks.removeFirstMatching([id](const auto& item) { >- return item.id == id; >- }); >- } >- } >- > WebKitWebView* m_webView; > }; > #endif >@@ -4141,55 +4091,3 @@ void webkit_web_view_restore_session_state(WebKitWebView* webView, WebKitWebView > > getPage(webView).restoreFromSessionState(webkitWebViewSessionStateGetSessionState(state), false); > } >- >-#if PLATFORM(WPE) >-/** >- * webkit_web_view_add_frame_displayed_callback: >- * @web_view: a #WebKitWebView >- * @callback: a #WebKitFrameDisplayedCallback >- * @user_data: (closure): user data to pass to @callback >- * @destroy_notify: (nullable): destroy notifier for @user_data >- * >- * Add a callback to be called when the backend notifies that a frame has been displayed in @web_view. >- * >- * Returns: an identifier that should be passed to webkit_web_view_remove_frame_displayed_callback() >- * to remove the callback. >- * >- * Since: 2.24 >- */ >-unsigned webkit_web_view_add_frame_displayed_callback(WebKitWebView* webView, WebKitFrameDisplayedCallback callback, gpointer userData, GDestroyNotify destroyNotify) >-{ >- g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), 0); >- g_return_val_if_fail(callback, 0); >- >- webView->priv->frameDisplayedCallbacks.append(FrameDisplayedCallback(callback, userData, destroyNotify)); >- return webView->priv->frameDisplayedCallbacks.last().id; >-} >- >-/** >- * webkit_web_view_remove_frame_displayed_callback: >- * @web_view: a #WebKitWebView >- * @id: an identifier >- * >- * Removes a #WebKitFrameDisplayedCallback previously added to @web_view with >- * webkit_web_view_add_frame_displayed_callback(). >- * >- * Since: 2.24 >- */ >-void webkit_web_view_remove_frame_displayed_callback(WebKitWebView* webView, unsigned id) >-{ >- g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView)); >- g_return_if_fail(id); >- >- Function<bool(const FrameDisplayedCallback&)> matchFunction = [id](const auto& item) { >- return item.id == id; >- }; >- >- if (webView->priv->inFrameDisplayed) { >- auto index = webView->priv->frameDisplayedCallbacks.findMatching(matchFunction); >- if (index != notFound) >- webView->priv->frameDisplayedCallbacksToRemove.add(id); >- } else >- webView->priv->frameDisplayedCallbacks.removeFirstMatching(matchFunction); >-} >-#endif // PLATFORM(WPE) >diff --git a/Source/WebKit/UIProcess/API/wpe/WebKitWebView.h b/Source/WebKit/UIProcess/API/wpe/WebKitWebView.h >index 4102a7526d6bdf013cbb904a52425d61d12e3cd9..2e389fd0b3cec2993eb096ecd3f73b5666efcfab 100644 >--- a/Source/WebKit/UIProcess/API/wpe/WebKitWebView.h >+++ b/Source/WebKit/UIProcess/API/wpe/WebKitWebView.h >@@ -166,18 +166,6 @@ typedef enum { > WEBKIT_WEB_PROCESS_EXCEEDED_MEMORY_LIMIT > } WebKitWebProcessTerminationReason; > >-/** >- * WebKitFrameDisplayedCallback: >- * @web_view: a #WebKitWebView >- * @user_data: user data >- * >- * Callback to be called when a frame is displayed in a #webKitWebView. >- * >- * Since: 2.24 >- */ >-typedef void (* WebKitFrameDisplayedCallback) (WebKitWebView *web_view, >- gpointer user_data); >- > struct _WebKitWebView { > GObject parent; > >@@ -507,16 +495,6 @@ WEBKIT_API void > webkit_web_view_restore_session_state (WebKitWebView *web_view, > WebKitWebViewSessionState *state); > >-WEBKIT_API guint >-webkit_web_view_add_frame_displayed_callback (WebKitWebView *web_view, >- WebKitFrameDisplayedCallback callback, >- gpointer user_data, >- GDestroyNotify destroy_notify); >- >-WEBKIT_API void >-webkit_web_view_remove_frame_displayed_callback (WebKitWebView *web_view, >- guint id); >- > G_END_DECLS > > #endif >diff --git a/Source/WebKit/UIProcess/API/wpe/docs/wpe-0.1-sections.txt b/Source/WebKit/UIProcess/API/wpe/docs/wpe-0.1-sections.txt >index 628db4252a4d2bf48f490da54087ac4c2c95bc91..14d13856320f4ee6cd3b401d549f0dca0bfe428e 100644 >--- a/Source/WebKit/UIProcess/API/wpe/docs/wpe-0.1-sections.txt >+++ b/Source/WebKit/UIProcess/API/wpe/docs/wpe-0.1-sections.txt >@@ -127,7 +127,6 @@ WebKitPolicyDecisionType > WebKitSaveMode > WebKitInsecureContentEvent > WebKitWebProcessTerminationReason >-WebKitFrameDisplayedCallback > > <SUBSECTION Editing Commands> > WEBKIT_EDITING_COMMAND_CUT >@@ -204,8 +203,6 @@ webkit_web_view_get_editor_state > webkit_web_view_get_session_state > webkit_web_view_restore_session_state > webkit_web_view_get_main_resource >-webkit_web_view_add_frame_displayed_callback >-webkit_web_view_remove_frame_displayed_callback > > <SUBSECTION WebKitJavascriptResult> > WebKitJavascriptResult >diff --git a/Tools/ChangeLog b/Tools/ChangeLog >index e7df678569325f50af965b3480f126109a8c8da7..b2bfc801513e77db963f766ce53f05929f1ec56a 100644 >--- a/Tools/ChangeLog >+++ b/Tools/ChangeLog >@@ -1,3 +1,18 @@ >+2018-12-12 Commit Queue <commit-queue@webkit.org> >+ >+ Unreviewed, rolling out r239103. >+ https://bugs.webkit.org/show_bug.cgi?id=192627 >+ >+ It broke the built because it depends on another patch that >+ didn't land yet (Requested by KaL on #webkit). >+ >+ Reverted changeset: >+ >+ "[WPE] Add API to notify about frame displayed view backend >+ callback" >+ https://bugs.webkit.org/show_bug.cgi?id=192224 >+ https://trac.webkit.org/changeset/239103 >+ > 2018-11-30 Carlos Garcia Campos <cgarcia@igalia.com> > > [WPE] Add API to notify about frame displayed view backend callback >diff --git a/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitWebView.cpp b/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitWebView.cpp >index 9b827d41bdbcd7d6c830a3c29f29c3ee80a9695e..ba910243328c7ec5ddb8f0228fb654f05b682961 100644 >--- a/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitWebView.cpp >+++ b/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitWebView.cpp >@@ -1219,100 +1219,6 @@ static void testWebViewTitleChange(WebViewTitleTest* test, gconstpointer) > g_assert_cmpstr(test->m_webViewTitles[6].data(), ==, "three"); > } > >-#if PLATFORM(WPE) >-class FrameDisplayedTest: public WebViewTest { >-public: >- MAKE_GLIB_TEST_FIXTURE(FrameDisplayedTest); >- >- static void titleChangedCallback(WebKitWebView* view, GParamSpec*, WebViewTitleTest* test) >- { >- test->m_webViewTitles.append(webkit_web_view_get_title(view)); >- } >- >- FrameDisplayedTest() >- : m_id(webkit_web_view_add_frame_displayed_callback(m_webView, [](WebKitWebView*, gpointer userData) { >- auto* test = static_cast<FrameDisplayedTest*>(userData); >- if (!test->m_maxFrames) >- return; >- >- if (++test->m_frameCounter == test->m_maxFrames) >- RunLoop::main().dispatch([test] { test->quitMainLoop(); }); >- }, this, nullptr)) >- { >- g_assert_cmpuint(m_id, >, 0); >- } >- >- ~FrameDisplayedTest() >- { >- webkit_web_view_remove_frame_displayed_callback(m_webView, m_id); >- } >- >- void waitUntilFramesDisplayed(unsigned framesCount = 1) >- { >- m_maxFrames = framesCount; >- m_frameCounter = 0; >- g_main_loop_run(m_mainLoop); >- } >- >- unsigned m_id { 0 }; >- unsigned m_frameCounter { 0 }; >- unsigned m_maxFrames { 0 }; >-}; >- >-static void testWebViewFrameDisplayed(FrameDisplayedTest* test, gconstpointer) >-{ >- test->showInWindow(); >- >- test->loadHtml("<html></html>", nullptr); >- test->waitUntilFramesDisplayed(); >- >- test->loadHtml("<html><head><style>@keyframes fadeIn { from { opacity: 0; } }</style></head><p style='animation: fadeIn 1s infinite alternate;'>Foo</p></html>", nullptr); >- test->waitUntilFramesDisplayed(10); >- >- bool secondCallbackCalled = false; >- auto id = webkit_web_view_add_frame_displayed_callback(test->m_webView, [](WebKitWebView*, gpointer userData) { >- auto* secondCallbackCalled = static_cast<bool*>(userData); >- *secondCallbackCalled = true; >- }, &secondCallbackCalled, nullptr); >- test->waitUntilFramesDisplayed(); >- g_assert_true(secondCallbackCalled); >- >- secondCallbackCalled = false; >- webkit_web_view_remove_frame_displayed_callback(test->m_webView, id); >- test->waitUntilFramesDisplayed(); >- g_assert_false(secondCallbackCalled); >- >- id = webkit_web_view_add_frame_displayed_callback(test->m_webView, [](WebKitWebView* webView, gpointer userData) { >- auto* id = static_cast<unsigned*>(userData); >- webkit_web_view_remove_frame_displayed_callback(webView, *id); >- }, &id, [](gpointer userData) { >- auto* id = static_cast<unsigned*>(userData); >- *id = 0; >- }); >- test->waitUntilFramesDisplayed(); >- g_assert_cmpuint(id, ==, 0); >- >- auto id2 = webkit_web_view_add_frame_displayed_callback(test->m_webView, [](WebKitWebView* webView, gpointer userData) { >- auto* id = static_cast<unsigned*>(userData); >- if (*id) { >- webkit_web_view_remove_frame_displayed_callback(webView, *id); >- *id = 0; >- } >- }, &id, nullptr); >- >- secondCallbackCalled = false; >- id = webkit_web_view_add_frame_displayed_callback(test->m_webView, [](WebKitWebView* webView, gpointer userData) { >- auto* secondCallbackCalled = static_cast<bool*>(userData); >- *secondCallbackCalled = true; >- }, &secondCallbackCalled, nullptr); >- test->waitUntilFramesDisplayed(); >- g_assert_cmpuint(id, ==, 0); >- g_assert_false(secondCallbackCalled); >- >- webkit_web_view_remove_frame_displayed_callback(test->m_webView, id2); >-} >-#endif >- > static void serverCallback(SoupServer* server, SoupMessage* message, const char* path, GHashTable*, SoupClientContext*, gpointer) > { > if (message->method != SOUP_METHOD_GET) { >@@ -1368,9 +1274,6 @@ void beforeAll() > WebViewTest::add("WebKitWebView", "preferred-size", testWebViewPreferredSize); > #endif > WebViewTitleTest::add("WebKitWebView", "title-change", testWebViewTitleChange); >-#if PLATFORM(WPE) >- FrameDisplayedTest::add("WebKitWebView", "frame-displayed", testWebViewFrameDisplayed); >-#endif > } > > void afterAll()
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=357133">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 192627
: 357133