2009-03-29 Darin Adler <darin@apple.com>
authordarin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 29 Mar 2009 18:00:36 +0000 (18:00 +0000)
committerdarin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 29 Mar 2009 18:00:36 +0000 (18:00 +0000)
        Try to fix Qt build.

        * WebCoreSupport/EditorClientQt.cpp: Added include of HTMLElement.h.

        * WebCoreSupport/FrameLoaderClientQt.cpp: Added include of FormState.h.
        (WebCore::FrameLoaderClientQt::prepareForDataSourceReplacement):
        Removed unneeded call to detachChildren, which is called by FrameLoader
        right after this.
        (WebCore::FrameLoaderClientQt::createFrame): Use loadURLIntoChildFrame
        as other platforms do in the corresponding functions.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@42086 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKit/qt/ChangeLog
WebKit/qt/WebCoreSupport/EditorClientQt.cpp
WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

index 942b292..f118789 100644 (file)
@@ -1,3 +1,16 @@
+2009-03-29  Darin Adler  <darin@apple.com>
+
+        Try to fix Qt build.
+
+        * WebCoreSupport/EditorClientQt.cpp: Added include of HTMLElement.h.
+
+        * WebCoreSupport/FrameLoaderClientQt.cpp: Added include of FormState.h.
+        (WebCore::FrameLoaderClientQt::prepareForDataSourceReplacement):
+        Removed unneeded call to detachChildren, which is called by FrameLoader
+        right after this.
+        (WebCore::FrameLoaderClientQt::createFrame): Use loadURLIntoChildFrame
+        as other platforms do in the corresponding functions.
+
 2009-03-27  Erik L. Bunce  <elbunce@xendom.com>
 
         Reviewed by Simon Hausmann.
index a688779..f38ee1b 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2006 Zack Rusin <zack@kde.org>
- * Copyright (C) 2006, 2008 Apple Computer, Inc.
+ * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
  *
  * All rights reserved.
 #include "qwebpage.h"
 #include "qwebpage_p.h"
 
+#include "CSSStyleDeclaration.h"
 #include "Document.h"
 #include "EditCommandQt.h"
-#include "Page.h"
 #include "Editor.h"
 #include "FocusController.h"
 #include "Frame.h"
+#include "HTMLElement.h"
 #include "KeyboardCodes.h"
 #include "KeyboardEvent.h"
+#include "NotImplemented.h"
+#include "Page.h"
 #include "Page.h"
 #include "PlatformKeyboardEvent.h"
-#include "NotImplemented.h"
-#include "Node.h"
 #include "Range.h"
 
 #include <stdio.h>
index 025bd4f..c4bcd16 100644 (file)
@@ -32,6 +32,7 @@
 #include "config.h"
 #include "CSSComputedStyleDeclaration.h"
 #include "CSSPropertyNames.h"
+#include "FormState.h"
 #include "FrameLoaderClientQt.h"
 #include "FrameTree.h"
 #include "FrameView.h"
@@ -565,7 +566,6 @@ void FrameLoaderClientQt::didFinishLoad()
 
 void FrameLoaderClientQt::prepareForDataSourceReplacement()
 {
-    m_frame->loader()->detachChildren();
 }
 
 void FrameLoaderClientQt::setTitle(const String&, const KURL&)
@@ -983,7 +983,7 @@ PassRefPtr<Frame> FrameLoaderClientQt::createFrame(const KURL& url, const String
     FrameLoadType loadType = m_frame->loader()->loadType();
     FrameLoadType childLoadType = FrameLoadTypeRedirectWithLockedBackForwardList;
 
-    childFrame->loader()->loadURL(frameData.url, frameData.referrer, String(), false, childLoadType, 0, 0);
+    childFrame->loader()->loadURLIntoChildFrame(frameData.url, frameData.referrer, childFrame.get());
 
     // The frame's onload handler may have removed it from the document.
     if (!childFrame->tree()->parent())