Changeset 76452 in webkit

Timestamp:

Jan 22, 2011 11:36:34 AM (13 years ago)

Author:

andersca@apple.com

Message:

2011-01-22 Anders Carlsson <​andersca@apple.com>

Reviewed by Sam Weinig.

Add an asynchronous WKPageForceRepaint
​https://bugs.webkit.org/show_bug.cgi?id=52964
<rdar://problem/8898527>

• UIProcess/API/C/WKPage.cpp: (WKPageForceRepaint): Call WebPageProxy::forceRepaint.

• UIProcess/API/C/WKPage.h: Add WKPageForceRepaint.

• UIProcess/GenericCallback.h: Add a "generic" VoidCallback class.

• UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::forceRepaint): Insert the callback in the m_voidCallbacks map and send a forceRepaint message.

(WebKit::WebPageProxy::voidCallback):
Call the right void callback.

(WebKit::WebPageProxy::processDidCrash):
Invalidate m_voidCallbacks.

• UIProcess/WebPageProxy.messages.in: Add a VoidCallback message.

• WebProcess/WebPage/ChunkedUpdateDrawingArea.cpp: (WebKit::ChunkedUpdateDrawingArea::forceRepaint): Force a repaint.

• WebProcess/WebPage/ChunkedUpdateDrawingArea.h: Add forceRepaint.

• WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::forceRepaint): Call forceRepaint on the drawing area.

• WebProcess/WebPage/WebPage.messages.in: Add a ForceRepaint message.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/C/WKPage.cpp (modified) (1 diff)
• UIProcess/API/C/WKPage.h (modified) (1 diff)
• UIProcess/GenericCallback.h (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (3 diffs)
• UIProcess/WebPageProxy.h (modified) (3 diffs)
• UIProcess/WebPageProxy.messages.in (modified) (1 diff)
• WebProcess/WebPage/ChunkedUpdateDrawingArea.cpp (modified) (1 diff)
• WebProcess/WebPage/ChunkedUpdateDrawingArea.h (modified) (1 diff)
• WebProcess/WebPage/DrawingArea.h (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (1 diff)
• WebProcess/WebPage/WebPage.h (modified) (1 diff)
• WebProcess/WebPage/WebPage.messages.in (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-01-22  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Add an asynchronous WKPageForceRepaint
+        https://bugs.webkit.org/show_bug.cgi?id=52964
+        <rdar://problem/8898527>
+
+        * UIProcess/API/C/WKPage.cpp:
+        (WKPageForceRepaint):
+        Call WebPageProxy::forceRepaint.
+
+        * UIProcess/API/C/WKPage.h:
+        Add WKPageForceRepaint.
+
+        * UIProcess/GenericCallback.h:
+        Add a "generic" VoidCallback class.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::forceRepaint):
+        Insert the callback in the m_voidCallbacks map and send a forceRepaint message.
+
+        (WebKit::WebPageProxy::voidCallback):
+        Call the right void callback.
+
+        (WebKit::WebPageProxy::processDidCrash):
+        Invalidate m_voidCallbacks.
+
+        * UIProcess/WebPageProxy.messages.in:
+        Add a VoidCallback message.
+
+        * WebProcess/WebPage/ChunkedUpdateDrawingArea.cpp:
+        (WebKit::ChunkedUpdateDrawingArea::forceRepaint):
+        Force a repaint.
+
+        * WebProcess/WebPage/ChunkedUpdateDrawingArea.h:
+        Add forceRepaint.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::forceRepaint):
+        Call forceRepaint on the drawing area.
+
+        * WebProcess/WebPage/WebPage.messages.in:
+        Add a ForceRepaint message.
+
 2011-01-21  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp

@@ -430 +430 @@
 }
 #endif
+
+void WKPageForceRepaint(WKPageRef pageRef, void* context, WKPageForceRepaintFunction callback)
+{
+    toImpl(pageRef)->forceRepaint(VoidCallback::create(context, callback));
+}

trunk/Source/WebKit2/UIProcess/API/C/WKPage.h

@@ -342 +342 @@
 #endif
 
+typedef void (*WKPageForceRepaintFunction)(WKErrorRef, void*);
+WK_EXPORT void WKPageForceRepaint(WKPageRef page, void* context, WKPageForceRepaintFunction function);
+
 #ifdef __cplusplus
 }

trunk/Source/WebKit2/UIProcess/GenericCallback.h

@@ -35 +35 @@
 
 namespace WebKit {
+
+class VoidCallback : public RefCounted<VoidCallback> {
+public:
+    typedef void (*CallbackFunction)(WKErrorRef, void*);
+
+    static PassRefPtr<VoidCallback> create(void* context, CallbackFunction callback)
+    {
+        return adoptRef(new VoidCallback(context, callback));
+    }
+
+    VoidCallback()
+    {
+        ASSERT(!m_callback);
+    }
+
+    void performCallback()
+    {
+        ASSERT(m_callback);
+
+        m_callback(0, m_context);
+
+        m_callback = 0;
+    }
+    
+    void invalidate()
+    {
+        ASSERT(m_callback);
+
+        RefPtr<WebError> error = WebError::create();
+        m_callback(toAPI(error.get()), m_context);
+        
+        m_callback = 0;
+    }
+
+    uint64_t callbackID() const { return m_callbackID; }
+
+private:
+    static uint64_t generateCallbackID()
+    {
+        static uint64_t uniqueCallbackID = 1;
+        return uniqueCallbackID++;
+    }
+
+    VoidCallback(void* context, CallbackFunction callback)
+        : m_context(context)
+        , m_callback(callback)
+        , m_callbackID(generateCallbackID())
+    {
+    }
+
+    void* m_context;
+    CallbackFunction m_callback;
+    uint64_t m_callbackID;
+};
 
 template<typename APIReturnValueType, typename InternalReturnValueType = typename APITypeInfo<APIReturnValueType>::ImplType>

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -1003 +1003 @@
 }
 
+void WebPageProxy::forceRepaint(PassRefPtr<VoidCallback> prpCallback)
+{
+    RefPtr<VoidCallback> callback = prpCallback;
+
+    if (!isValid()) {
+        callback->invalidate();
+        return;
+    }
+
+    uint64_t callbackID = callback->callbackID();
+    m_voidCallbacks.set(callbackID, callback.get());
+    process()->send(Messages::WebPage::ForceRepaint(callbackID), m_pageID); 
+}
+
 void WebPageProxy::preferencesDidChange()
 {
@@ -2141 +2155 @@
 }
 
+void WebPageProxy::voidCallback(uint64_t callbackID)
+{
+    RefPtr<VoidCallback> callback = m_voidCallbacks.take(callbackID);
+    if (!callback) {
+        // FIXME: Log error or assert.
+        return;
+    }
+
+    callback->performCallback();
+}
+
 void WebPageProxy::dataCallback(const CoreIPC::DataReference& dataReference, uint64_t callbackID)
 {
@@ -2250 +2275 @@
     m_toolTip = String();
 
+    invalidateCallbackMap(m_voidCallbacks);
     invalidateCallbackMap(m_dataCallbacks);
     invalidateCallbackMap(m_stringCallbacks);

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -274 +274 @@
     void getWebArchiveOfFrame(WebFrameProxy*, PassRefPtr<DataCallback>);
     void runJavaScriptInMainFrame(const String&, PassRefPtr<StringCallback>);
-
+    void forceRepaint(PassRefPtr<VoidCallback>);
+    
     float headerHeight(WebFrameProxy*);
     float footerHeight(WebFrameProxy*);
@@ -511 +512 @@
     void didReceiveEvent(uint32_t opaqueType, bool handled);
 
+    void voidCallback(uint64_t);
     void dataCallback(const CoreIPC::DataReference&, uint64_t);
     void stringCallback(const String&, uint64_t);
@@ -557 +559 @@
 #endif
 
+    HashMap<uint64_t, RefPtr<VoidCallback> > m_voidCallbacks;
     HashMap<uint64_t, RefPtr<DataCallback> > m_dataCallbacks;
     HashMap<uint64_t, RefPtr<StringCallback> > m_stringCallbacks;

trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in

@@ -114 +114 @@
 
     # Callback messages
+    VoidCallback(uint64_t callbackID)
     DataCallback(CoreIPC::DataReference resultData, uint64_t callbackID)
     StringCallback(WTF::String resultString, uint64_t callbackID)

trunk/Source/WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.cpp

@@ -96 +96 @@
 }
 
+void ChunkedUpdateDrawingArea::forceRepaint()
+{
+    m_isWaitingForUpdate = false;
+    display();
+}
+
 void ChunkedUpdateDrawingArea::scheduleDisplay()
 {

trunk/Source/WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.h

@@ -43 +43 @@
     virtual void scroll(const WebCore::IntRect& scrollRect, const WebCore::IntSize& scrollOffset);
     virtual void display();
+    virtual void forceRepaint();
 
 #if USE(ACCELERATED_COMPOSITING)

trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h

@@ -57 +57 @@
 
     virtual void pageBackgroundTransparencyChanged() { }
+    virtual void onPageClose() { }
+    virtual void forceRepaint() { }
 
-    virtual void onPageClose() { }
-    
 #if USE(ACCELERATED_COMPOSITING)
     virtual void attachCompositingContext() = 0;

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -1188 +1188 @@
 }
 
+void WebPage::forceRepaint(uint64_t callbackID)
+{
+    m_drawingArea->forceRepaint();
+    send(Messages::WebPageProxy::VoidCallback(callbackID));
+}
+    
 void WebPage::preferencesDidChange(const WebPreferencesStore& store)
 {

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

@@ -376 +376 @@
     void getWebArchiveOfFrame(uint64_t frameID, uint64_t callbackID);
     void runJavaScriptInMainFrame(const String&, uint64_t callbackID);
+    void forceRepaint(uint64_t callbackID);
 
     void preferencesDidChange(const WebPreferencesStore&);

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in

@@ -65 +65 @@
     GetWebArchiveOfFrame(uint64_t frameID, uint64_t callbackID)
     RunJavaScriptInMainFrame(WTF::String script, uint64_t callbackID)
+
+    # FIXME: This should be a drawing area message.
+    ForceRepaint(uint64_t callbackID)
 
     PreferencesDidChange(WebKit::WebPreferencesStore store)