Commit 808883b8 authored by bdash's avatar bdash

2006-11-06 Krzysztof Kowalczyk <kkowalczyk@gmail.com>

        Reviewed by Maciej.

        Remove warning about garbage after #else. #else clause applies for all
        non-mac platforms, not only win.

        * kjs/date_object.cpp:
2006-11-06  Krzysztof Kowalczyk  <kkowalczyk@gmail.com>

        Reviewed by Maciej.

        Linux\Gdk build fixes.

        * loader/icon/IconDatabase.cpp:
        * loader/icon/SQLStatement.h:
        * platform/gdk/ChromeClientGdk.h: Added.
        (WebCore::ChromeClientGdk::~ChromeClientGdk):
        * platform/gdk/CursorGdk.cpp:
        (WebCore::pointerCursor):
        * platform/gdk/FrameGdk.cpp:
        (WebCore::doScroll):
        (WebCore::FrameGdk::FrameGdk):
        (WebCore::FrameGdk::submitForm):
        (WebCore::FrameGdk::urlSelected):
        (WebCore::FrameGdk::openURL):
        (WebCore::FrameGdk::handleGdkEvent):
        * platform/gdk/FrameGdk.h:
        (WebCore::FrameGdk::client):
        * platform/gdk/RenderPopupMenuGdk.cpp:
        (WebCore::PopupMenu::updateFromElement):
        * platform/gdk/ScreenGdk.cpp:
        * platform/gdk/TemporaryLinkStubs.cpp:
        (Slider::focusPolicy):
        (WebCore::ServeSynchronousRequest):
        (FrameGdk::goBackOrForward):
        (FrameGdk::getHistoryLength):
        (FrameGdk::historyURL):
        (ChromeClientGdk::canRunModal):
        (ChromeClientGdk::runModal):
        (WebCore::systemBeep):
        (WebCore::CachedResource::setPlatformResponse):
        (Path::transform):
        (ResourceLoader::loadsBlocked):
        (IconLoader::notifyIconChanged):
        * platform/network/gdk/ResourceHandleManager.cpp:
        (WebCore::writeCallback):
        (WebCore::ResourceHandleManager::downloadTimerCallback):
        (WebCore::ResourceHandleManager::remove):
        (WebCore::ResourceHandleManager::add):
2006-11-06  Krzysztof Kowalczyk  <kkowalczyk@gmail.com>

        Reviewed by Maciej.

        Linux\gdk build fixes.

        * GdkLauncher/main.cpp:
        (LauncherFrameGdk::LauncherFrameGdk):
        (main):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@17636 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent ea75f145
2006-11-06 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
Reviewed by Maciej.
Remove warning about garbage after #else. #else clause applies for all
non-mac platforms, not only win.
* kjs/date_object.cpp:
2006-11-06 Mark Rowe <bdash@webkit.org>
Reviewed by the wonderful Mitz Pettel.
......
......@@ -154,7 +154,7 @@ static UString formatLocaleDate(ExecState *exec, double time, bool includeDate,
return UString(buffer, length);
}
#else if PLATFORM(WIN_OS)
#else
enum LocaleDateTimeFormat { LocaleDateAndTime, LocaleDate, LocaleTime };
......
2006-11-06 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
Reviewed by Maciej.
Linux\Gdk build fixes.
* loader/icon/IconDatabase.cpp:
* loader/icon/SQLStatement.h:
* platform/gdk/ChromeClientGdk.h: Added.
(WebCore::ChromeClientGdk::~ChromeClientGdk):
* platform/gdk/CursorGdk.cpp:
(WebCore::pointerCursor):
* platform/gdk/FrameGdk.cpp:
(WebCore::doScroll):
(WebCore::FrameGdk::FrameGdk):
(WebCore::FrameGdk::submitForm):
(WebCore::FrameGdk::urlSelected):
(WebCore::FrameGdk::openURL):
(WebCore::FrameGdk::handleGdkEvent):
* platform/gdk/FrameGdk.h:
(WebCore::FrameGdk::client):
* platform/gdk/RenderPopupMenuGdk.cpp:
(WebCore::PopupMenu::updateFromElement):
* platform/gdk/ScreenGdk.cpp:
* platform/gdk/TemporaryLinkStubs.cpp:
(Slider::focusPolicy):
(WebCore::ServeSynchronousRequest):
(FrameGdk::goBackOrForward):
(FrameGdk::getHistoryLength):
(FrameGdk::historyURL):
(ChromeClientGdk::canRunModal):
(ChromeClientGdk::runModal):
(WebCore::systemBeep):
(WebCore::CachedResource::setPlatformResponse):
(Path::transform):
(ResourceLoader::loadsBlocked):
(IconLoader::notifyIconChanged):
* platform/network/gdk/ResourceHandleManager.cpp:
(WebCore::writeCallback):
(WebCore::ResourceHandleManager::downloadTimerCallback):
(WebCore::ResourceHandleManager::remove):
(WebCore::ResourceHandleManager::add):
2006-11-06 Geoffrey Garen <ggaren@apple.com>
build fix.
......@@ -38,6 +38,8 @@
#if PLATFORM(WIN)
#include <windows.h>
#include <winbase.h>
#else
#include <sys/stat.h>
#endif
namespace WebCore {
......
......@@ -100,4 +100,4 @@ private:
} // namespace WebCore
#endif SQLStatement_H
#endif // SQLStatement_H
/*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 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.
*/
#ifndef ChromeClientGdk_H
#define ChromeClientGdk_H
#include "ChromeClient.h"
namespace WebCore {
class ChromeClientGdk : public ChromeClient {
public:
virtual ~ChromeClientGdk() { }
virtual bool canRunModal();
virtual void runModal();
};
}
#endif // ChromeClientGdk_H
......@@ -63,6 +63,12 @@ Cursor::Cursor(GdkCursor* c)
gdk_cursor_ref(c);
}
const Cursor& pointerCursor()
{
static Cursor c = gdk_cursor_new(GDK_LEFT_PTR);
return c;
}
const Cursor& crossCursor()
{
static Cursor c = gdk_cursor_new(GDK_CROSS);
......
......@@ -27,35 +27,36 @@
#include "config.h"
#include "FrameGdk.h"
#include "Element.h"
#include "RenderObject.h"
#include "RenderWidget.h"
#include "RenderLayer.h"
#include "Page.h"
#include "ChromeClientGdk.h"
#include "Document.h"
#include "DOMWindow.h"
#include "DOMImplementation.h"
#include "Document.h"
#include "Settings.h"
#include "Plugin.h"
#include "DOMWindow.h"
#include "Element.h"
#include "FrameView.h"
#include "FrameLoadRequest.h"
#include "FramePrivate.h"
#include "GraphicsContext.h"
#include "HitTestResult.h"
#include "HitTestRequest.h"
#include "HTMLDocument.h"
#include "ResourceHandle.h"
#include "ResourceHandleInternal.h"
#include "KeyboardCodes.h"
#include "MouseEventWithHitTestResults.h"
#include "Page.h"
#include "PlatformMouseEvent.h"
#include "PlatformKeyboardEvent.h"
#include "PlatformWheelEvent.h"
#include "MouseEventWithHitTestResults.h"
#include "Plugin.h"
#include "RenderObject.h"
#include "RenderWidget.h"
#include "RenderLayer.h"
#include "ResourceHandle.h"
#include "ResourceHandleInternal.h"
#include "SelectionController.h"
#include "TypingCommand.h"
#include "Settings.h"
#include "SSLKeyGenerator.h"
#include "KeyboardCodes.h"
#include "FrameLoadRequest.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
// it should go
......@@ -151,13 +152,13 @@ static void doScroll(const RenderObject* r, float deltaX, float deltaY)
if (!r->layer())
return;
int x = r->layer()->scrollXOffset() + deltaX;
int y = r->layer()->scrollYOffset() + deltaY;
int x = r->layer()->scrollXOffset() + (int)deltaX;
int y = r->layer()->scrollYOffset() + (int)deltaY;
r->layer()->scrollToOffset(x, y, true, true);
}
FrameGdk::FrameGdk(GdkDrawable* gdkdrawable)
: Frame(new Page, 0), m_drawable(gdkdrawable)
: Frame(new Page(new ChromeClientGdk()), 0, 0), m_drawable(gdkdrawable)
{
Settings* settings = new Settings;
settings->setAutoLoadImages(true);
......@@ -182,8 +183,8 @@ FrameGdk::FrameGdk(GdkDrawable* gdkdrawable)
m_client->setFrame(this);
}
FrameGdk::FrameGdk(Page* page, Element* element)
: Frame(page,element)
FrameGdk::FrameGdk(Page* page, Element* element, PassRefPtr<EditorClient> editorClient)
: Frame(page,element, editorClient)
{
Settings* settings = new Settings;
settings->setAutoLoadImages(true);
......@@ -199,7 +200,7 @@ FrameGdk::~FrameGdk()
void FrameGdk::submitForm(const FrameLoadRequest& frameLoadRequest, Event*)
{
ResourceRequest request = frameLoadRequest.m_request;
ResourceRequest request = frameLoadRequest.resourceRequest();
// FIXME: this is a hack inherited from FrameMac, and should be pushed into Frame
if (d->m_submittedFormURL == request.url())
......@@ -208,13 +209,14 @@ void FrameGdk::submitForm(const FrameLoadRequest& frameLoadRequest, Event*)
d->m_submittedFormURL = request.url();
if (m_client)
m_client->submitForm(request.doPost() ? "POST" : "GET", request.url(), &request.postData);
m_client->submitForm(request.httpMethod(), request.url(), &request.httpBody());
clearRecordedFormValues();
}
void FrameGdk::urlSelected(const FrameLoadRequest& frameLoadRequest, Event*)
{
ResourceRequest request = frameLoadRequest.m_request;
ResourceRequest request = frameLoadRequest.resourceRequest();
if (!m_client)
return;
......@@ -222,6 +224,14 @@ void FrameGdk::urlSelected(const FrameLoadRequest& frameLoadRequest, Event*)
m_client->openURL(request.url());
}
#if 0
void FrameGdk::openURL(const KURL& url)
{
ASSERT(m_client);
m_client->openURL(url);
}
#endif
String FrameGdk::userAgent() const
{
return "Mozilla/5.0 (PC; U; Intel; Linux; en) AppleWebKit/420+ (KHTML, like Gecko)";
......@@ -261,9 +271,11 @@ void FrameGdk::handleGdkEvent(GdkEvent* event)
if (wheelEvent.isAccepted()) {
return;
}
RenderObject::NodeInfo nodeInfo(true, true);
renderer()->layer()->hitTest(nodeInfo, wheelEvent.pos());
Node* node = nodeInfo.innerNode();
HitTestRequest hitTestRequest(true, true);
HitTestResult hitTestResult(wheelEvent.pos());
renderer()->layer()->hitTest(hitTestRequest, hitTestResult);
Node* node = hitTestResult.innerNode();
if (!node)
return;
//Default to scrolling the page
......
......@@ -30,12 +30,14 @@
#include "Frame.h"
#include "ResourceHandleClient.h"
#include "EditorClient.h"
#include <gdk/gdk.h>
namespace WebCore {
class Element;
class FrameGdk;
class EditorClient;
class FrameGdkClient {
public:
......@@ -73,7 +75,7 @@ private:
class FrameGdk : public Frame {
public:
FrameGdk(Page*, Element*);
FrameGdk(Page*, Element*, PassRefPtr<EditorClient>);
FrameGdk(GdkDrawable*);
virtual ~FrameGdk();
......@@ -146,6 +148,10 @@ public:
virtual void partClearedInBegin();
virtual bool canGoBackOrForward(int distance) const;
virtual void goBackOrForward(int distance);
virtual int getHistoryLength();
virtual KURL historyURL(int distance);
virtual void handledOnloadEvents();
virtual bool canPaste() const;
......@@ -162,6 +168,8 @@ public:
virtual Frame* createFrame(const KURL&, const String& name, Element* ownerElement, const String& referrer);
Widget* createJavaAppletWidget(const IntSize&, Element*, const HashMap<String, String>&);
FrameGdkClient* client() const { return m_client; }
private:
virtual bool isLoadTypeReload();
virtual bool passMouseDownEventToWidget(Widget*);
......
......@@ -38,16 +38,6 @@ PopupMenu::~PopupMenu()
{
}
void PopupMenu::clear()
{
notImplemented();
}
void PopupMenu::populate()
{
notImplemented();
}
void PopupMenu::show(const IntRect&, FrameView*, int)
{
notImplemented();
......@@ -58,19 +48,9 @@ void PopupMenu::hide()
notImplemented();
}
void PopupMenu::addSeparator()
void PopupMenu::updateFromElement()
{
notImplemented();
}
void PopupMenu::addGroupLabel(HTMLOptGroupElement*)
{
notImplemented();
}
void PopupMenu::addOption(HTMLOptionElement*)
{
notImplemented();
notImplemented();
}
}
......
......@@ -28,10 +28,11 @@
#include "config.h"
#include "Screen.h"
#include "Page.h"
#include "FloatRect.h"
#include "Frame.h"
#include "FrameView.h"
#include "Page.h"
#include "Widget.h"
#include "FloatRect.h"
#include <gdk/gdk.h>
......
......@@ -27,46 +27,50 @@
#include "config.h"
#include <stdio.h>
#include <stdlib.h>
#include "AXObjectCache.h"
#include "CachedResource.h"
#include "ChromeClientGdk.h"
#include "CookieJar.h"
#include "CString.h"
#include "Node.h"
#include "TextField.h"
#include "Cursor.h"
#include "EditCommand.h"
#include "FileChooser.h"
#include "Font.h"
#include "ListBox.h"
#include "IntPoint.h"
#include "Widget.h"
#include "GraphicsContext.h"
#include "Slider.h"
#include "Cursor.h"
#include "loader.h"
#include "FrameGdk.h"
#include "FrameLoadRequest.h"
#include "FrameView.h"
#include "KURL.h"
#include "PlatformScrollBar.h"
#include "ScrollBar.h"
#include "Path.h"
#include "PlatformMouseEvent.h"
#include "CookieJar.h"
#include "Screen.h"
#include "GraphicsContext.h"
#include "History.h"
#include "Icon.h"
#include "IconDatabase.h"
#include "IconLoader.h"
#include "IntPoint.h"
#include "KURL.h"
#include "Language.h"
#include "loader.h"
#include "LocalizedStrings.h"
#include "Node.h"
#include "Page.h"
#include "Path.h"
#include "PlatformMouseEvent.h"
#include "PlatformScrollBar.h"
#include "PlugInInfoStore.h"
#include "RenderTheme.h"
#include "FrameGdk.h"
#include "FrameLoadRequest.h"
#include "RenderThemeGdk.h"
#include "ResourceLoader.h"
#include "Screen.h"
#include "ScrollBar.h"
#include "Slider.h"
#include "TextBoundaries.h"
#include "AXObjectCache.h"
#include "EditCommand.h"
#include "Icon.h"
#include "IconLoader.h"
#include "IconDatabase.h"
#include "CachedResource.h"
#include "TextField.h"
#include "Widget.h"
#include <stdio.h>
#include <stdlib.h>
using namespace WebCore;
#define notImplemented() do { fprintf(stderr, "%s FIXME: UNIMPLEMENTED %s:%d\n", __PRETTY_FUNCTION__, __FILE__, __LINE__); } while(0)
namespace WebCore {
struct PlatformDataStruct
{
......@@ -77,8 +81,6 @@ struct PlatformResponseStruct
};
}
#define notImplemented() do { fprintf(stderr, "FIXME: UNIMPLEMENTED: %s in %s:%d\n", __FUNCTION__, __FILE__, __LINE__); } while(0)
void FrameView::updateBorder() { notImplemented(); }
bool FrameView::passMousePressEventToScrollbar(MouseEventWithHitTestResults&, PlatformScrollbar*) { return false; }
bool FrameView::passMousePressEventToSubframe(MouseEventWithHitTestResults&, Frame*) { return true; }
......@@ -114,18 +116,7 @@ Slider::~Slider() { notImplemented(); }
void Slider::setFont(WebCore::Font const&) { notImplemented(); }
double Slider::value() const { notImplemented(); return 0; }
void ListBox::setSelected(int, bool) { notImplemented(); }
IntSize ListBox::sizeForNumberOfLines(int) const { notImplemented(); return IntSize(); }
bool ListBox::isSelected(int) const { notImplemented(); return 0; }
void ListBox::appendItem(DeprecatedString const&, ListBoxItemType, bool) { notImplemented(); }
void ListBox::doneAppendingItems() { notImplemented(); }
void ListBox::setWritingDirection(TextDirection) { notImplemented(); }
void ListBox::setEnabled(bool) { notImplemented(); }
void ListBox::clear() { notImplemented(); }
bool ListBox::checksDescendantsForFocus() const { notImplemented(); return 0; }
Widget::FocusPolicy Slider::focusPolicy() const { notImplemented(); return NoFocus; }
Widget::FocusPolicy ListBox::focusPolicy() const { notImplemented(); return NoFocus; }
Widget::FocusPolicy TextField::focusPolicy() const { notImplemented(); return NoFocus; }
Cursor::Cursor(Image*, const IntPoint&) { notImplemented(); }
......@@ -138,9 +129,7 @@ void WebCore::findSentenceBoundary(UChar const*, int, int, int*, int*) { notImpl
int WebCore::findNextWordFromIndex(UChar const*, int, int, bool) { notImplemented(); return 0; }
namespace WebCore {
Vector<char> ServeSynchronousRequest(Loader*,DocLoader*,ResourceHandle*,KURL&,DeprecatedString&) { notImplemented(); return Vector<char>(); }
Vector<char> ServeSynchronousRequest(Loader *loader, DocLoader *docLoader, const ResourceRequest& request, ResourceResponse& response) { notImplemented(); return Vector<char>(); }
}
void FrameGdk::focusWindow() { notImplemented(); }
......@@ -179,6 +168,12 @@ bool FrameGdk::isLoadTypeReload() { notImplemented(); return false; }
KURL FrameGdk::originalRequestURL() const { return KURL(); }
Plugin* FrameGdk::createPlugin(Element*, KURL const&, const Vector<String>&, const Vector<String>&, String const&) { notImplemented(); return 0; }
void FrameGdk::goBackOrForward(int distance) { notImplemented(); }
int FrameGdk::getHistoryLength() {notImplemented(); return 0; }
KURL FrameGdk::historyURL(int distance) { notImplemented(); return KURL(); }
bool ChromeClientGdk::canRunModal() { notImplemented(); return 0; }
void ChromeClientGdk::runModal() { notImplemented(); }
int WebCore::screenDepthPerComponent(const Page*) { notImplemented(); return 0; }
bool WebCore::screenIsMonochrome(const Page*) { notImplemented(); return false; }
......@@ -206,9 +201,6 @@ unsigned PlugInInfoStore::pluginCount() const { return 0; }
bool WebCore::PlugInInfoStore::supportsMIMEType(const WebCore::String&) { return false; }
void WebCore::refreshPlugins(bool) { }
void WebCore::ResourceHandle::assembleResponseHeaders() const { }
void WebCore::ResourceHandle::retrieveCharset() const { }
void FrameGdk::restoreDocumentState() { }
void FrameGdk::partClearedInBegin() { }
void FrameGdk::createEmptyDocument() { }
......@@ -231,6 +223,8 @@ void FrameGdk::respondToChangedContents(const Selection&) { }
namespace WebCore {
void systemBeep() { notImplemented(); }
bool CheckIfReloading(DocLoader*) { return false; }
time_t CacheObjectExpiresTime(DocLoader*, PlatformResponse) { return 0; }
void CheckCacheObjectStatus(DocLoader*, CachedResource*) { }
......@@ -238,7 +232,7 @@ DeprecatedString ResponseURL(PlatformResponse) { return DeprecatedString(); }
bool IsResponseURLEqualToURL(PlatformResponse , const String& URL) { return false; }
bool ResponseIsMultipart(PlatformResponse) { return false; }
DeprecatedString ResponseMIMEType(PlatformResponse) { return DeprecatedString(); }
void CachedResource::setResponse(PlatformResponse) { notImplemented(); }
void CachedResource::setPlatformResponse(PlatformResponse) { notImplemented(); }
void CachedResource::setAllData(PlatformData) { notImplemented(); }
}
......@@ -296,6 +290,7 @@ void Path::closeSubpath() { }
void Path::addArc(const FloatPoint&, float, float, float, bool) { }
void Path::addRect(const FloatRect&) { }
void Path::addEllipse(const FloatRect&) { }
void Path::transform(const AffineTransform& transform) {}
TextField::TextField(TextField::Type) { }
TextField::~TextField() { }
......@@ -326,11 +321,6 @@ void PlatformScrollbar::updateThumbPosition() { }
void PlatformScrollbar::updateThumbProportion() { }
void PlatformScrollbar::setRect(const IntRect&) { }
ListBox::ListBox() { }
ListBox::~ListBox() { }
void ListBox::setSelectionMode(ListBox::SelectionMode) { }
void ListBox::setFont(WebCore::Font const&) { }
FileChooser::FileChooser(Document*, RenderFileUploadControl*) { notImplemented(); }
FileChooser::~FileChooser() { notImplemented(); }
PassRefPtr<FileChooser> FileChooser::create(Document*, RenderFileUploadControl*) { notImplemented(); return 0; }
......@@ -352,19 +342,14 @@ void RenderThemeGdk::setRadioSize(RenderStyle*) const { }
void RenderThemeGdk::adjustTextFieldStyle(CSSStyleSelector*, RenderStyle*, Element* e) const {}
bool RenderThemeGdk::paintTextField(RenderObject*, const RenderObject::PaintInfo&, const IntRect&) { return false; }
bool ResourceLoader::loadsBlocked() { notImplemented(); return false; }
Icon::Icon() { notImplemented(); }
Icon::~Icon() { notImplemented(); }
PassRefPtr<Icon> Icon::newIconForFile(const String& filename) { notImplemented(); return PassRefPtr<Icon>(new Icon()); }
void Icon::paint(GraphicsContext*, const IntRect&) { notImplemented(); }
void IconLoader::stopLoading() { notImplemented(); }
void IconLoader::startLoading() { notImplemented(); }
IconLoader* IconLoader::createForFrame(Frame *frame) { return 0; }
bool IconDatabase::isIconExpiredForIconURL(const String& url) { return false; }
bool IconDatabase::hasEntryForIconURL(const String& url) { return false; }
IconDatabase* IconDatabase::sharedIconDatabase() { return 0; }
bool IconDatabase::setIconURLForPageURL(const String& iconURL, const String& pageURL) { return false; }
void IconLoader::notifyIconChanged(const KURL&) { notImplemented(); }
FloatRect Font::selectionRectForComplexText(const TextRun&, const TextStyle&, const IntPoint&, int) const { return FloatRect(); }
void Font::drawComplexText(GraphicsContext*, const TextRun&, const TextStyle&, const FloatPoint&) const { notImplemented(); }
......
......@@ -63,7 +63,7 @@ static size_t writeCallback(void* ptr, size_t size, size_t nmemb, void* obj)
ResourceHandle* job = static_cast<ResourceHandle*>(obj);
ResourceHandleInternal* d = job->getInternal();
int totalSize = size * nmemb;
d->client->didReceiveData(job, static_cast<char*>(ptr), totalSize);
d->m_client->didReceiveData(job, static_cast<char*>(ptr), totalSize);
return totalSize;
}
......@@ -86,8 +86,8 @@ void ResourceHandleManager::downloadTimerCallback(Timer<ResourceHandleManager>*
CURLcode res = curl_easy_perform(d->m_handle);
if (res != CURLE_OK)
printf("Error WITH JOB %d\n", res);
d->client->receivedAllData(job, 0);
d->client->didFinishLoading(job);
d->m_client->receivedAllData(job, 0);
d->m_client->didFinishLoading(job);
curl_easy_cleanup(d->m_handle);
d->m_handle = 0;
}
......@@ -169,8 +169,8 @@ void ResourceHandleManager::remove(ResourceHandle* job)
jobs->remove(job);
if (jobs->isEmpty())
m_downloadTimer.stop();
d->client->receivedAllData(job, 0);
d->client->didFinishLoading(job);
d->m_client->receivedAllData(job, 0);
d->m_client->didFinishLoading(job);
if (d->m_handle) {
curl_multi_remove_handle(curlMultiHandle, d->m_handle);
curl_easy_cleanup(d->m_handle);
......@@ -182,7 +182,7 @@ void ResourceHandleManager::add(ResourceHandle* job)
{
bool startTimer = jobs->isEmpty();
ResourceHandleInternal* d = job->getInternal();
DeprecatedString url = d->URL.url();
DeprecatedString url = job->url().url();
d->m_handle = curl_easy_init();
curl_easy_setopt(d->m_handle, CURLOPT_PRIVATE, job);
curl_easy_setopt(d->m_handle, CURLOPT_ERRORBUFFER, error_buffer);
......@@ -203,7 +203,7 @@ void ResourceHandleManager::add(ResourceHandle* job)
// don't call perform, because events must be async
// timeout will occur and do curl_multi_perform
if (ret && ret != CURLM_CALL_MULTI_PERFORM) {
printf("Error %d starting job %s\n", ret, d->URL.url().ascii());
printf("Error %d starting job %s\n", ret, job->url().url().ascii());
job->setError(1);
startTimer =false;
} else
......
2006-11-06 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
Reviewed by Maciej.
Linux\gdk build fixes.
* GdkLauncher/main.cpp:
(LauncherFrameGdk::LauncherFrameGdk):
(main):
2006-11-06 Alexey Proskuryakov <ap@nypop.com>
Build fix, approved in principle by Tim H.
......
......@@ -28,7 +28,7 @@ using namespace WebCore;
class LauncherFrameGdk : public FrameGdk
{
public:
LauncherFrameGdk(Page* page, Element* element) : FrameGdk(page, element), m_exitAfterLoading(false) {}
LauncherFrameGdk(Page* page, Element* element, PassRefPtr<EditorClient> editorClient) : FrameGdk(page, element, editorClient), m_exitAfterLoading(false) {}
LauncherFrameGdk(GdkDrawable* drawable) : FrameGdk(drawable), m_exitAfterLoading(false) {}
virtual void handledOnloadEvents();
void setExitAfterLoading(bool exitAfterLoading) { m_exitAfterLoading = exitAfterLoading; }
......@@ -81,7 +81,7 @@ int main(int argc, char *argv[])
frame->setExitAfterLoading(exitAfterLoading);
if (url) {
printf("OPENING URL == %s \n", url);
frame->openURL(url);
frame->client()->openURL(url);
} else {
#if 0
char *pg = " <html><head><title>Google</title> <body bgcolor=#ffffff text=#000000> <p><font size=-2/>2006 Google Hello bigworld from mike</p></body></html> ";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment