Commit 3e7c4ace authored by bdash's avatar bdash

2006-11-12 Mark Rowe <bdash@webkit.org>

        Reviewed by Mitz.

        Linux/Gdk compilation fixes, and bakefile cleanups.  Based on patches by
        Alp Toker.

        * Projects/gdk/webcore-gdk.bkl:
        * WebCoreSources.bkl:
        * page/PageState.cpp:
        * platform/gdk/ChromeClientGdk.h:
        (WebCore::ChromeClientGdk::ref):
        (WebCore::ChromeClientGdk::deref):
        * platform/gdk/FrameGdk.cpp:
        (WebCore::FrameGdkClientDefault::openURL):
        (WebCore::FrameGdkClientDefault::didReceiveData):
        (WebCore::FrameGdkClientDefault::receivedAllData):
        (WebCore::FrameGdk::FrameGdk):
        (WebCore::FrameGdk::~FrameGdk):
        * platform/gdk/FrameGdk.h:
        * platform/gdk/KeyEventGdk.cpp:
        (WebCore::keyIdentifierForGdkKeyCode):
        * platform/gdk/ScreenClientGdk.h: Removed.
        * platform/gdk/TemporaryLinkStubs.cpp:
        (FrameGdk::canPaste):
        (FrameGdk::originalRequestURL):
        (TextField::TextField):
        * platform/network/gdk/ResourceHandleManager.cpp:
        (WebCore::ResourceHandleManager::downloadTimerCallback):
        (WebCore::ResourceHandleManager::add):
        (WebCore::ResourceHandleManager::cancel):
        * webcore-base.bkl:
2006-11-12  Mark Rowe  <bdash@webkit.org>

        Reviewed by Mitz.

        Clean up of JavaScriptCore bakefiles.

        * JavaScriptCoreSources.bkl:
        * jscore.bkl:
2006-11-12  Mark Rowe  <bdash@webkit.org>

        Reviewed by Mitz.

        Clean up of GdkLauncher bakefile.

        * GdkLauncher/gdklauncher.bkl:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@17741 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 58e230ca
2006-11-12 Mark Rowe <bdash@webkit.org>
Reviewed by Mitz.
Clean up of JavaScriptCore bakefiles.
* JavaScriptCoreSources.bkl:
* jscore.bkl:
2006-11-11 Alexey Proskuryakov <ap@webkit.org> 2006-11-11 Alexey Proskuryakov <ap@webkit.org>
Reviewed by Maciej. Reviewed by Maciej.
......
<?xml version="1.0" ?> <?xml version="1.0" ?>
<makefile> <makefile>
<set append="1" var="JSCORE_SOURCES_KJS"> <set append="1" var="JSCORE_SOURCES_KJS">
DerivedSources/JavaScriptCore/grammar.cpp
kjs/Context.cpp
kjs/DateMath.cpp
kjs/ExecState.cpp
kjs/JSImmediate.cpp
kjs/JSLock.cpp
kjs/JSWrapperObject.cpp
kjs/Parser.cpp
kjs/PropertyNameArray.cpp
kjs/array_object.cpp
kjs/bool_object.cpp
kjs/collector.cpp
kjs/date_object.cpp
kjs/debugger.cpp
kjs/dtoa.cpp
kjs/error_object.cpp
kjs/fpconst.cpp
kjs/function.cpp
kjs/function_object.cpp
kjs/identifier.cpp
kjs/internal.cpp
kjs/interpreter.cpp
kjs/lexer.cpp
kjs/list.cpp
kjs/lookup.cpp
kjs/math_object.cpp
kjs/nodes.cpp
kjs/nodes2string.cpp
kjs/number_object.cpp
kjs/object.cpp
kjs/object_object.cpp
kjs/operations.cpp
kjs/property_map.cpp
kjs/property_slot.cpp
kjs/regexp.cpp
kjs/regexp_object.cpp
kjs/scope_chain.cpp
kjs/string_object.cpp
kjs/testkjs.cpp
kjs/ustring.cpp
kjs/value.cpp
</set>
DerivedSources/JavaScriptCore/grammar.cpp <set append="1" var="JSCORE_SOURCES_WTF">
kjs/array_object.cpp wtf/Assertions.cpp
kjs/bool_object.cpp wtf/FastMalloc.cpp
kjs/collector.cpp wtf/HashTable.cpp
kjs/Context.cpp </set>
kjs/DateMath.cpp
kjs/date_object.cpp
kjs/debugger.cpp
kjs/dtoa.cpp
kjs/error_object.cpp
kjs/ExecState.cpp
kjs/fpconst.cpp
kjs/function.cpp
kjs/function_object.cpp
kjs/identifier.cpp
kjs/internal.cpp
kjs/interpreter.cpp
kjs/JSImmediate.cpp
kjs/JSLock.cpp
kjs/JSWrapperObject.cpp
kjs/lexer.cpp
kjs/list.cpp
kjs/lookup.cpp
kjs/math_object.cpp
kjs/nodes2string.cpp
kjs/nodes.cpp
kjs/number_object.cpp
kjs/object.cpp
kjs/object_object.cpp
kjs/operations.cpp
kjs/Parser.cpp
kjs/property_map.cpp
kjs/PropertyNameArray.cpp
kjs/property_slot.cpp
kjs/regexp.cpp
kjs/regexp_object.cpp
kjs/scope_chain.cpp
kjs/string_object.cpp
kjs/testkjs.cpp
kjs/ustring.cpp
kjs/value.cpp
</set> <set append="1" var="JSCORE_SOURCES_PCRE">
<set append="1" var="JSCORE_SOURCES_WTF"> pcre/pcre_compile.c
pcre/pcre_config.c
wtf/Assertions.cpp pcre/pcre_exec.c
wtf/FastMalloc.cpp pcre/pcre_fullinfo.c
wtf/HashTable.cpp pcre/pcre_get.c
pcre/pcre_globals.c
</set> pcre/pcre_info.c
<set append="1" var="JSCORE_SOURCES_PCRE"> pcre/pcre_maketables.c
pcre/pcre_ord2utf8.c
pcre/pcre_compile.c pcre/pcre_printint.c
pcre/pcre_config.c pcre/pcre_refcount.c
pcre/pcre_exec.c pcre/pcre_study.c
pcre/pcre_fullinfo.c pcre/pcre_tables.c
pcre/pcre_get.c pcre/pcre_try_flipped.c
pcre/pcre_globals.c pcre/pcre_ucp_findchar.c
pcre/pcre_info.c pcre/pcre_version.c
pcre/pcre_maketables.c pcre/pcre_xclass.c
pcre/pcre_ord2utf8.c pcre/ucp_findchar.c
pcre/pcre_printint.c </set>
pcre/pcre_refcount.c
pcre/pcre_study.c
pcre/pcre_tables.c
pcre/pcre_try_flipped.c
pcre/pcre_ucp_findchar.c
pcre/pcre_version.c
pcre/pcre_xclass.c
pcre/ucp_findchar.c
</set>
<set append="1" var="JSCORE_SOURCES_BINDINGS">
bindings/c/c_class.cpp
bindings/c/c_instance.cpp
bindings/c/c_runtime.cpp
bindings/c/c_utility.cpp
bindings/NP_jsobject.cpp
bindings/npruntime.cpp
bindings/runtime.cpp
bindings/runtime_array.cpp
bindings/runtime_method.cpp
bindings/runtime_object.cpp
bindings/runtime_root.cpp
</set>
<set append="1" var="JSCORE_SOURCES_BINDINGS">
bindings/NP_jsobject.cpp
bindings/c/c_class.cpp
bindings/c/c_instance.cpp
bindings/c/c_runtime.cpp
bindings/c/c_utility.cpp
bindings/npruntime.cpp
bindings/runtime.cpp
bindings/runtime_array.cpp
bindings/runtime_method.cpp
bindings/runtime_object.cpp
bindings/runtime_root.cpp
</set>
</makefile> </makefile>
...@@ -26,46 +26,40 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ...@@ -26,46 +26,40 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
JavaScriptCore Bakefile project file. JavaScriptCore Bakefile project file.
--> -->
<makefile> <makefile>
<set var="SRCDIR">.</set> <set var="SRCDIR">.</set>
<!-- Common definitions etc.: -->
<include file="../Bakefiles/presets.bkl"/> <include file="../Bakefiles/presets.bkl"/>
<include file="JavaScriptCoreSources.bkl"/> <include file="JavaScriptCoreSources.bkl"/>
<set var="BUILDDIR">obj-$(FORMAT)</set> <set var="BUILDDIR">obj-$(FORMAT)</set>
<template id="jscore_base" template="icu"> <template id="jscore_base" template="icu">
<pic>on</pic> <pic>on</pic>
<threading>multi</threading> <threading>multi</threading>
<dirname>$(SRCDIR)</dirname> <dirname>$(SRCDIR)</dirname>
<include>$(SRCDIR)</include> <include>$(SRCDIR)</include>
<include>$(SRCDIR)/DerivedSources/JavaScriptCore</include>
<include>$(SRCDIR)/ForwardingHeaders</include> <include>$(SRCDIR)/ForwardingHeaders</include>
<include>$(SRCDIR)/wtf</include>
<include>$(SRCDIR)/kjs</include>
<include>$(SRCDIR)/pcre</include>
<include>$(SRCDIR)/bindings</include>
<include>$(SRCDIR)/bindings/c</include> <include>$(SRCDIR)/bindings/c</include>
<include>$(SRCDIR)/bindings/jni</include> <include>$(SRCDIR)/bindings/jni</include>
<include>$(SRCDIR)/DerivedSources/JavaScriptCore</include> <include>$(SRCDIR)/bindings</include>
<include>$(SRCDIR)/kjs</include>
<define>APPLE_CHANGES=1</define> <include>$(SRCDIR)/pcre</include>
<include>$(SRCDIR)/wtf</include>
<!-- this GC version requires Mach's thread suspend/resume: --> <!-- this GC version requires Mach's thread suspend/resume: -->
<if cond="PLATFORM_MACOSX=='1'"> <if cond="PLATFORM_MACOSX!='1'">
<define>USE_CONSERVATIVE_GC=0</define> <define>USE_CONSERVATIVE_GC=0</define>
</if> </if>
<if cond="PLATFORM_MACOSX=='1'"> <if cond="PLATFORM_MACOSX=='1'">
<define>USE_CONSERVATIVE_GC=1</define> <define>USE_CONSERVATIVE_GC=1</define>
</if> </if>
<define>XSLT_SUPPORT=1</define> <define>XSLT_SUPPORT=1</define>
...@@ -83,7 +77,7 @@ JavaScriptCore Bakefile project file. ...@@ -83,7 +77,7 @@ JavaScriptCore Bakefile project file.
<define>HAVE_FUNC__FINITE=1</define> <define>HAVE_FUNC__FINITE=1</define>
</if> </if>
</template> </template>
<exe id="dftables"> <exe id="dftables">
<dirname>$(SRCDIR)</dirname> <dirname>$(SRCDIR)</dirname>
...@@ -92,7 +86,7 @@ JavaScriptCore Bakefile project file. ...@@ -92,7 +86,7 @@ JavaScriptCore Bakefile project file.
</exe> </exe>
<action id="DerivedSources"> <action id="DerivedSources">
<is-phony/> <is-phony />
<command>bash make-generated-sources.sh</command> <command>bash make-generated-sources.sh</command>
</action> </action>
...@@ -104,18 +98,14 @@ JavaScriptCore Bakefile project file. ...@@ -104,18 +98,14 @@ JavaScriptCore Bakefile project file.
<cxx-exceptions>off</cxx-exceptions> <cxx-exceptions>off</cxx-exceptions>
<debug-info>on</debug-info> <debug-info>on</debug-info>
<sources> <sources>
$(JSCORE_SOURCES_WTF)
$(JSCORE_SOURCES_PCRE)
$(JSCORE_SOURCES_KJS)
$(JSCORE_SOURCES_BINDINGS) $(JSCORE_SOURCES_BINDINGS)
$(JSCORE_SOURCES_KJS)
$(JSCORE_SOURCES_PCRE)
$(JSCORE_SOURCES_WTF)
</sources> </sources>
<if cond="PLATFORM_WIN32=='1'"> <if cond="PLATFORM_WIN32=='1'">
$(JSCORE_SOURCES_WIN) $(JSCORE_SOURCES_WIN)
</if> </if>
<install-to>$(BUILDDIR)</install-to> <install-to>$(BUILDDIR)</install-to>
</lib> </lib>
</makefile> </makefile>
2006-11-12 Mark Rowe <bdash@webkit.org>
Reviewed by Mitz.
Linux/Gdk compilation fixes, and bakefile cleanups. Based on patches by
Alp Toker.
* Projects/gdk/webcore-gdk.bkl:
* WebCoreSources.bkl:
* page/PageState.cpp:
* platform/gdk/ChromeClientGdk.h:
(WebCore::ChromeClientGdk::ref):
(WebCore::ChromeClientGdk::deref):
* platform/gdk/FrameGdk.cpp:
(WebCore::FrameGdkClientDefault::openURL):
(WebCore::FrameGdkClientDefault::didReceiveData):
(WebCore::FrameGdkClientDefault::receivedAllData):
(WebCore::FrameGdk::FrameGdk):
(WebCore::FrameGdk::~FrameGdk):
* platform/gdk/FrameGdk.h:
* platform/gdk/KeyEventGdk.cpp:
(WebCore::keyIdentifierForGdkKeyCode):
* platform/gdk/ScreenClientGdk.h: Removed.
* platform/gdk/TemporaryLinkStubs.cpp:
(FrameGdk::canPaste):
(FrameGdk::originalRequestURL):
(TextField::TextField):
* platform/network/gdk/ResourceHandleManager.cpp:
(WebCore::ResourceHandleManager::downloadTimerCallback):
(WebCore::ResourceHandleManager::add):
(WebCore::ResourceHandleManager::cancel):
* webcore-base.bkl:
2006-11-11 Geoffrey Garen <ggaren@apple.com> 2006-11-11 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej Stachowiak. Reviewed by Maciej Stachowiak.
<?xml version="1.0" ?> <?xml version="1.0" ?>
<!-- generate GnuMakefile with
bakefile -f gnu gtkwebcore.bkl
consider forcing includes agian
CXX = g++ -I. include config.h
-->
<makefile> <makefile>
<option name="ENCODINGS_FILE">
<default-value>platform/gdk/gdk-encodings.txt</default-value>
<values>platform/gdk/gdk-encodings.txt</values>
</option>
<option name="ENCODINGS_FILE"> <option name="FEATURE_DEFINES" never_empty="1" >
<default-value>platform/gdk/gdk-encodings.txt</default-value> <!-- SVG_SUPPORT XPATH_SUPPORT-->
<values>platform/gdk/gdk-encodings.txt</values> <default-value>XPATH_SUPPORT</default-value>
</option> <values>XPATH_SUPPORT,SVG_SUPPORT</values>
</option>
<option name="FEATURE_DEFINES" never_empty="1" > <set var="FEATURE_DEFINES">XPATH_SUPPORT</set>
<!-- SVG_SUPPORT XPATH_SUPPORT--> <set var="ENCODINGS_FILE">$(SRCDIR)/platform/gdk/gdk-encodings.txt</set>
<default-value>XPATH_SUPPORT</default-value>
<values>XPATH_SUPPORT,SVG_SUPPORT</values>
</option>
<set var="FEATURE_DEFINES">XPATH_SUPPORT</set>
<set var="ENCODINGS_FILE">$(SRCDIR)/platform/gdk/gdk-encodings.txt</set>
<include file="../../webcore-base.bkl"/> <include file="../../webcore-base.bkl"/>
<action id=".DerivedSources"> <action id=".DerivedSources">
<!-- This causes a full rebuild everytime <!-- This causes a full rebuild everytime
<is-phony/> <is-phony />
--> -->
<command>bash -c "cd ../..; ./move-js-headers.sh"</command> <command>bash -c "cd ../..; ./move-js-headers.sh"</command>
<command> <command>
bash -c "cd ../..;\ bash -c "cd ../..;\
export FEATURE_DEFINES=$(FEATURE_DEFINES);\ export FEATURE_DEFINES=$(FEATURE_DEFINES);\
./make-generated-sources.sh $(ENCODINGS_FILE)" ./make-generated-sources.sh $(ENCODINGS_FILE)"
</command> </command>
<command>bash -c "touch .DerivedSources"</command> <command>bash -c "touch .DerivedSources"</command>
</action> </action>
<dll id="webcore-gdk" template="webcore_base,freetype,gtk,curl,cairo,sqlite3"> <dll id="webcore-gdk" template="webcore_base,freetype,gtk,curl,cairo,sqlite3">
<!-- FIXME: create a debug option and set these accordingly --> <!-- FIXME: create a debug option and set these accordingly -->
<!-- check for undefined symbols for debugging reasons --> <!-- check for undefined symbols for debugging reasons -->
<!--
<ldflags>W,undefined</ldflags>
-->
<pre-build-target>.DerivedSources</pre-build-target> <pre-build-target>.DerivedSources</pre-build-target>
<dirname>.</dirname> <dirname>.</dirname>
<pic>on</pic> <pic>on</pic>
<threading>multi</threading> <threading>multi</threading>
...@@ -53,51 +43,47 @@ ...@@ -53,51 +43,47 @@
<debug-info>on</debug-info> <debug-info>on</debug-info>
<include>$(SRCDIR)/platform/gdk</include> <include>$(SRCDIR)/platform/gdk</include>
<include>$(SRCDIR)/platform/network/gdk</include> <include>$(SRCDIR)/platform/network/gdk</include>
<define>BUILDING_GDK__</define> <define>BUILDING_GDK__</define>
<define>BUILDING_CAIRO__</define> <define>BUILDING_CAIRO__</define>
<include>platform/gdk</include> <include>platform/gdk</include>
<include>platform/cairo</include> <include>platform/grahpics/cairo</include>
<include>$(SRCDIR)/kcanvas/device/cairo</include> <include>$(SRCDIR)/kcanvas/device/cairo</include>
<define>XPATH_SUPPORT</define> <define>XPATH_SUPPORT</define>
<!-- gdk build broken with without NDEBUG defined --> <!-- gdk build broken with without NDEBUG defined -->
<define>NDEBUG</define> <define>NDEBUG</define>
<sources> <sources>
platform/cairo/GraphicsContextCairo.cpp platform/gdk/CookieJarGdk.cpp
platform/cairo/ImageCairo.cpp platform/gdk/CursorGdk.cpp
platform/cairo/ImageSourceCairo.cpp platform/gdk/FontCacheGdk.cpp
platform/gdk/CookieJarGdk.cpp platform/gdk/FontDataGdk.cpp
platform/gdk/CursorGdk.cpp platform/gdk/FontGdk.cpp
platform/gdk/FontCacheGdk.cpp platform/gdk/FontPlatformDataGdk.cpp
platform/gdk/FontDataGdk.cpp platform/gdk/FrameGdk.cpp
platform/gdk/FontGdk.cpp platform/gdk/GlyphMapGdk.cpp
platform/gdk/FontPlatformDataGdk.cpp platform/gdk/ImageGdk.cpp
platform/gdk/FrameGdk.cpp platform/gdk/KeyEventGdk.cpp
platform/gdk/GlyphMapGdk.cpp platform/gdk/MouseEventGdk.cpp
platform/gdk/ImageGdk.cpp platform/gdk/PageGdk.cpp
platform/gdk/KeyEventGdk.cpp platform/network/gdk/ResourceHandleManager.cpp
platform/gdk/MouseEventGdk.cpp platform/gdk/RenderThemeGdk.cpp
platform/gdk/PageGdk.cpp platform/gdk/RenderPopupMenuGdk.cpp
platform/network/gdk/ResourceHandleManager.cpp platform/gdk/ScrollViewGdk.cpp
platform/gdk/RenderThemeGdk.cpp platform/gdk/SharedTimerLinux.cpp
platform/gdk/RenderPopupMenuGdk.cpp platform/gdk/SystemTimeLinux.cpp
platform/gdk/ScreenGdk.cpp platform/gdk/TemporaryLinkStubs.cpp
platform/gdk/ScrollViewGdk.cpp platform/network/gdk/ResourceHandleCurl.cpp
platform/gdk/SharedTimerLinux.cpp platform/gdk/WheelEventGdk.cpp
platform/gdk/SystemTimeLinux.cpp platform/gdk/WidgetGdk.cpp
platform/gdk/TemporaryLinkStubs.cpp </sources>
platform/network/gdk/ResourceHandleCurl.cpp
platform/gdk/WheelEventGdk.cpp
platform/gdk/WidgetGdk.cpp
</sources>
<clean-files> <clean-files>
.DerivedSources .DerivedSources
rm -rf $(SRCDIR)/DerivedSources rm -rf $(SRCDIR)/DerivedSources
rm -rf $(SRCDIR)/include/JavaScripCore rm -rf $(SRCDIR)/include/JavaScriptCore
rm -rf $(SRCDIR)/Projects/gdk/obj-gnu rm -rf $(SRCDIR)/Projects/gdk/obj-gnu
</clean-files> </clean-files>
<!--HACK block dependencies on the phony target --> <!--HACK block dependencies on the phony target -->
</dll> </dll>
</makefile> </makefile>
This diff is collapsed.
...@@ -31,7 +31,9 @@ ...@@ -31,7 +31,9 @@
#include "FrameLoader.h" #include "FrameLoader.h"
#include "FrameView.h" #include "FrameView.h"
#include "Page.h" #include "Page.h"
#ifdef SVG_SUPPORT
#include "SVGDocumentExtensions.h" #include "SVGDocumentExtensions.h"
#endif
#include "kjs_proxy.h" #include "kjs_proxy.h"
#include "kjs_window.h" #include "kjs_window.h"
#include "kjs_window.h" #include "kjs_window.h"
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
namespace WebCore { namespace WebCore {
class ChromeClientGdk : public ChromeClient { class ChromeClientGdk : public ChromeClient, public Shared<ChromeClientGdk> {
public: public:
virtual ~ChromeClientGdk() { } virtual ~ChromeClientGdk() { }
...@@ -39,6 +39,9 @@ namespace WebCore { ...@@ -39,6 +39,9 @@ namespace WebCore {
virtual float scaleFactor(); virtual float scaleFactor();
virtual void ref() { Shared<ChromeClientGdk>::ref(); }
virtual void deref() { Shared<ChromeClientGdk>::deref(); }
virtual void focus(); virtual void focus();
virtual void unfocus(); virtual void unfocus();
......
...@@ -27,36 +27,38 @@ ...@@ -27,36 +27,38 @@
#include "config.h" #include "config.h"
#include "FrameGdk.h" #include "FrameGdk.h"
#include "ChromeClientGdk.h" #include "ChromeClientGdk.h"
#include "Document.h"
#include "DOMImplementation.h" #include "DOMImplementation.h"
#include "DOMWindow.h" #include "DOMWindow.h"
#include "Document.h"
#include "EditorClient.h"
#include "Element.h" #include "Element.h"
#include "FrameView.h"
#include "FrameLoadRequest.h" #include "FrameLoadRequest.h"
#include "FrameLoader.h"
#include "FramePrivate.h" #include "FramePrivate.h"
#include <gdk/gdk.h> #include "FrameView.h"
#include "GraphicsContext.h" #include "GraphicsContext.h"
#include "HitTestResult.h"
#include "HitTestRequest.h"
#include "HTMLDocument.h" #include "HTMLDocument.h"
#include "HitTestRequest.h"
#include "HitTestResult.h"
#include "KeyboardCodes.h" #include "KeyboardCodes.h"
#include "MouseEventWithHitTestResults.h" #include "MouseEventWithHitTestResults.h"
#include "Page.h" #include "Page.h"
#include "PlatformMouseEvent.h"
#include "PlatformKeyboardEvent.h" #include "PlatformKeyboardEvent.h"
#include "PlatformMouseEvent.h"
#include "PlatformWheelEvent.h" #include "PlatformWheelEvent.h"
#include "Plugin.h" #include "Plugin.h"
#include "RenderLayer.h"
#include "RenderObject.h" #include "RenderObject.h"
#include "RenderWidget.h" #include "RenderWidget.h"
#include "RenderLayer.h"
#include "ResourceHandle.h" #include "ResourceHandle.h"
#include "ResourceHandleInternal.h" #include "ResourceHandleInternal.h"
#include "ScreenClientGdk.h" #include "SSLKeyGenerator.h"
#include "SelectionController.h" #include "SelectionController.h"
#include "Settings.h" #include "Settings.h"
#include "SSLKeyGenerator.h"
#include "TypingCommand.h" #include "TypingCommand.h"
#include <gdk/gdk.h>
// This function loads resources from WebKit // This function loads resources from WebKit
// This does not belong here and I'm not sure where // This does not belong here and I'm not sure where
...@@ -91,7 +93,7 @@ void FrameGdkClientDefault::setFrame(const FrameGdk* frame) ...@@ -91,7 +93,7 @@ void FrameGdkClientDefault::setFrame(const FrameGdk* frame)
void FrameGdkClientDefault::openURL(const KURL& url) void FrameGdkClientDefault::openURL(const KURL& url)
{ {
m_frame->didOpenURL(url); m_frame->loader()->didOpenURL(url);
m_beginCalled = false; m_beginCalled = false;
ResourceRequest request(url); ResourceRequest request(url);
...@@ -128,15 +130,15 @@ void FrameGdkClientDefault::didReceiveData(ResourceHandle* job, const char* data ...@@ -128,15 +130,15 @@ void FrameGdkClientDefault::didReceiveData(ResourceHandle* job, const char* data
m_frame->setResourceRequest(request); m_frame->setResourceRequest(request);
} }
#endif #endif
m_frame->begin(job->url()); m_frame->loader()->begin(job->url());
} }
m_frame->write(data, length); m_frame->loader()->write(data, length);
} }
void FrameGdkClientDefault::receivedAllData(ResourceHandle* job, PlatformData data) void FrameGdkClientDefault::receivedAllData(ResourceHandle* job, PlatformData data)
{ {
m_frame->end(); m_frame->loader()->end();
m_beginCalled = false; m_beginCalled = false;
} }
...@@ -159,7 +161,7 @@ static void doScroll(const RenderObject* r, float deltaX, float deltaY) ...@@ -159,7 +161,7 @@ static void doScroll(const RenderObject* r, float deltaX, float deltaY)
} }
FrameGdk::FrameGdk(GdkDrawable* gdkdrawable) FrameGdk::FrameGdk(GdkDrawable* gdkdrawable)
: Frame(new Page(new ChromeClientGdk(), new ScreenClientGdk()), 0, 0), m_drawable(gdkdrawable) : Frame(new Page(new ChromeClientGdk()), 0, 0), m_drawable(gdkdrawable)
{ {
Settings* settings = new Settings; Settings* settings = new Settings;
settings->setAutoLoadImages(true); settings->setAutoLoadImages(true);