Changeset 89284 in webkit

Timestamp:

Jun 20, 2011 1:22:33 PM (13 years ago)

Author:

kevino@webkit.org

Message:

Reviewed by Kevin Ollivier.

Make showing the dialog optional, and add handling for Javascript print() calls.

​https://bugs.webkit.org/show_bug.cgi?id=63008

Location:

trunk/Source/WebKit/wx

Files:

• ChangeLog (modified) (1 diff)
• WebFrame.cpp (modified) (4 diffs)
• WebFrame.h (modified) (2 diffs)
• WebKitSupport/ChromeClientWx.cpp (modified) (1 diff)
• WebKitSupport/FrameLoaderClientWx.h (modified) (1 diff)
• WebView.cpp (modified) (1 diff)
• WebView.h (modified) (5 diffs)
• bindings/python/webview.i (modified) (2 diffs)

trunk/Source/WebKit/wx/ChangeLog

@@ +1 @@
+2011-06-20  Robin Dunn  <robin@alldunn.com>
+
+        Reviewed by Kevin Ollivier.
+
+        Make showing the dialog optional, and add handling for Javascript print() calls.
+        
+        https://bugs.webkit.org/show_bug.cgi?id=63008
+
+        * WebFrame.cpp:
+        (kit):
+        (wxWebFrame::Print):
+        * WebFrame.h:
+        * WebKitSupport/ChromeClientWx.cpp:
+        (WebCore::ChromeClientWx::print):
+        * WebKitSupport/FrameLoaderClientWx.h:
+        (WebCore::FrameLoaderClientWx::webFrame):
+        (WebCore::FrameLoaderClientWx::webView):
+        * WebView.cpp:
+        (wxWebViewPrintFrameEvent::wxWebViewPrintFrameEvent):
+        * WebView.h:
+        * bindings/python/webview.i:
+
 2011-06-20  Kevin Ollivier  <kevino@theolliviers.com>
 

trunk/Source/WebKit/wx/WebFrame.cpp

@@ -33 +33 @@
 #include "Frame.h"
 #include "FrameLoader.h"
+#include "FrameLoaderClientWx.h"
 #include "FrameView.h"
 #include "GraphicsContext.h"
@@ -175 +176 @@
 };
 #endif
+
+wxWebFrame* kit(WebCore::Frame* frame)
+{
+    if (!frame)
+        return 0;
+    if (!frame->loader())
+        return 0;
+    
+    WebCore::FrameLoaderClientWx* loaderClient = dynamic_cast<WebCore::FrameLoaderClientWx*>(frame->loader()->client());
+    if (loaderClient)
+        return loaderClient->webFrame();
+    
+    return 0;
+}
 
 wxWebFrame::wxWebFrame(wxWebView* container, wxWebFrame* parent, WebViewFrameData* data) :
@@ -557 +572 @@
 }
 
-void wxWebFrame::Print()
+void wxWebFrame::Print(bool showDialog)
 {
 #if wxCHECK_VERSION(2, 9, 1)
@@ -584 +599 @@
     printdata.SetToPage(printout->GetPageCount());
 
-    wxPrintDialog dialog(0, &printdata);
-    if (dialog.ShowModal() == wxID_OK) {    
-        wxPrintDialogData data(dialog.GetPrintDialogData());
-        printout->SetFirstPage(data.GetFromPage());
-        printout->SetLastPage(data.GetToPage());
-        wxPrinter printer(&data);
-        
-        printer.Print(0, printout, false);
-    }
+    wxPrintDialogData data(printdata);
+
+    if (showDialog) {
+        wxPrintDialog dialog(0, &data);
+        if (dialog.ShowModal() == wxID_OK) {
+            data = dialog.GetPrintDialogData();
+            printout->SetFirstPage(data.GetFromPage());
+            printout->SetLastPage(data.GetToPage());
+        } else
+            return;
+    }
+    
+    wxPrinter printer(&data);
+        
+    printer.Print(0, printout, false);
+        
 #else
     wxFAIL_MSG(wxT("Printing is only supported in wxWidgets 2.9.1 and above."));

trunk/Source/WebKit/wx/WebFrame.h

@@ -116 +116 @@
     void Stop();
     void Reload();
-    void Print();
+    void Print(bool showDialog = true);
     
     bool CanGoBack();
@@ -181 +181 @@
 };
 
+wxWebFrame* kit(WebCore::Frame*);
+
 #endif // ifndef WXWEBFRAME_H

trunk/Source/WebKit/wx/WebKitSupport/ChromeClientWx.cpp

@@ -416 +416 @@
 }
 
-void ChromeClientWx::print(Frame*)
-{
-    notImplemented();
+void ChromeClientWx::print(Frame* frame)
+{
+    wxWebFrame* webFrame = kit(frame);
+    if (webFrame) {
+        wxWebViewPrintFrameEvent event(m_webView);
+        event.SetWebFrame(webFrame);
+        if (!m_webView->GetEventHandler()->ProcessEvent(event))
+            webFrame->Print(true);
+    }
 }
 

trunk/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h

@@ -56 +56 @@
         FrameLoaderClientWx();
         ~FrameLoaderClientWx();
+        
+        wxWebFrame* webFrame() { return m_webFrame; }
         void setFrame(wxWebFrame *frame);
+        wxWebView* webView() { return m_webView; }
         void setWebView(wxWebView *webview);
 

trunk/Source/WebKit/wx/WebView.cpp

@@ -248 +248 @@
 {
     SetEventType(wxEVT_WEBVIEW_SELECTION_CHANGED);
+    SetEventObject(win);
+    if (win)
+        SetId(win->GetId());
+}
+
+IMPLEMENT_DYNAMIC_CLASS(wxWebViewPrintFrameEvent, wxCommandEvent)
+
+DEFINE_EVENT_TYPE(wxEVT_WEBVIEW_PRINT_FRAME)
+
+wxWebViewPrintFrameEvent::wxWebViewPrintFrameEvent(wxWindow* win)
+{
+    SetEventType(wxEVT_WEBVIEW_PRINT_FRAME);
     SetEventObject(win);
     if (win)

trunk/Source/WebKit/wx/WebView.h

@@ -546 +546 @@
 };
 
+class WXDLLIMPEXP_WEBKIT wxWebViewPrintFrameEvent : public wxCommandEvent {
+#ifndef SWIG
+    DECLARE_DYNAMIC_CLASS(wxWebViewPrintFrameEvent)
+#endif
+    
+public:
+    wxWebViewPrintFrameEvent(wxWindow* win = 0);
+    wxEvent *Clone(void) const { return new wxWebViewPrintFrameEvent(*this); }
+    
+    wxWebFrame* GetWebFrame() { return m_webFrame; }
+    void SetWebFrame(wxWebFrame* frame) { m_webFrame = frame; }
+private:
+    wxWebFrame* m_webFrame;
+};
+
 typedef void (wxEvtHandler::*wxWebViewLoadEventFunction)(wxWebViewLoadEvent&);
 typedef void (wxEvtHandler::*wxWebViewBeforeLoadEventFunction)(wxWebViewBeforeLoadEvent&);
@@ -558 +573 @@
 typedef void (wxEvtHandler::*wxWebViewContentsChangedFunction)(wxWebViewContentsChangedEvent&);
 typedef void (wxEvtHandler::*wxWebViewSelectionChangedFunction)(wxWebViewSelectionChangedEvent&);
+typedef void (wxEvtHandler::*wxWebViewPrintFrameFunction)(wxWebViewPrintFrameEvent&);
 
 #define wxWebViewLoadEventHandler(func) \
@@ -583 +599 @@
 #define wxWebViewSelectionChangedEventHandler(func) \
     (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxWebViewSelectionChangedEventFunction, &func)
-    
+#define wxWebViewPrintFrameEventHandler(func) \
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxWebViewPrintFrameEventFunction, &func)
+
 #ifndef SWIG
 BEGIN_DECLARE_EVENT_TYPES()
@@ -598 +616 @@
     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WEBKIT, wxEVT_WEBVIEW_CONTENTS_CHANGED, wxID_ANY)
     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WEBKIT, wxEVT_WEBVIEW_SELECTION_CHANGED, wxID_ANY)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WEBKIT, wxEVT_WEBVIEW_PRINT_FRAME, wxID_ANY)
 END_DECLARE_EVENT_TYPES()
 #endif
@@ -696 +715 @@
                             (wxWebViewSelectionChangedEventFunction) & func, \
                             static_cast<wxObject*>(0)),
-                            
+
+#define EVT_WEBVIEW_PRINT_FRAME(winid, func)                       \
+            DECLARE_EVENT_TABLE_ENTRY(wxEVT_WEBVIEW_PRINT_FRAME, \
+                            winid, \
+                            wxID_ANY, \
+                            (wxObjectEventFunction)   \
+                            (wxWebViewPrintFrameEventFunction) & func, \
+                            static_cast<wxObject*>(0)),
                             
 #endif // ifndef WXWEBVIEW_H

trunk/Source/WebKit/wx/bindings/python/webview.i

@@ -171 +171 @@
 %constant wxEventType wxEVT_WEBVIEW_CONTENTS_CHANGED;
 %constant wxEventType wxEVT_WEBVIEW_SELECTION_CHANGED;
+%constant wxEventType wxEVT_WEBVIEW_PRINT_FRAME;
 
 %pythoncode {
@@ -181 +182 @@
 EVT_WEBVIEW_CONTENTS_CHANGED = wx.PyEventBinder( wxEVT_WEBVIEW_CONTENTS_CHANGED, 1 )
 EVT_WEBVIEW_SELECTION_CHANGED = wx.PyEventBinder( wxEVT_WEBVIEW_SELECTION_CHANGED, 1 )
+EVT_WEBVIEW_PRINT_FRAME = wx.PyEventBinder( wxEVT_WEBVIEW_PRINT_FRAME, 1 )
 }