Changeset 201497 in webkit

Timestamp:

May 29, 2016, 11:53:36 PM (10 years ago)

Author:

beidson@apple.com

Message:

Transition various Task/Function queues from std::function to NoncopyableFunction.
​https://bugs.webkit.org/show_bug.cgi?id=158196

Reviewed by Chris Dumez.

No new tests (Refactor, no behavior change).

• dom/ActiveDOMCallbackMicrotask.cpp:

(WebCore::ActiveDOMCallbackMicrotask::ActiveDOMCallbackMicrotask):

• dom/ActiveDOMCallbackMicrotask.h:

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::layoutSizeChanged):

• page/FrameView.cpp:

(WebCore::FrameView::queuePostLayoutCallback):
(WebCore::FrameView::flushPostLayoutTasksQueue):

• page/FrameView.h:

• platform/GenericTaskQueue.cpp:

(WebCore::TaskDispatcher<Timer>::postTask):
(WebCore::TaskDispatcher<Timer>::dispatchOneTask):

• platform/GenericTaskQueue.h:

(WebCore::TaskDispatcher::postTask):
(WebCore::GenericTaskQueue::enqueueTask):

• style/StyleTreeResolver.cpp:

(WebCore::Style::postResolutionCallbackQueue):
(WebCore::Style::queuePostResolutionCallback):
(WebCore::Style::suspendMemoryCacheClientCalls):

• style/StyleTreeResolver.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/ActiveDOMCallbackMicrotask.cpp (modified) (1 diff)
• dom/ActiveDOMCallbackMicrotask.h (modified) (4 diffs)
• html/HTMLMediaElement.cpp (modified) (1 diff)
• page/FrameView.cpp (modified) (2 diffs)
• page/FrameView.h (modified) (6 diffs)
• platform/GenericTaskQueue.cpp (modified) (2 diffs)
• platform/GenericTaskQueue.h (modified) (8 diffs)
• style/StyleTreeResolver.cpp (modified) (2 diffs)
• style/StyleTreeResolver.h (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-05-29  Brady Eidson  <beidson@apple.com>
+
+        Transition various Task/Function queues from std::function to NoncopyableFunction.
+        https://bugs.webkit.org/show_bug.cgi?id=158196
+
+        Reviewed by Chris Dumez.
+
+        No new tests (Refactor, no behavior change).
+
+        * dom/ActiveDOMCallbackMicrotask.cpp:
+        (WebCore::ActiveDOMCallbackMicrotask::ActiveDOMCallbackMicrotask):
+        * dom/ActiveDOMCallbackMicrotask.h:
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::layoutSizeChanged):
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::queuePostLayoutCallback):
+        (WebCore::FrameView::flushPostLayoutTasksQueue):
+        * page/FrameView.h:
+
+        * platform/GenericTaskQueue.cpp:
+        (WebCore::TaskDispatcher<Timer>::postTask):
+        (WebCore::TaskDispatcher<Timer>::dispatchOneTask):
+        * platform/GenericTaskQueue.h:
+        (WebCore::TaskDispatcher::postTask):
+        (WebCore::GenericTaskQueue::enqueueTask):
+
+        * style/StyleTreeResolver.cpp:
+        (WebCore::Style::postResolutionCallbackQueue):
+        (WebCore::Style::queuePostResolutionCallback):
+        (WebCore::Style::suspendMemoryCacheClientCalls):
+        * style/StyleTreeResolver.h:
+
 2016-05-29  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/dom/ActiveDOMCallbackMicrotask.cpp

@@ -29 +29 @@
 namespace WebCore {
 
-ActiveDOMCallbackMicrotask::ActiveDOMCallbackMicrotask(MicrotaskQueue& queue, ScriptExecutionContext& scriptExecutionContext, std::function<void()>&& task)
+ActiveDOMCallbackMicrotask::ActiveDOMCallbackMicrotask(MicrotaskQueue& queue, ScriptExecutionContext& scriptExecutionContext, NoncopyableFunction<void()>&& task)
     : ActiveDOMCallback(&scriptExecutionContext)
     , m_queue(queue)

trunk/Source/WebCore/dom/ActiveDOMCallbackMicrotask.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2015, 2016 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -24 +24 @@
  */
 
-#ifndef ActiveDOMCallbackMicrotask_h
-#define ActiveDOMCallbackMicrotask_h
+#pragma once
 
 #include "ActiveDOMCallback.h"
 #include "Microtasks.h"
-#include <functional>
+#include <wtf/NoncopyableFunction.h>
 
 namespace WebCore {
@@ -36 +35 @@
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    WEBCORE_EXPORT ActiveDOMCallbackMicrotask(MicrotaskQueue&, ScriptExecutionContext&, std::function<void()>&&);
+    WEBCORE_EXPORT ActiveDOMCallbackMicrotask(MicrotaskQueue&, ScriptExecutionContext&, NoncopyableFunction<void()>&&);
     WEBCORE_EXPORT virtual ~ActiveDOMCallbackMicrotask();
 
@@ -48 +47 @@
     // queue.
     MicrotaskQueue& m_queue;
-    std::function<void()> m_task;
+    NoncopyableFunction<void()> m_task;
 };
 
 } // namespace WebCore
-
-#endif // ActiveDOMCallbackMicrotask_h

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -3995 +3995 @@
 {
 #if ENABLE(MEDIA_CONTROLS_SCRIPT)
-    RefPtr<HTMLMediaElement> strongThis = this;
-    std::function<void()> task = [strongThis] {
-        if (ShadowRoot* root = strongThis->userAgentShadowRoot())
+    auto task = [this, protectedThis = Ref<Element>(*this)] {
+        if (ShadowRoot* root = userAgentShadowRoot())
             root->dispatchEvent(Event::create("resize", false, false));
     };
-    m_resizeTaskQueue.enqueueTask(task);
+    m_resizeTaskQueue.enqueueTask(WTFMove(task));
 #endif
 }

trunk/Source/WebCore/page/FrameView.cpp

@@ -3134 +3134 @@
 }
 
-void FrameView::queuePostLayoutCallback(std::function<void()> callback)
-{
-    m_postLayoutCallbackQueue.append(callback);
+void FrameView::queuePostLayoutCallback(NoncopyableFunction<void()>&& callback)
+{
+    m_postLayoutCallbackQueue.append(WTFMove(callback));
 }
 
@@ -3147 +3147 @@
         return;
 
-    const auto queue = m_postLayoutCallbackQueue;
-    m_postLayoutCallbackQueue.clear();
-    for (size_t i = 0; i < queue.size(); ++i)
-        queue[i]();
+    Vector<NoncopyableFunction<void()>> queue = WTFMove(m_postLayoutCallbackQueue);
+    for (auto& task : queue)
+        task();
 }
 

trunk/Source/WebCore/page/FrameView.h

@@ -5 +5 @@
              (C) 1999 Lars Knoll (knoll@kde.org)
              (C) 1999 Antti Koivisto (koivisto@kde.org)
-   Copyright (C) 2004-2009, 2014-2015 Apple Inc. All rights reserved.
+   Copyright (C) 2004-2009, 2014-2016 Apple Inc. All rights reserved.
 
    This library is free software; you can redistribute it and/or
@@ -23 +23 @@
 */
 
-#ifndef FrameView_h
-#define FrameView_h
+#pragma once
 
 #include "AdjustViewSizeOrNot.h"
@@ -39 +38 @@
 #include <wtf/HashSet.h>
 #include <wtf/ListHashSet.h>
+#include <wtf/NoncopyableFunction.h>
 #include <wtf/text/WTFString.h>
 
@@ -112 +112 @@
     void scheduleRelayoutOfSubtree(RenderElement&);
     void unscheduleRelayout();
-    void queuePostLayoutCallback(std::function<void()>);
+    void queuePostLayoutCallback(NoncopyableFunction<void()>&&);
     bool layoutPending() const;
     bool isInLayout() const { return m_layoutPhase != OutsideLayout; }
@@ -829 +829 @@
 
     IntRect* m_cachedWindowClipRect { nullptr };
-    Vector<std::function<void()>> m_postLayoutCallbackQueue;
+    Vector<NoncopyableFunction<void()>> m_postLayoutCallbackQueue;
 };
 
@@ -855 +855 @@
 
 SPECIALIZE_TYPE_TRAITS_WIDGET(FrameView, isFrameView())
-
-#endif // FrameView_h

trunk/Source/WebCore/platform/GenericTaskQueue.cpp

@@ -37 +37 @@
 }
 
-void TaskDispatcher<Timer>::postTask(std::function<void()> function)
+void TaskDispatcher<Timer>::postTask(NoncopyableFunction<void()>&& function)
 {
     m_pendingTasks.append(WTFMove(function));
@@ -78 +78 @@
 {
     ASSERT(!m_pendingTasks.isEmpty());
-    std::function<void()> task = m_pendingTasks.takeFirst();
+    auto task = m_pendingTasks.takeFirst();
     task();
 }

trunk/Source/WebCore/platform/GenericTaskQueue.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2015, 2016 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -24 +24 @@
  */
 
-#ifndef GenericTaskQueue_h
-#define GenericTaskQueue_h
+#pragma once
 
 #include "Timer.h"
 #include <wtf/Deque.h>
+#include <wtf/NoncopyableFunction.h>
 #include <wtf/WeakPtr.h>
 
@@ -41 +41 @@
     }
 
-    void postTask(std::function<void()> f)
+    void postTask(NoncopyableFunction<void()>&& f)
     {
-        m_context.postTask(f);
+        m_context.postTask(WTFMove(f));
     }
 
@@ -54 +54 @@
 public:
     TaskDispatcher();
-    void postTask(std::function<void()>);
+    void postTask(NoncopyableFunction<void()>&&);
 
 private:
@@ -64 +64 @@
 
     WeakPtrFactory<TaskDispatcher> m_weakPtrFactory;
-    Deque<std::function<void()>> m_pendingTasks;
+    Deque<NoncopyableFunction<void()>> m_pendingTasks;
 };
 
@@ -82 +82 @@
     }
 
-    typedef std::function<void()> TaskFunction;
+    typedef NoncopyableFunction<void()> TaskFunction;
 
-    void enqueueTask(TaskFunction task)
+    void enqueueTask(TaskFunction&& task)
     {
         if (m_isClosed)
@@ -91 +91 @@
         ++m_pendingTasks;
         auto weakThis = m_weakPtrFactory.createWeakPtr();
-        m_dispatcher.postTask([weakThis, task] {
+        m_dispatcher.postTask([weakThis, task = WTFMove(task)] {
             if (!weakThis)
                 return;
@@ -121 +121 @@
 
 }
-
-#endif

trunk/Source/WebCore/style/StyleTreeResolver.cpp

@@ -522 +522 @@
 }
 
-static Vector<std::function<void ()>>& postResolutionCallbackQueue()
-{
-    static NeverDestroyed<Vector<std::function<void ()>>> vector;
+static Vector<NoncopyableFunction<void ()>>& postResolutionCallbackQueue()
+{
+    static NeverDestroyed<Vector<NoncopyableFunction<void ()>>> vector;
     return vector;
 }
 
-void queuePostResolutionCallback(std::function<void ()> callback)
-{
-    postResolutionCallbackQueue().append(callback);
+void queuePostResolutionCallback(NoncopyableFunction<void ()>&& callback)
+{
+    postResolutionCallbackQueue().append(WTFMove(callback));
 }
 
@@ -541 +541 @@
     page->setMemoryCacheClientCallsEnabled(false);
 
-    RefPtr<MainFrame> protectedMainFrame = &page->mainFrame();
-    postResolutionCallbackQueue().append([protectedMainFrame]{
+    postResolutionCallbackQueue().append([protectedMainFrame = Ref<MainFrame>(page->mainFrame())] {
         if (Page* page = protectedMainFrame->page())
             page->setMemoryCacheClientCallsEnabled(true);

trunk/Source/WebCore/style/StyleTreeResolver.h

@@ -24 +24 @@
  */
 
-#ifndef StyleTreeResolver_h
-#define StyleTreeResolver_h
+#pragma once
 
 #include "RenderStyleConstants.h"
@@ -36 +35 @@
 #include <functional>
 #include <wtf/HashMap.h>
+#include <wtf/NoncopyableFunction.h>
 #include <wtf/RefPtr.h>
 
@@ -111 +111 @@
 };
 
-void queuePostResolutionCallback(std::function<void ()>);
+void queuePostResolutionCallback(NoncopyableFunction<void ()>&&);
 bool postResolutionCallbacksAreSuspended();
 
@@ -125 +125 @@
 
 }
-
-#endif