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>
Reviewed by Maciej.
......
<?xml version="1.0" ?>
<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
kjs/array_object.cpp
kjs/bool_object.cpp
kjs/collector.cpp
kjs/Context.cpp
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 append="1" var="JSCORE_SOURCES_WTF">
wtf/Assertions.cpp
wtf/FastMalloc.cpp
wtf/HashTable.cpp
</set>
</set>
<set append="1" var="JSCORE_SOURCES_WTF">
wtf/Assertions.cpp
wtf/FastMalloc.cpp
wtf/HashTable.cpp
</set>
<set append="1" var="JSCORE_SOURCES_PCRE">
pcre/pcre_compile.c
pcre/pcre_config.c
pcre/pcre_exec.c
pcre/pcre_fullinfo.c
pcre/pcre_get.c
pcre/pcre_globals.c
pcre/pcre_info.c
pcre/pcre_maketables.c
pcre/pcre_ord2utf8.c
pcre/pcre_printint.c
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_PCRE">
pcre/pcre_compile.c
pcre/pcre_config.c
pcre/pcre_exec.c
pcre/pcre_fullinfo.c
pcre/pcre_get.c
pcre/pcre_globals.c
pcre/pcre_info.c
pcre/pcre_maketables.c
pcre/pcre_ord2utf8.c
pcre/pcre_printint.c
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/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>
......@@ -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
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
JavaScriptCore Bakefile project file.
JavaScriptCore Bakefile project file.
-->
<makefile>
<set var="SRCDIR">.</set>
<!-- Common definitions etc.: -->
<include file="../Bakefiles/presets.bkl"/>
<include file="JavaScriptCoreSources.bkl"/>
<set var="BUILDDIR">obj-$(FORMAT)</set>
<template id="jscore_base" template="icu">
<pic>on</pic>
<threading>multi</threading>
<dirname>$(SRCDIR)</dirname>
<include>$(SRCDIR)</include>
<include>$(SRCDIR)/DerivedSources/JavaScriptCore</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/jni</include>
<include>$(SRCDIR)/DerivedSources/JavaScriptCore</include>
<define>APPLE_CHANGES=1</define>
<include>$(SRCDIR)/bindings</include>
<include>$(SRCDIR)/kjs</include>
<include>$(SRCDIR)/pcre</include>
<include>$(SRCDIR)/wtf</include>
<!-- 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>
</if>
<if cond="PLATFORM_MACOSX=='1'">
<define>USE_CONSERVATIVE_GC=1</define>
</if>
</if>
<define>XSLT_SUPPORT=1</define>
......@@ -83,7 +77,7 @@ JavaScriptCore Bakefile project file.
<define>HAVE_FUNC__FINITE=1</define>
</if>
</template>
</template>
<exe id="dftables">
<dirname>$(SRCDIR)</dirname>
......@@ -92,7 +86,7 @@ JavaScriptCore Bakefile project file.
</exe>
<action id="DerivedSources">
<is-phony/>
<is-phony />
<command>bash make-generated-sources.sh</command>
</action>
......@@ -104,18 +98,14 @@ JavaScriptCore Bakefile project file.
<cxx-exceptions>off</cxx-exceptions>
<debug-info>on</debug-info>
<sources>
$(JSCORE_SOURCES_WTF)
$(JSCORE_SOURCES_PCRE)
$(JSCORE_SOURCES_KJS)
$(JSCORE_SOURCES_BINDINGS)
$(JSCORE_SOURCES_KJS)
$(JSCORE_SOURCES_PCRE)
$(JSCORE_SOURCES_WTF)
</sources>
<if cond="PLATFORM_WIN32=='1'">
$(JSCORE_SOURCES_WIN)
</if>
<install-to>$(BUILDDIR)</install-to>
</if>
<install-to>$(BUILDDIR)</install-to>
</lib>
</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>
Reviewed by Maciej Stachowiak.
<?xml version="1.0" ?>
<!-- generate GnuMakefile with
bakefile -f gnu gtkwebcore.bkl
consider forcing includes agian
CXX = g++ -I. include config.h
-->
<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">
<default-value>platform/gdk/gdk-encodings.txt</default-value>
<values>platform/gdk/gdk-encodings.txt</values>
</option>
<option name="FEATURE_DEFINES" never_empty="1" >
<!-- SVG_SUPPORT XPATH_SUPPORT-->
<default-value>XPATH_SUPPORT</default-value>
<values>XPATH_SUPPORT,SVG_SUPPORT</values>
</option>
<option name="FEATURE_DEFINES" never_empty="1" >
<!-- SVG_SUPPORT XPATH_SUPPORT-->
<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>
<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">
<!-- This causes a full rebuild everytime
<is-phony/>
-->
<action id=".DerivedSources">
<!-- This causes a full rebuild everytime
<is-phony />
-->
<command>bash -c "cd ../..; ./move-js-headers.sh"</command>
<command>
bash -c "cd ../..;\
export FEATURE_DEFINES=$(FEATURE_DEFINES);\
./make-generated-sources.sh $(ENCODINGS_FILE)"
</command>
bash -c "cd ../..;\
export FEATURE_DEFINES=$(FEATURE_DEFINES);\
./make-generated-sources.sh $(ENCODINGS_FILE)"
</command>
<command>bash -c "touch .DerivedSources"</command>
</action>
</action>
<dll id="webcore-gdk" template="webcore_base,freetype,gtk,curl,cairo,sqlite3">
<!-- FIXME: create a debug option and set these accordingly -->
<!-- check for undefined symbols for debugging reasons -->
<!--
<ldflags>W,undefined</ldflags>
-->
<dll id="webcore-gdk" template="webcore_base,freetype,gtk,curl,cairo,sqlite3">
<!-- FIXME: create a debug option and set these accordingly -->
<!-- check for undefined symbols for debugging reasons -->
<pre-build-target>.DerivedSources</pre-build-target>
<pre-build-target>.DerivedSources</pre-build-target>
<dirname>.</dirname>
<pic>on</pic>
<threading>multi</threading>
......@@ -53,51 +43,47 @@
<debug-info>on</debug-info>
<include>$(SRCDIR)/platform/gdk</include>
<include>$(SRCDIR)/platform/network/gdk</include>
<define>BUILDING_GDK__</define>
<define>BUILDING_CAIRO__</define>
<include>platform/gdk</include>
<include>platform/cairo</include>
<include>$(SRCDIR)/kcanvas/device/cairo</include>
<define>XPATH_SUPPORT</define>
<define>BUILDING_GDK__</define>
<define>BUILDING_CAIRO__</define>
<include>platform/gdk</include>
<include>platform/grahpics/cairo</include>
<include>$(SRCDIR)/kcanvas/device/cairo</include>
<define>XPATH_SUPPORT</define>
<!-- gdk build broken with without NDEBUG defined -->
<define>NDEBUG</define>
<define>NDEBUG</define>
<sources>
platform/cairo/GraphicsContextCairo.cpp
platform/cairo/ImageCairo.cpp
platform/cairo/ImageSourceCairo.cpp
platform/gdk/CookieJarGdk.cpp
platform/gdk/CursorGdk.cpp
platform/gdk/FontCacheGdk.cpp
platform/gdk/FontDataGdk.cpp
platform/gdk/FontGdk.cpp
platform/gdk/FontPlatformDataGdk.cpp
platform/gdk/FrameGdk.cpp
platform/gdk/GlyphMapGdk.cpp
platform/gdk/ImageGdk.cpp
platform/gdk/KeyEventGdk.cpp
platform/gdk/MouseEventGdk.cpp
platform/gdk/PageGdk.cpp
platform/network/gdk/ResourceHandleManager.cpp
platform/gdk/RenderThemeGdk.cpp
platform/gdk/RenderPopupMenuGdk.cpp
platform/gdk/ScreenGdk.cpp
platform/gdk/ScrollViewGdk.cpp
platform/gdk/SharedTimerLinux.cpp
platform/gdk/SystemTimeLinux.cpp
platform/gdk/TemporaryLinkStubs.cpp
platform/network/gdk/ResourceHandleCurl.cpp
platform/gdk/WheelEventGdk.cpp
platform/gdk/WidgetGdk.cpp
</sources>
<sources>
platform/gdk/CookieJarGdk.cpp
platform/gdk/CursorGdk.cpp
platform/gdk/FontCacheGdk.cpp
platform/gdk/FontDataGdk.cpp
platform/gdk/FontGdk.cpp
platform/gdk/FontPlatformDataGdk.cpp
platform/gdk/FrameGdk.cpp
platform/gdk/GlyphMapGdk.cpp
platform/gdk/ImageGdk.cpp
platform/gdk/KeyEventGdk.cpp
platform/gdk/MouseEventGdk.cpp
platform/gdk/PageGdk.cpp
platform/network/gdk/ResourceHandleManager.cpp
platform/gdk/RenderThemeGdk.cpp
platform/gdk/RenderPopupMenuGdk.cpp
platform/gdk/ScrollViewGdk.cpp
platform/gdk/SharedTimerLinux.cpp
platform/gdk/SystemTimeLinux.cpp
platform/gdk/TemporaryLinkStubs.cpp
platform/network/gdk/ResourceHandleCurl.cpp
platform/gdk/WheelEventGdk.cpp
platform/gdk/WidgetGdk.cpp
</sources>
<clean-files>
.DerivedSources
rm -rf $(SRCDIR)/DerivedSources
rm -rf $(SRCDIR)/include/JavaScripCore
rm -rf $(SRCDIR)/Projects/gdk/obj-gnu
</clean-files>
<!--HACK block dependencies on the phony target -->
<clean-files>
.DerivedSources
rm -rf $(SRCDIR)/DerivedSources
rm -rf $(SRCDIR)/include/JavaScriptCore
rm -rf $(SRCDIR)/Projects/gdk/obj-gnu
</clean-files>
<!--HACK block dependencies on the phony target -->
</dll>
</makefile>
This diff is collapsed.
......@@ -31,7 +31,9 @@
#include "FrameLoader.h"
#include "FrameView.h"
#include "Page.h"
#ifdef SVG_SUPPORT
#include "SVGDocumentExtensions.h"
#endif
#include "kjs_proxy.h"
#include "kjs_window.h"
#include "kjs_window.h"
......
......@@ -28,7 +28,7 @@
namespace WebCore {
class ChromeClientGdk : public ChromeClient {
class ChromeClientGdk : public ChromeClient, public Shared<ChromeClientGdk> {
public:
virtual ~ChromeClientGdk() { }
......@@ -39,6 +39,9 @@ namespace WebCore {
virtual float scaleFactor();
virtual void ref() { Shared<ChromeClientGdk>::ref(); }
virtual void deref() { Shared<ChromeClientGdk>::deref(); }
virtual void focus();
virtual void unfocus();
......
......@@ -27,36 +27,38 @@
#include "config.h"
#include "FrameGdk.h"
#include "ChromeClientGdk.h"
#include "Document.h"
#include "DOMImplementation.h"
#include "DOMWindow.h"
#include "Document.h"
#include "EditorClient.h"
#include "Element.h"
#include "FrameView.h"
#include "FrameLoadRequest.h"
#include "FrameLoader.h"
#include "FramePrivate.h"
#include <gdk/gdk.h>
#include "FrameView.h"
#include "GraphicsContext.h"
#include "HitTestResult.h"
#include "HitTestRequest.h"
#include "HTMLDocument.h"
#include "HitTestRequest.h"
#include "HitTestResult.h"
#include "KeyboardCodes.h"
#include "MouseEventWithHitTestResults.h"
#include "Page.h"
#include "PlatformMouseEvent.h"
#include "PlatformKeyboardEvent.h"
#include "PlatformMouseEvent.h"
#include "PlatformWheelEvent.h"
#include "Plugin.h"
#include "RenderLayer.h"
#include "RenderObject.h"
#include "RenderWidget.h"
#include "RenderLayer.h"
#include "ResourceHandle.h"
#include "ResourceHandleInternal.h"
#include "ScreenClientGdk.h"
#include "SSLKeyGenerator.h"
#include "SelectionController.h"
#include "Settings.h"
#include "SSLKeyGenerator.h"
#include "TypingCommand.h"
#include <gdk/gdk.h>
// This function loads resources from WebKit
// This does not belong here and I'm not sure where
......@@ -91,7 +93,7 @@ void FrameGdkClientDefault::setFrame(const FrameGdk* frame)
void FrameGdkClientDefault::openURL(const KURL& url)
{
m_frame->didOpenURL(url);
m_frame->loader()->didOpenURL(url);
m_beginCalled = false;
ResourceRequest request(url);
......@@ -128,15 +130,15 @@ void FrameGdkClientDefault::didReceiveData(ResourceHandle* job, const char* data
m_frame->setResourceRequest(request);
}
#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)
{
m_frame->end();
m_frame->loader()->end();
m_beginCalled = false;
}
......@@ -159,7 +161,7 @@ static void doScroll(const RenderObject* r, float deltaX, float deltaY)
}
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->setAutoLoadImages(true);
......@@ -196,24 +198,9 @@ FrameGdk::FrameGdk(Page* page, Element* element, PassRefPtr<EditorClient> editor
FrameGdk::~FrameGdk()
{
cancelAndClear();
loader()->cancelAndClear();
}
void FrameGdk::submitForm(const FrameLoadRequest& frameLoadRequest, Event*)
{
ResourceRequest request = frameLoadRequest.resourceRequest();
// FIXME: this is a hack inherited from FrameMac, and should be pushed into Frame
if (d->m_submittedFormURL == request.url())
return;
d->m_submittedFormURL = request.url();
if (client())
client()->submitForm(request.httpMethod(), request.url(), &request.httpBody());
clearRecordedFormValues();
}
void FrameGdk::urlSelected(const FrameLoadRequest& frameLoadRequest, Event*)
{
......
......@@ -29,15 +29,15 @@
#define FrameGdk_H_
#include "Frame.h"
#include "ResourceHandleClient.h"
#include "EditorClient.h"
#include "ResourceHandleClient.h"
#include <gdk/gdk.h>
namespace WebCore {
class Element;
class FrameGdk;
class EditorClient;
class FormData;
class FrameGdkClient {
public:
......@@ -85,9 +85,6 @@ public:
virtual void setTitle(const String&);
virtual ObjectContentType objectContentType(const KURL&, const String& mimeType);
virtual Plugin* createPlugin(Element*, const KURL&, const Vector<String>&, const Vector<String>&, const String&);
virtual void scheduleClose();
virtual void unfocusWindow();
......