Changeset 48029 in webkit

Timestamp:

Sep 3, 2009 12:38:11 PM (15 years ago)

Author:

kevino@webkit.org

Message:

Reviewed by Kevin Ollivier.

[wx] Frames support
​https://bugs.webkit.org/show_bug.cgi?id=19041

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/wx/EventHandlerWx.cpp (modified) (3 diffs)
• WebCore/platform/wx/RenderThemeWx.cpp (modified) (8 diffs)
• WebCore/platform/wx/ScrollbarThemeWx.cpp (added)
• WebCore/platform/wx/ScrollbarThemeWx.h (added)
• WebCore/platform/wx/TemporaryLinkStubs.cpp (modified) (2 diffs)
• WebCore/platform/wx/wxcode/gtk/scrollbar_render.cpp (added)
• WebCore/platform/wx/wxcode/mac/carbon/scrollbar_render.cpp (added)
• WebCore/platform/wx/wxcode/scrollbar_render.h (added)
• WebCore/platform/wx/wxcode/win/non-kerned-drawing.cpp (modified) (3 diffs)
• WebCore/platform/wx/wxcode/win/scrollbar_render.cpp (added)
• WebCore/webcore-wx.bkl (modified) (3 diffs)
• WebKit/wx/ChangeLog (modified) (1 diff)
• WebKit/wx/WebFrame.cpp (modified) (4 diffs)
• WebKit/wx/WebFrame.h (modified) (2 diffs)
• WebKit/wx/WebFramePrivate.h (modified) (2 diffs)
• WebKit/wx/WebKitSupport/ChromeClientWx.cpp (modified) (2 diffs)
• WebKit/wx/WebKitSupport/EditorClientWx.cpp (modified) (8 diffs)
• WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp (modified) (14 diffs)
• WebKit/wx/WebKitSupport/FrameLoaderClientWx.h (modified) (3 diffs)
• WebKit/wx/WebView.cpp (modified) (13 diffs)
• WebKit/wx/WebView.h (modified) (1 diff)
• WebKit/wx/WebViewPrivate.h (modified) (2 diffs)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/wx/build-wxwebkit (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-09-03  Kevin Watters  <kevinwatters@gmail.com>
+
+        Reviewed by Kevin Ollivier.
+
+        [wx] Frames support
+        https://bugs.webkit.org/show_bug.cgi?id=19041
+
+        * page/wx/EventHandlerWx.cpp:
+        (WebCore::EventHandler::passMousePressEventToSubframe):
+        (WebCore::EventHandler::passMouseMoveEventToSubframe):
+        (WebCore::EventHandler::passMouseReleaseEventToSubframe):
+        (WebCore::EventHandler::passWheelEventToWidget):
+        (WebCore::EventHandler::tabsToAllControls):
+        (WebCore::EventHandler::passSubframeEventToSubframe):
+        (WebCore::EventHandler::passMouseDownEventToWidget):
+        * platform/wx/RenderThemeWx.cpp:
+        (WebCore::nativeWindowForRenderObject):
+        (WebCore::RenderThemeWx::paintButton):
+        (WebCore::RenderThemeWx::paintTextField):
+        (WebCore::RenderThemeWx::paintMenuList):
+        (WebCore::RenderThemeWx::paintMenuListButton):
+        * platform/wx/ScrollbarThemeWx.cpp: Added.
+        (WebCore::ScrollbarTheme::nativeTheme):
+        (WebCore::ScrollbarThemeWx::~ScrollbarThemeWx):
+        (WebCore::ScrollbarThemeWx::scrollbarThickness):
+        (WebCore::ScrollbarThemeWx::hasThumb):
+        (WebCore::ScrollbarThemeWx::buttonSize):
+        (WebCore::ScrollbarThemeWx::backButtonRect):
+        (WebCore::ScrollbarThemeWx::forwardButtonRect):
+        (WebCore::ScrollbarThemeWx::trackRect):
+        (WebCore::ScrollbarThemeWx::paintScrollCorner):
+        (WebCore::ScrollbarThemeWx::paint):
+        * platform/wx/ScrollbarThemeWx.h: Added.
+        (WebCore::ScrollbarThemeWx::hasButtons):
+        * platform/wx/TemporaryLinkStubs.cpp:
+        * platform/wx/wxcode/gtk/scrollbar_render.cpp: Added.
+        (wxStyleForPart):
+        (GetButtonWidget):
+        (wxGetGdkWindowForDC):
+        (wxRenderer_DrawScrollbar):
+        * platform/wx/wxcode/mac/carbon/scrollbar_render.cpp: Added.
+        (wxScrollbarPartToHIPressedState):
+        (wxRenderer_DrawScrollbar):
+        * platform/wx/wxcode/scrollbar_render.h: Added.
+        (calcThumbStartAndLength):
+        * platform/wx/wxcode/win/non-kerned-drawing.cpp:
+        (WebCore::drawTextWithSpacing):
+        * platform/wx/wxcode/win/scrollbar_render.cpp: Added.
+        (GraphicsHDC::GraphicsHDC):
+        (GraphicsHDC::~GraphicsHDC):
+        (GraphicsHDC::operator HDC):
+        (getTSStateForPart):
+        (wxRenderer_DrawScrollbar):
+        * webcore-wx.bkl:
+
 2009-09-03  Yael Aharon  <yael.aharon@nokia.com>
 

trunk/WebCore/page/wx/EventHandlerWx.cpp

@@ -33 +33 @@
 #include "KeyboardEvent.h"
 #include "MouseEventWithHitTestResults.h"
+#include "NotImplemented.h"
 #include "Page.h"
 #include "PlatformKeyboardEvent.h"
@@ -44 +45 @@
 bool EventHandler::passMousePressEventToSubframe(MouseEventWithHitTestResults& mev, Frame* subframe)
 {
-    return passSubframeEventToSubframe(mev, subframe);
+    subframe->eventHandler()->handleMousePressEvent(mev.event());
+    return true;
 }
 
 bool EventHandler::passMouseMoveEventToSubframe(MouseEventWithHitTestResults& mev, Frame* subframe, WebCore::HitTestResult* hittest)
 {
-    return passSubframeEventToSubframe(mev, subframe);
+    subframe->eventHandler()->handleMouseMoveEvent(mev.event(), hittest);
+    return true;
 }
 
 bool EventHandler::passMouseReleaseEventToSubframe(MouseEventWithHitTestResults& mev, Frame* subframe)
 {
-    return passSubframeEventToSubframe(mev, subframe);
+    subframe->eventHandler()->handleMouseReleaseEvent(mev.event());
+    return true;
 }
 
@@ -69 +73 @@
 {
     return passMouseDownEventToWidget(renderWidget->widget());
+}
+
+bool EventHandler::passWheelEventToWidget(PlatformWheelEvent& event, Widget* widget)
+{
+    if (!widget || !widget->isFrameView())
+        return false;
+
+    return static_cast<FrameView*>(widget)->frame()->eventHandler()->handleWheelEvent(event);
+}
+
+bool EventHandler::tabsToAllControls(KeyboardEvent* event) const 
+{ 
+    notImplemented(); 
+    return false; 
+}
+
+bool EventHandler::passSubframeEventToSubframe(MouseEventWithHitTestResults&, Frame* subframe, HitTestResult*)
+{
+    notImplemented(); 
+    return false; 
+}
+
+bool EventHandler::passMouseDownEventToWidget(Widget*)
+{ 
+    notImplemented();
+    return false; 
 }
 

trunk/WebCore/platform/wx/RenderThemeWx.cpp

@@ -30 +30 @@
 #include "FrameView.h"
 #include "GraphicsContext.h"
+#include "HostWindow.h"
 #include "NotImplemented.h"
 #include "RenderView.h"
@@ -138 +139 @@
     return rt;
 }
+
+wxWindow* nativeWindowForRenderObject(RenderObject* o)
+{
+    FrameView* frameView = o->view()->frameView();
+    ASSERT(frameView);
+    ASSERT(frameView->hostWindow());
+    return frameView->hostWindow()->platformWindow();
+}
+
 
 bool RenderThemeWx::isControlStyled(const RenderStyle* style, const BorderData& border,
@@ -252 +262 @@
 bool RenderThemeWx::paintButton(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r)
 {
-    wxWindow* window = o->view()->frameView()->platformWidget();
+    wxWindow* window = nativeWindowForRenderObject(o);
     wxDC* dc = static_cast<wxDC*>(i.context->platformContext());
     int flags = 0;
     
+    IntRect rect = r; 
+
+#if USE(WXGC)
+    double xtrans = 0;
+    double ytrans = 0;
+    
+    wxGCDC* gcdc = static_cast<wxGCDC*>(dc);
+    wxGraphicsContext* gc = gcdc->GetGraphicsContext();
+    gc->GetTransform().TransformPoint(&xtrans, &ytrans);
+    rect.setX(r.x() + (int)xtrans);
+    rect.setY(r.y() + (int)ytrans);
+#endif
+
     if (!isEnabled(o))
         flags |= wxCONTROL_DISABLED;
@@ -267 +290 @@
     
     if (part == PushButtonPart || part == ButtonPart)
-        wxRendererNative::Get().DrawPushButton(window, *dc, r, flags);
+        wxRendererNative::Get().DrawPushButton(window, *dc, rect, flags);
     else if(part == RadioPart) {
         if (isChecked(o))
             flags |= wxCONTROL_CHECKED;
 #if wxCHECK_VERSION(2,9,0)
-        wxRendererNative::Get().DrawRadioButton(window, *dc, r, flags);
-#else
-        wxRenderer_DrawRadioButton(window, *dc, r, flags);
+        wxRendererNative::Get().DrawRadioButton(window, *dc, rect, flags);
+#else
+        wxRenderer_DrawRadioButton(window, *dc, rect, flags);
 #endif
     }
@@ -280 +303 @@
         if (isChecked(o))
             flags |= wxCONTROL_CHECKED;
-        wxRendererNative::Get().DrawCheckBox(window, *dc, r, flags);
+        wxRendererNative::Get().DrawCheckBox(window, *dc, rect, flags);
     }
     return false;
@@ -292 +315 @@
 bool RenderThemeWx::paintTextField(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r)
 {
-    wxWindow* window = o->view()->frameView()->platformWidget();
+    wxWindow* window = nativeWindowForRenderObject(o);
     wxDC* dc = static_cast<wxDC*>(i.context->platformContext());
 #if wxCHECK_VERSION(2,9,0)
@@ -314 +337 @@
 bool RenderThemeWx::paintMenuList(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r)
 {
-    wxWindow* window = o->view()->frameView()->platformWidget();
+    wxWindow* window = nativeWindowForRenderObject(o);
     wxDC* dc = static_cast<wxDC*>(i.context->platformContext());
     
@@ -343 +366 @@
 bool RenderThemeWx::paintMenuListButton(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r)
 {
-    wxWindow* window = o->view()->frameView()->platformWidget();
+    wxWindow* window = nativeWindowForRenderObject(o);
     wxDC* dc = static_cast<wxDC*>(i.context->platformContext());
     

trunk/WebCore/platform/wx/TemporaryLinkStubs.cpp

@@ -114 +114 @@
 void Image::drawPattern(GraphicsContext*, const FloatRect& srcRect, const TransformationMatrix& patternTransform, const FloatPoint& phase, CompositeOperator, const FloatRect& destRect) { notImplemented(); } 
 
-ScrollbarTheme* ScrollbarTheme::nativeTheme() { notImplemented(); static ScrollbarTheme theme; return &theme; }
-
 String FileChooser::basenameForWidth(const Font&, int width) const { notImplemented(); return String(); }
 
@@ -126 +124 @@
 void Editor::showFontPanel() { notImplemented(); }
 void Editor::showStylesPanel() { notImplemented(); }
-
-bool EventHandler::tabsToAllControls(KeyboardEvent* event) const { notImplemented(); return false; }
-bool EventHandler::passSubframeEventToSubframe(MouseEventWithHitTestResults&, Frame* subframe, HitTestResult*) { notImplemented(); return false; }
-bool EventHandler::passMouseDownEventToWidget(Widget*) { notImplemented(); return false; }
-bool EventHandler::passWheelEventToWidget(PlatformWheelEvent&, Widget*) { notImplemented(); return false; }
 
 void SearchPopupMenu::saveRecentSearches(const AtomicString& name, const Vector<String>& searchItems) { notImplemented(); }

trunk/WebCore/platform/wx/wxcode/win/non-kerned-drawing.cpp

@@ -80 +80 @@
     // get the native HDC handle to draw using native APIs
     HDC hdc = 0;
+    float y = point.y() - font->ascent();
+    float x = point.x();
+
 #if USE(WXGC)
+    // when going from GdiPlus -> Gdi, any GdiPlus transformations are lost
+    // so we need to alter the coordinates to reflect their transformed point.
+    double xtrans = 0;
+    double ytrans = 0;
+    
     wxGraphicsContext* gc = dc->GetGraphicsContext();
+    gc->GetTransform().TransformPoint(&xtrans, &ytrans);
     Gdiplus::Graphics* g;
     if (gc) {
@@ -87 +96 @@
         hdc = g->GetHDC();
     }
+    x += (int)xtrans;
+    y += (int)ytrans;    
 #else
     hdc = static_cast<HDC>(dc->GetHDC());
@@ -95 +106 @@
     const GlyphBufferGlyph*   glyphs   = glyphBuffer.glyphs(from);
     const GlyphBufferAdvance* advances = glyphBuffer.advances(from);
-
-    float y = point.y() - font->ascent();
-    float x = point.x();
 
     int* spacing = new int[numGlyphs - from];

trunk/WebCore/webcore-wx.bkl

@@ -112 +112 @@
                 platform/wx/wxcode/gtk/fontprops.cpp
                 platform/wx/wxcode/gtk/non-kerned-drawing.cpp
+                platform/wx/wxcode/gtk/scrollbar_render.cpp
                 platform/wx/SharedTimerWx.cpp
             </if>
@@ -118 +119 @@
                 platform/wx/wxcode/mac/carbon/fontprops.cpp
                 platform/wx/wxcode/mac/carbon/non-kerned-drawing.cpp
+                platform/wx/wxcode/mac/carbon/scrollbar_render.cpp
                 platform/wx/SharedTimerWx.cpp
             </if>
@@ -123 +125 @@
                 platform/wx/wxcode/win/fontprops.cpp
                 platform/wx/wxcode/win/non-kerned-drawing.cpp
+                platform/wx/wxcode/win/scrollbar_render.cpp
                 <!-- grab the windows port's SharedTimer implementation -->
                 platform/win/SharedTimerWin.cpp

trunk/WebKit/wx/ChangeLog

@@ +1 @@
+2009-09-03  Kevin Watters  <kevinwatters@gmail.com>
+
+        Reviewed by Kevin Ollivier.
+
+        [wx] Frames support
+        https://bugs.webkit.org/show_bug.cgi?id=19041
+
+        * WebFrame.cpp:
+        (wxWebFrame::wxWebFrame):
+        (wxWebFrame::~wxWebFrame):
+        (wxWebFrame::GetFrame):
+        * WebFrame.h:
+        * WebFramePrivate.h:
+        * WebKitSupport/ChromeClientWx.cpp:
+        (WebCore::ChromeClientWx::platformWindow):
+        (WebCore::ChromeClientWx::scroll):
+        * WebKitSupport/EditorClientWx.cpp:
+        (WebCore::EditorClientWx::isEditable):
+        (WebCore::EditorClientWx::registerCommandForUndo):
+        (WebCore::EditorClientWx::registerCommandForRedo):
+        (WebCore::EditorClientWx::clearUndoRedoOperations):
+        (WebCore::EditorClientWx::canUndo):
+        (WebCore::EditorClientWx::canRedo):
+        (WebCore::EditorClientWx::undo):
+        (WebCore::EditorClientWx::redo):
+        * WebKitSupport/FrameLoaderClientWx.cpp:
+        (WebCore::FrameLoaderClientWx::FrameLoaderClientWx):
+        (WebCore::FrameLoaderClientWx::setFrame):
+        (WebCore::FrameLoaderClientWx::dispatchWillSubmitForm):
+        (WebCore::FrameLoaderClientWx::frameLoaderDestroyed):
+        (WebCore::FrameLoaderClientWx::committedLoad):
+        (WebCore::FrameLoaderClientWx::dispatchDecidePolicyForMIMEType):
+        (WebCore::FrameLoaderClientWx::dispatchDecidePolicyForNewWindowAction):
+        (WebCore::FrameLoaderClientWx::dispatchDecidePolicyForNavigationAction):
+        (WebCore::FrameLoaderClientWx::createFrame):
+        (WebCore::FrameLoaderClientWx::transitionToCommittedForNewPage):
+        * WebKitSupport/FrameLoaderClientWx.h:
+        * WebView.h:
+        * WebViewPrivate.h:
+
 2009-09-02  Kevin Ollivier  <kevino@theolliviers.com>
 

trunk/WebKit/wx/WebFrame.cpp

@@ -75 +75 @@
     m_isEditable(false),
     m_isInitialized(false),
-    m_beingDestroyed(false),
-    m_title(wxEmptyString)
+    m_beingDestroyed(false)
 {
 
@@ -88 +87 @@
     
     WebCore::FrameLoaderClientWx* loaderClient = new WebCore::FrameLoaderClientWx();
-    
-    m_impl->frame = WebCore::Frame::create(container->m_impl->page, parentFrame, loaderClient);
-    m_impl->frame->deref();
-
-    loaderClient->setFrame(m_impl->frame.get());
+    RefPtr<WebCore::Frame> newFrame = WebCore::Frame::create(container->m_impl->page, parentFrame, loaderClient);
+
+    m_impl->frame = newFrame.get();
+
+    loaderClient->setFrame(this);
     loaderClient->setWebView(container);
     
+    if (data && data->ownerElement)
+        m_impl->frame->ref();
+
     m_impl->frame->init();
         
@@ -102 +104 @@
 wxWebFrame::~wxWebFrame()
 {
-    m_impl->frame->loader()->detachFromParent();
+    if (m_impl)
+        delete m_impl;
 }
 
@@ -108 +111 @@
 {
     if (m_impl)
-        return m_impl->frame.get();
+        return m_impl->frame;
         
     return 0;

trunk/WebKit/wx/WebFrame.h

@@ -147 +147 @@
     void MakeEditable(bool enable);
     bool IsEditable() const { return m_isEditable; }
-
-    wxString GetPageTitle() const { return m_title; }
-    void SetPageTitle(const wxString& title) { m_title = title; }
     
     WebCore::Frame* GetFrame();
@@ -161 +158 @@
     bool m_beingDestroyed;
     WebFramePrivate* m_impl;
-    wxString m_title;
     
 };

trunk/WebKit/wx/WebFramePrivate.h

@@ -31 +31 @@
 
 #include "config.h"
-#include "EditCommand.h"
-#include "EditCommandWx.h"
 #include "Frame.h"
-#include "wtf/RefPtr.h"
-#include "wtf/Vector.h"
+#include "HTMLFrameOwnerElement.h"
+#include "KURL.h"
 
 class WebFramePrivate {
@@ -43 +41 @@
             frame(0)
     {}
+    
+    WebCore::Frame* frame;
+};
 
-    WTF::Vector<EditCommandWx> undoStack;
-    WTF::Vector<EditCommandWx> redoStack;
+class WebViewFrameData
+{
+public:
+    WebCore::KURL url;
+    WebCore::String name;
+    WebCore::HTMLFrameOwnerElement* ownerElement;
     
-    WTF::RefPtr<WebCore::Frame> frame;
+    WebCore::String referrer;
+    bool allowsScrolling;
+    int marginWidth;
+    int marginHeight;    
 };
 

trunk/WebKit/wx/WebKitSupport/ChromeClientWx.cpp

@@ -341 +341 @@
 PlatformWidget ChromeClientWx::platformWindow() const
 {
-    return 0;
+    return m_webView;
 }
 
@@ -394 +394 @@
 void ChromeClientWx::scroll(const IntSize&, const IntRect&, const IntRect&)
 {
+    m_webView->Refresh();
     notImplemented();
 }

trunk/WebKit/wx/WebKitSupport/EditorClientWx.cpp

@@ -203 +203 @@
 
     if (frame) {
-        wxWebView* webKitWin = dynamic_cast<wxWebView*>(frame->view()->platformWidget());
+        wxWebView* webKitWin = dynamic_cast<wxWebView*>(frame->view()->hostWindow()->platformWindow());
         if (webKitWin) 
             return webKitWin->IsEditable();
@@ -286 +286 @@
 
     if (frame) {
-        wxWebView* webKitWin = dynamic_cast<wxWebView*>(frame->view()->platformWidget());
+        wxWebView* webKitWin = dynamic_cast<wxWebView*>(frame->view()->hostWindow()->platformWindow());
         if (webKitWin) {
-            webKitWin->GetMainFrame()->m_impl->undoStack.append(EditCommandWx(command));
+            webKitWin->m_impl->undoStack.append(EditCommandWx(command));
         }
     }
@@ -298 +298 @@
 
     if (frame) {
-        wxWebView* webKitWin = dynamic_cast<wxWebView*>(frame->view()->platformWidget());
+        wxWebView* webKitWin = dynamic_cast<wxWebView*>(frame->view()->hostWindow()->platformWindow());
         if (webKitWin) {
-            webKitWin->GetMainFrame()->m_impl->redoStack.insert(0, EditCommandWx(command));
+            webKitWin->m_impl->redoStack.insert(0, EditCommandWx(command));
         }
     }
@@ -307 +307 @@
 void EditorClientWx::clearUndoRedoOperations()
 {
-    notImplemented();
+    Frame* frame = m_page->focusController()->focusedOrMainFrame();
+    
+    if (frame) {
+        wxWebView* webKitWin = dynamic_cast<wxWebView*>(frame->view()->hostWindow()->platformWindow());
+        if (webKitWin) {
+            webKitWin->m_impl->redoStack.clear();
+            webKitWin->m_impl->undoStack.clear();
+        }
+    }
 }
 
@@ -315 +323 @@
 
     if (frame) {
-        wxWebView* webKitWin = dynamic_cast<wxWebView*>(frame->view()->platformWidget());
-        if (webKitWin && webKitWin->GetMainFrame()) {
-            return webKitWin->GetMainFrame()->m_impl->undoStack.size() != 0;
+        wxWebView* webKitWin = dynamic_cast<wxWebView*>(frame->view()->hostWindow()->platformWindow());
+        if (webKitWin) {
+            return webKitWin->m_impl->undoStack.size() != 0;
         }
     }
@@ -328 +336 @@
 
     if (frame) {
-        wxWebView* webKitWin = dynamic_cast<wxWebView*>(frame->view()->platformWidget());
-        if (webKitWin && webKitWin->GetMainFrame()) {
-            return webKitWin->GetMainFrame()->m_impl->redoStack.size() != 0;
+        wxWebView* webKitWin = dynamic_cast<wxWebView*>(frame->view()->hostWindow()->platformWindow());
+        if (webKitWin && webKitWin) {
+            return webKitWin->m_impl->redoStack.size() != 0;
         }
     }
@@ -341 +349 @@
 
     if (frame) {
-        wxWebView* webKitWin = dynamic_cast<wxWebView*>(frame->view()->platformWidget());
-        if (webKitWin && webKitWin->GetMainFrame()) {
-            webKitWin->GetMainFrame()->m_impl->undoStack.last().editCommand()->unapply();
-            webKitWin->GetMainFrame()->m_impl->undoStack.removeLast();
+        wxWebView* webKitWin = dynamic_cast<wxWebView*>(frame->view()->hostWindow()->platformWindow());
+        if (webKitWin) {
+            webKitWin->m_impl->undoStack.last().editCommand()->unapply();
+            webKitWin->m_impl->undoStack.removeLast();
         }
     }
@@ -353 +361 @@
     Frame* frame = m_page->focusController()->focusedOrMainFrame();
 
-    if (frame) {
-        wxWebView* webKitWin = dynamic_cast<wxWebView*>(frame->view()->platformWidget());
-        if (webKitWin && webKitWin->GetMainFrame()) {
-            webKitWin->GetMainFrame()->m_impl->redoStack.first().editCommand()->reapply();
-            webKitWin->GetMainFrame()->m_impl->redoStack.remove(0);
+    if (frame) {    
+        wxWebView* webKitWin = dynamic_cast<wxWebView*>(frame->view()->hostWindow()->platformWindow());
+        if (webKitWin) {
+            webKitWin->m_impl->redoStack.first().editCommand()->reapply();
+            webKitWin->m_impl->redoStack.remove(0);
         }
     }

trunk/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp

@@ -49 +49 @@
 #include "ScriptController.h"
 #include "ScriptString.h"
+#include <wtf/PassRefPtr.h>
+#include <wtf/RefPtr.h>
 
 #include <stdio.h>
 
 #include "WebFrame.h"
+#include "WebFramePrivate.h"
 #include "WebView.h"
 #include "WebViewPrivate.h"
@@ -78 +81 @@
 
 FrameLoaderClientWx::FrameLoaderClientWx()
-    : m_frame(0)
+    : m_webFrame(0)
 {
 }
@@ -87 +90 @@
 }
 
-void FrameLoaderClientWx::setFrame(Frame *frame)
-{
-    m_frame = frame;
+void FrameLoaderClientWx::setFrame(wxWebFrame *frame)
+{
+    m_webFrame = frame;
+    m_frame = m_webFrame->m_impl->frame;
 }
 
@@ -95 +99 @@
 {
     m_webView = webview;
-}
-
-void FrameLoaderClientWx::detachFrameLoader()
-{
-    m_frame = 0;
 }
 
@@ -340 +339 @@
 {
     // FIXME: Send an event to allow for alerts and cancellation
-    if (!m_frame)
+    if (!m_webFrame)
         return;
     (m_frame->loader()->*function)(PolicyUse);
@@ -506 +505 @@
 void FrameLoaderClientWx::frameLoaderDestroyed()
 {
+    if (m_webFrame)
+        delete m_webFrame;
+    m_webFrame = 0;
     m_frame = 0;
     delete this;
@@ -554 +556 @@
 void FrameLoaderClientWx::committedLoad(WebCore::DocumentLoader* loader, const char* data, int length)
 {
-    if (!m_frame)
+    if (!m_webFrame)
         return;
     FrameLoader* fl = loader->frameLoader();
@@ -694 +696 @@
 void FrameLoaderClientWx::dispatchDecidePolicyForMIMEType(FramePolicyFunction function, const String& mimetype, const ResourceRequest& request)
 {
-    if (!m_frame)
+    if (!m_webFrame)
         return;
     
@@ -703 +705 @@
 void FrameLoaderClientWx::dispatchDecidePolicyForNewWindowAction(FramePolicyFunction function, const NavigationAction&, const ResourceRequest& request, PassRefPtr<FormState>, const String& targetName)
 {
-    if (!m_frame)
+    if (!m_webFrame)
         return;
 
@@ -723 +725 @@
 void FrameLoaderClientWx::dispatchDecidePolicyForNavigationAction(FramePolicyFunction function, const NavigationAction& action, const ResourceRequest& request, PassRefPtr<FormState>)
 {
-    if (!m_frame)
+    if (!m_webFrame)
         return;
         
@@ -753 +755 @@
                                    const String& referrer, bool allowsScrolling, int marginWidth, int marginHeight)
 {
-/*
-    FIXME: Temporarily disabling code for loading subframes. While most 
-    (i)frames load and are destroyed properly, the iframe created by
-    google.com in its new homepage does not get destroyed when 
-    document()->detach() is called, as other (i)frames do. It is destroyed on 
-    app shutdown, but until that point, this 'in limbo' frame will do things
-    like steal keyboard focus and crash when clicked on. (On some platforms,
-    it is actually a visible object, even though it's not in a valid state.)
-    
-    Since just about every user is probably going to test against Google at 
-    some point, I'm disabling this functionality until I have time to track down
-    why it is not being destroyed.
-*/
-
-/*
-    wxWindow* parent = m_webView;
-
     WebViewFrameData* data = new WebViewFrameData();
     data->name = name;
@@ -775 +760 @@
     data->url = url;
     data->referrer = referrer;
+    data->allowsScrolling = allowsScrolling;
     data->marginWidth = marginWidth;
     data->marginHeight = marginHeight;
 
-    wxWebView* newWin = new wxWebView(parent, -1, wxDefaultPosition, wxDefaultSize, data);
-
-    RefPtr<Frame> childFrame = newWin->m_impl->frame;
-
-    // FIXME: All of the below should probably be moved over into WebCore
+    wxWebFrame* newFrame = new wxWebFrame(m_webView, m_webFrame, data);
+
+    RefPtr<Frame> childFrame = adoptRef(newFrame->m_impl->frame);
+
+    m_frame->tree()->appendChild(childFrame);
     childFrame->tree()->setName(name);
-    m_frame->tree()->appendChild(childFrame);
-    // ### set override encoding if we have one
-
-    FrameLoadType loadType = m_frame->loader()->loadType();
-    FrameLoadType childLoadType = FrameLoadTypeInternal;
-
-    childFrame->loader()->load(url, referrer, childLoadType,
-                            String(), 0, 0);
+    childFrame->init();
+
+    // The creation of the frame may have run arbitrary JavaScript that removed it from the page already.
+    if (!childFrame->page())
+        return 0;
+
+    childFrame->loader()->loadURLIntoChildFrame(url, referrer, childFrame.get());
     
     // The frame's onload handler may have removed it from the document.
@@ -797 +782 @@
         return 0;
     
-    delete data;
-    
-    return childFrame.get();
-*/
-    notImplemented();
-    return 0;
+    return childFrame.release();
 }
 
@@ -881 +861 @@
 void FrameLoaderClientWx::transitionToCommittedForNewPage()
 { 
+    ASSERT(m_webFrame);
     ASSERT(m_frame);
     ASSERT(m_webView);
     
-    Page* page = m_frame->page();
-    ASSERT(page);
-
-    bool isMainFrame = m_frame == page->mainFrame();
-
-    m_frame->setView(0);
-
-    RefPtr<FrameView> frameView;
-    if (isMainFrame)
-        frameView = FrameView::create(m_frame, IntRect(m_webView->GetRect()).size());
-    else
-        frameView = FrameView::create(m_frame);
-
-    ASSERT(frameView);
-    m_frame->setView(frameView);
-
-    frameView->setPlatformWidget(m_webView);
-
-    if (HTMLFrameOwnerElement* owner = m_frame->ownerElement())
-        m_frame->view()->setScrollbarModes(owner->scrollingMode(), owner->scrollingMode());
-}
-
-}
+    IntSize size = IntRect(m_webView->GetRect()).size();
+    // FIXME: This value should be gotten from m_webView->IsTransparent();
+    // but transitionToCommittedForNewPage() can be called while m_webView is
+    // still being initialized.
+    bool transparent = false;
+    Color backgroundColor = transparent ? WebCore::Color::transparent : WebCore::Color::white;
+    
+    if (m_frame)
+        m_frame->createView(size, backgroundColor, transparent, IntSize(), false); 
+}
+
+}

trunk/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h

@@ -34 +34 @@
 #include "ResourceResponse.h"
 
+class wxWebFrame;
 class wxWebView;
 
@@ -52 +53 @@
         FrameLoaderClientWx();
         ~FrameLoaderClientWx();
-        void setFrame(Frame *frame);
+        void setFrame(wxWebFrame *frame);
         void setWebView(wxWebView *webview);
-        virtual void detachFrameLoader();
 
         virtual bool hasWebView() const; // mainly for assertions
@@ -208 +208 @@
 
     private:
-        Frame *m_frame;
+        wxWebFrame *m_webFrame;
+        Frame* m_frame;
         wxWebView *m_webView;
         ResourceResponse m_response;

trunk/WebKit/wx/WebView.cpp

@@ -235 +235 @@
     EVT_SET_FOCUS(wxWebView::OnSetFocus)
     EVT_KILL_FOCUS(wxWebView::OnKillFocus)
-    EVT_ACTIVATE(wxWebView::OnActivate)
 END_EVENT_TABLE()
 
@@ -267 +266 @@
     if ( (style & wxBORDER_MASK) == 0)
         style |= wxBORDER_NONE;
-    style |= wxHSCROLL | wxVSCROLL;
     
     if (!wxWindow::Create(parent, id, position, size, style, name))
@@ -316 +314 @@
     m_beingDestroyed = true;
     
-    delete m_mainFrame;
+    if (m_mainFrame && m_mainFrame->GetFrame())
+        m_mainFrame->GetFrame()->loader()->detachFromParent();
     
     delete m_impl->page;
@@ -488 +487 @@
 void wxWebView::OnPaint(wxPaintEvent& event)
 {
-    
     if (m_beingDestroyed || !m_mainFrame)
         return;
-    
+
+    // WebView active state is based on TLW active state.
+    wxTopLevelWindow* tlw = dynamic_cast<wxTopLevelWindow*>(wxGetTopLevelParent(this));
+    if (tlw && tlw->IsActive())
+        m_impl->page->focusController()->setActive(true);
+    else {
+        m_impl->page->focusController()->setActive(false);
+    }
     WebCore::Frame* frame = m_mainFrame->GetFrame();
     if (!frame || !frame->view())
@@ -505 +510 @@
         if (dc.IsOk()) {
             wxRect paintRect = GetUpdateRegion().GetBox();
-
-            WebCore::IntSize offset = frame->view()->scrollOffset();
-#if USE(WXGC)
-            gcdc.SetDeviceOrigin(-offset.width(), -offset.height());
-#endif
-            dc.SetDeviceOrigin(-offset.width(), -offset.height());
-            paintRect.Offset(offset.width(), offset.height());
 
 #if USE(WXGC)
@@ -519 +517 @@
 #endif
             if (frame->contentRenderer()) {
-                if (frame->view()->needsLayout())
-                    frame->view()->layout();
-
-                frame->view()->paintContents(&gc, paintRect);
+                frame->view()->layoutIfNeededRecursive();
+                frame->view()->paint(&gc, paintRect);
             }
         }
@@ -540 +536 @@
     if (m_isInitialized && m_mainFrame) {
         WebCore::Frame* frame = m_mainFrame->GetFrame();
-        frame->eventHandler()->sendResizeEvent();
-        frame->view()->layout();
-        frame->view()->adjustScrollbars();
+        frame->view()->setFrameRect(wxRect(wxPoint(0,0), event.GetSize()));
+        frame->view()->forceLayout();
+        frame->view()->adjustViewSize();
     }
       
@@ -561 +557 @@
     event.Skip();
     
-    if (m_beingDestroyed)
-        return;
-    
-    if (!m_mainFrame)
+    if (!m_impl->page)
         return; 
         
@@ -612 +605 @@
     wxPoint localEventPoint = ScreenToClient(event.GetPosition());
 
-    if (!m_mainFrame)
+    if (!m_impl->page)
         return;
         
-    WebCore::Frame* focusedFrame = m_mainFrame->GetFrame();
+    WebCore::Frame* focusedFrame = m_impl->page->focusController()->focusedOrMainFrame();
     if (!focusedFrame->view())
         return;
@@ -695 +688 @@
 {
     WebCore::Frame* frame = 0;
-    if (m_mainFrame)
-        frame = m_mainFrame->GetFrame();
+    if (m_impl->page)
+        frame = m_impl->page->focusController()->focusedOrMainFrame();
 
     if (!(frame && frame->view()))
@@ -837 +830 @@
         
     if (frame) {
-        m_impl->page->focusController()->setActive(true);
         frame->selection()->setFocused(true);
     }
@@ -851 +843 @@
         
     if (frame) {
-        m_impl->page->focusController()->setActive(false);
         frame->selection()->setFocused(false);
     }
@@ -857 +848 @@
 }
 
-void wxWebView::OnActivate(wxActivateEvent& event)
-{
-    if (m_impl->page)
-        m_impl->page->focusController()->setActive(event.GetActive());
-
-    event.Skip();
-}
-
 wxWebViewDOMElementInfo wxWebView::HitTest(const wxPoint& pos) const
 {

trunk/WebKit/wx/WebView.h

@@ -172 +172 @@
     void OnSetFocus(wxFocusEvent& event);
     void OnKillFocus(wxFocusEvent& event);
-    void OnActivate(wxActivateEvent& event);
     
 private:

trunk/WebKit/wx/WebViewPrivate.h

@@ -31 +31 @@
 
 #include "config.h"
-#include "HTMLFrameOwnerElement.h"
+#include "EditCommand.h"
+#include "EditCommandWx.h"
 #include "Page.h"
-#include "wtf/RefPtr.h"
-#include "KURL.h"
+#include "wtf/Vector.h"
 
 #include <wx/timer.h>
@@ -49 +49 @@
     wxTimer tripleClickTimer;
     wxPoint tripleClickPos;
-};
-
-class WebViewFrameData
-{
-public:
-    WebCore::KURL url;
-    WebCore::String name;
-    WebCore::HTMLFrameOwnerElement* ownerElement;
     
-    WebCore::String referrer;
-    bool allowsScrolling;
-    int marginWidth;
-    int marginHeight;    
+    WTF::Vector<EditCommandWx> undoStack;
+    WTF::Vector<EditCommandWx> redoStack;
 };
 

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-09-03  Kevin Watters  <kevinwatters@gmail.com>
+
+        Reviewed by Kevin Ollivier.
+
+        [wx] Frames support
+        https://bugs.webkit.org/show_bug.cgi?id=19041
+
+        * wx/build-wxwebkit:
+
 2009-09-02  David Kilzer  <ddkilzer@apple.com>
 

trunk/WebKitTools/wx/build-wxwebkit

@@ -369 +369 @@
                 PY_LIBDIR="$PY_LIBDIR\\Libs"
                 PY_LIB=`python -c "import sys; sys.stdout.write('python' + sys.version[:3])"`
-                PY_LIB=`python -c "sys.stdout.write('$PY_LIB'.replace('.', ''))"`
+                PY_LIB=`python -c "import sys; sys.stdout.write('$PY_LIB'.replace('.', ''))"`
             else
                 PY_LIB=`python-config --libs`