Reviewed by Anders.
Remove junk (as gcc calls it) after #else clause.
* wtf/FastMalloc.cpp:
(WTF::do_free):
2006-10-15 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
Reviewed by Anders.
Misc Gdk/Linux build fixes.
* platform/gdk/BrowserExtensionGdk.h:
* platform/gdk/FrameGdk.cpp:
(WebCore::FrameGdk::submitForm):
(WebCore::FrameGdk::urlSelected):
* platform/gdk/FrameGdk.h:
* platform/gdk/RenderPopupMenuGdk.cpp:
(WebCore::PopupMenu::PopupMenu):
(WebCore::PopupMenu::~PopupMenu):
(WebCore::PopupMenu::clear):
(WebCore::PopupMenu::populate):
(WebCore::PopupMenu::show):
(WebCore::PopupMenu::hide):
(WebCore::PopupMenu::addSeparator):
(WebCore::PopupMenu::addGroupLabel):
(WebCore::PopupMenu::addOption):
* platform/gdk/RenderPopupMenuGdk.h:
* platform/gdk/RenderThemeGdk.cpp:
* platform/gdk/RenderThemeGdk.h:
(WebCore::RenderThemeGdk::RenderThemeGdk):
* platform/gdk/TemporaryLinkStubs.cpp:
(BrowserExtensionGdk::createNewWindow):
(BrowserExtensionGdk::BrowserExtensionGdk):
(BrowserExtensionGdk::setTypedIconURL):
(BrowserExtensionGdk::setIconURL):
(BrowserExtensionGdk::getHistoryLength):
(WebCore::CheckIfReloading):
(WebCore::CacheObjectExpiresTime):
(WebCore::ResponseURL):
(WebCore::IsResponseURLEqualToURL):
(WebCore::ResponseIsMultipart):
(WebCore::ResponseMIMEType):
(WebCore::CachedResource::setResponse):
(WebCore::CachedResource::setAllData):
(FileChooser::disconnectUploadControl):
* rendering/RenderTheme.h:
* rendering/RenderThemeMac.h:
2006-10-15 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
Reviewed by Anders.
Make compiler not complain about unused gk. SpinneretWebHost was not setting
initial refcount upon creation, so it is completely bogus.
* GdkLauncher/main.cpp:
(main):
* Spinneret/Spinneret/Spinneret.h:
(SpinneretWebHost::SpinneretWebHost):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@17065
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2006-10-15 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
+
+ Reviewed by Anders.
+
+ Remove junk (as gcc calls it) after #else clause.
+
+ * wtf/FastMalloc.cpp:
+ (WTF::do_free):
+
2006-10-14 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
Reviewed by Maciej.
#endif
#if WTF_CHANGES
if (ptr == NULL) return;
-#else WTF_CHANGES
+#else
if (ptr == NULL || tcmalloc_is_destroyed) return;
#endif
+2006-10-15 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
+
+ Reviewed by Anders.
+
+ Misc Gdk/Linux build fixes.
+
+ * platform/gdk/BrowserExtensionGdk.h:
+ * platform/gdk/FrameGdk.cpp:
+ (WebCore::FrameGdk::submitForm):
+ (WebCore::FrameGdk::urlSelected):
+ * platform/gdk/FrameGdk.h:
+ * platform/gdk/RenderPopupMenuGdk.cpp:
+ (WebCore::PopupMenu::PopupMenu):
+ (WebCore::PopupMenu::~PopupMenu):
+ (WebCore::PopupMenu::clear):
+ (WebCore::PopupMenu::populate):
+ (WebCore::PopupMenu::show):
+ (WebCore::PopupMenu::hide):
+ (WebCore::PopupMenu::addSeparator):
+ (WebCore::PopupMenu::addGroupLabel):
+ (WebCore::PopupMenu::addOption):
+ * platform/gdk/RenderPopupMenuGdk.h:
+ * platform/gdk/RenderThemeGdk.cpp:
+ * platform/gdk/RenderThemeGdk.h:
+ (WebCore::RenderThemeGdk::RenderThemeGdk):
+ * platform/gdk/TemporaryLinkStubs.cpp:
+ (BrowserExtensionGdk::createNewWindow):
+ (BrowserExtensionGdk::BrowserExtensionGdk):
+ (BrowserExtensionGdk::setTypedIconURL):
+ (BrowserExtensionGdk::setIconURL):
+ (BrowserExtensionGdk::getHistoryLength):
+ (WebCore::CheckIfReloading):
+ (WebCore::CacheObjectExpiresTime):
+ (WebCore::ResponseURL):
+ (WebCore::IsResponseURLEqualToURL):
+ (WebCore::ResponseIsMultipart):
+ (WebCore::ResponseMIMEType):
+ (WebCore::CachedResource::setResponse):
+ (WebCore::CachedResource::setAllData):
+ (FileChooser::disconnectUploadControl):
+ * rendering/RenderTheme.h:
+ * rendering/RenderThemeMac.h:
+
2006-10-15 Sam Weinig <sam.weinig@gmail.com>
Reviewed by Mitz.
public:
BrowserExtensionGdk(Frame*);
- virtual void createNewWindow(const ResourceRequest&);
- virtual void createNewWindow(const ResourceRequest&, const WindowArgs&, Frame*&);
+ virtual void createNewWindow(const FrameLoadRequest&);
+ virtual void createNewWindow(const FrameLoadRequest&, const WindowArgs&, Frame*&);
virtual void setIconURL(const KURL&);
virtual void setTypedIconURL(const KURL&, const String& type);
#include "TypingCommand.h"
#include "SSLKeyGenerator.h"
#include "KeyboardCodes.h"
+#include "FrameLoadRequest.h"
#include <gdk/gdk.h>
return true;
}
-void FrameGdk::submitForm(const ResourceRequest& request)
+void FrameGdk::submitForm(const FrameLoadRequest& frameLoadRequest)
{
+ ResourceRequest request = frameLoadRequest.m_request;
+
// FIXME: this is a hack inherited from FrameMac, and should be pushed into Frame
if (d->m_submittedFormURL == request.url())
return;
clearRecordedFormValues();
}
-void FrameGdk::urlSelected(const ResourceRequest& request)
+void FrameGdk::urlSelected(const FrameLoadRequest& frameLoadRequest)
{
+ ResourceRequest request = frameLoadRequest.m_request;
+
if (!m_client)
return;
void handleGdkEvent(GdkEvent*);
virtual bool openURL(const KURL&);
- virtual void openURLRequest(const ResourceRequest&);
- virtual void submitForm(const ResourceRequest&);
- virtual void urlSelected(const ResourceRequest&);
+ virtual void openURLRequest(const FrameLoadRequest&);
+ virtual void submitForm(const FrameLoadRequest&);
+ virtual void urlSelected(const FrameLoadRequest&);
virtual void setTitle(const String&);
*/
#include "config.h"
-#include "RenderPopupMenuGdk.h"
+#include "PopupMenu.h"
+
+#include <stdio.h>
+
+#define notImplemented() do { fprintf(stderr, "FIXME: UNIMPLEMENTED: %s:%d\n", __FILE__, __LINE__); } while(0)
namespace WebCore {
-RenderPopupMenuGdk::RenderPopupMenuGdk(Node* element, RenderMenuList* list)
- : RenderPopupMenu(element,list)
+PopupMenu::PopupMenu(RenderMenuList* menuList)
{
}
-RenderPopupMenuGdk::~RenderPopupMenuGdk()
+PopupMenu::~PopupMenu()
{
}
-void RenderPopupMenuGdk::clear()
+void PopupMenu::clear()
{
+ notImplemented();
}
-void RenderPopupMenuGdk::populate()
+void PopupMenu::populate()
{
+ notImplemented();
}
-void RenderPopupMenuGdk::showPopup(const IntRect&, FrameView*, int)
+void PopupMenu::show(const IntRect&, FrameView*, int)
{
+ notImplemented();
}
-void RenderPopupMenuGdk::hidePopup()
+void PopupMenu::hide()
{
+ notImplemented();
}
-void RenderPopupMenuGdk::addSeparator()
+void PopupMenu::addSeparator()
{
+ notImplemented();
}
-void RenderPopupMenuGdk::addGroupLabel(HTMLOptGroupElement*)
+void PopupMenu::addGroupLabel(HTMLOptGroupElement*)
{
+ notImplemented();
}
-void RenderPopupMenuGdk::addOption(HTMLOptionElement*)
+void PopupMenu::addOption(HTMLOptionElement*)
{
+ notImplemented();
}
}
+
#ifndef RENDER_POPUPMENU_GDK_H
#define RENDER_POPUPMENU_GDK_H
-#include "RenderPopupMenu.h"
+#include "PopupMenu.h"
namespace WebCore {
class HTMLOptionElement;
class HTMLOptGroupElement;
-class RenderPopupMenuGdk : public RenderPopupMenu {
+class PopupMenuGdk : public PopupMenu {
public:
- RenderPopupMenuGdk(Node*, RenderMenuList*);
- ~RenderPopupMenuGdk();
+ PopupMenuGdk(Node*, RenderMenuList*);
+ ~PopupMenuGdk();
virtual void clear();
virtual void populate();
return &gdkTheme;
}
-RenderThemeGdk::RenderThemeGdk()
-{
-}
-
-RenderThemeGdk::~RenderThemeGdk()
-{
-}
-
void RenderThemeGdk::close()
{
}
addIntrinsicMargins(style);
}
-RenderPopupMenu* RenderThemeGdk::createPopupMenu(RenderArena* arena, Document* doc, RenderMenuList* list)
-{
- return new (arena) RenderPopupMenuGdk(doc,list);
-}
-
void RenderThemeGdk::systemFont(int propId, FontDescription&) const
{
class RenderThemeGdk : public RenderTheme {
public:
- RenderThemeGdk();
- ~RenderThemeGdk();
+ RenderThemeGdk() : RenderTheme() { }
// A method asking if the theme's controls actually care about redrawing when hovered.
virtual bool supportsHover(const RenderStyle* style) const { return true; }
// System fonts.
virtual void systemFont(int propId, FontDescription&) const;
- virtual RenderPopupMenu* createPopupMenu(RenderArena*, Document*, RenderMenuList*);
-
private:
void addIntrinsicMargins(RenderStyle*) const;
void close();
#include "config.h"
-#define WIN32_COMPILE_HACK
-
#include <stdio.h>
#include <stdlib.h>
#include "CString.h"
#include "RenderTheme.h"
#include "FrameGdk.h"
#include "BrowserExtensionGdk.h"
-#include "ResourceLoader.h"
+#include "FrameLoadRequest.h"
#include "RenderThemeGdk.h"
#include "TextBoundaries.h"
#include "AXObjectCache.h"
-#include "RenderPopupMenuGdk.h"
#include "EditCommand.h"
#include "Icon.h"
#include "IconLoader.h"
#include "IconDatabase.h"
+#include "CachedResource.h"
using namespace WebCore;
-static void notImplemented() { puts("Not yet implemented"); }
+namespace WebCore {
+struct PlatformDataStruct
+{
+};
+
+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 FrameGdk::passMouseDownEventToWidget(Widget*) { notImplemented(); return 0; }
void FrameGdk::issueCutCommand() { notImplemented(); }
void FrameGdk::issueCopyCommand() { notImplemented(); }
-void FrameGdk::openURLRequest(struct WebCore::ResourceRequest const&) { notImplemented(); }
+void FrameGdk::openURLRequest(struct WebCore::FrameLoadRequest const&) { notImplemented(); }
void FrameGdk::issueUndoCommand() { notImplemented(); }
String FrameGdk::mimeTypeForFileName(String const&) const { notImplemented(); return String(); }
void FrameGdk::issuePasteCommand() { notImplemented(); }
Plugin* FrameGdk::createPlugin(Element*, KURL const&, const Vector<String>&, const Vector<String>&, String const&) { notImplemented(); return 0; }
bool BrowserExtensionGdk::canRunModal() { notImplemented(); return 0; }
-void BrowserExtensionGdk::createNewWindow(struct WebCore::ResourceRequest const&, struct WebCore::WindowArgs const&, Frame*&) { notImplemented(); }
+void BrowserExtensionGdk::createNewWindow(struct WebCore::FrameLoadRequest const&, struct WebCore::WindowArgs const&, Frame*&) { notImplemented(); }
+void BrowserExtensionGdk::createNewWindow(struct WebCore::FrameLoadRequest const&) { notImplemented(); }
bool BrowserExtensionGdk::canRunModalNow() { notImplemented(); return 0; }
void BrowserExtensionGdk::runModal() { notImplemented(); }
void BrowserExtensionGdk::goBackOrForward(int) { notImplemented(); }
KURL BrowserExtensionGdk::historyURL(int distance) { notImplemented(); return KURL(); }
-void BrowserExtensionGdk::createNewWindow(struct WebCore::ResourceRequest const&) { notImplemented(); }
+BrowserExtensionGdk::BrowserExtensionGdk(WebCore::Frame*) { }
+void BrowserExtensionGdk::setTypedIconURL(KURL const&, const String&) { }
+void BrowserExtensionGdk::setIconURL(KURL const&) { }
+int BrowserExtensionGdk::getHistoryLength() { return 0; }
int WebCore::screenDepthPerComponent(const Page*) { notImplemented(); return 0; }
bool WebCore::screenIsMonochrome(const Page*) { notImplemented(); return false; }
void FrameGdk::markMisspellingsInAdjacentWords(WebCore::VisiblePosition const&) { }
void FrameGdk::respondToChangedContents(const Selection&) { }
-BrowserExtensionGdk::BrowserExtensionGdk(WebCore::Frame*) { }
-void BrowserExtensionGdk::setTypedIconURL(KURL const&, const String&) { }
-void BrowserExtensionGdk::setIconURL(KURL const&) { }
-int BrowserExtensionGdk::getHistoryLength() { return 0; }
-
namespace WebCore {
-bool CheckIfReloading(WebCore::DocLoader*) { return false; }
+bool CheckIfReloading(DocLoader*) { return false; }
+time_t CacheObjectExpiresTime(DocLoader*, PlatformResponse) { return 0; }
void CheckCacheObjectStatus(DocLoader*, CachedResource*) { }
+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::setAllData(PlatformData) { notImplemented(); }
}
void PlatformScrollbar::updateThumbProportion() { }
void PlatformScrollbar::setRect(const IntRect&) { }
-Scrollbar::Scrollbar(ScrollbarClient*, ScrollbarOrientation, ScrollbarControlSize controlSize) { }
-void Scrollbar::setSteps(int, int) { }
-bool Scrollbar::scroll(ScrollDirection, ScrollGranularity, float) { return false; }
-bool Scrollbar::setValue(int) { return false; }
-void Scrollbar::setProportion(int, int) { }
-
ListBox::ListBox() { }
ListBox::~ListBox() { }
void ListBox::setSelectionMode(ListBox::SelectionMode) { }
PassRefPtr<FileChooser> FileChooser::create(Document*, RenderFileUploadControl*) { notImplemented(); return 0; }
void FileChooser::openFileChooser() { notImplemented(); }
String FileChooser::basenameForWidth(int width) const { notImplemented(); return String(); }
-void FileChooser::uploadControlDetaching() { notImplemented(); }
+void FileChooser::disconnectUploadControl() { notImplemented(); }
void FileChooser::chooseFile(const String& filename) { notImplemented(); }
Color WebCore::focusRingColor() { return 0xFF0000FF; }
namespace WebCore {
class Element;
-class RenderPopupMenu;
+class PopupMenu;
class RenderMenuList;
enum ControlState { HoverState, PressedState, FocusState, EnabledState, CheckedState, ReadOnlyState };
namespace WebCore {
class RenderStyle;
-class RenderPopupMenu;
class RenderThemeMac : public RenderTheme {
public:
+2006-10-15 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
+
+ Reviewed by Anders.
+
+ Make compiler not complain about unused gk. SpinneretWebHost was not setting
+ initial refcount upon creation, so it is completely bogus.
+
+ * GdkLauncher/main.cpp:
+ (main):
+ * Spinneret/Spinneret/Spinneret.h:
+ (SpinneretWebHost::SpinneretWebHost):
+
2006-10-15 Nikolas Zimmermann <zimmermann@kde.org>
Reviewed by Oliver.
win = gdk_window_new(NULL,&attr,0);
frame = new LauncherFrameGdk(win);
gdk_window_show(win);
- 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> ";
url = "http://www.google.com";
bool exitAfterLoading = false;
for (int argPos = 1; argPos < argc; ++argPos) {
printf("OPENING URL == %s \n", url);
frame->openURL(url);
} else {
-/*
- frame->createEmptyDocument();
- frame->document()->open();
- frame->write(pg,strlen(pg));
- frame->document()->close();
-*/
+#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> ";
+ frame->createEmptyDocument();
+ frame->document()->open();
+ frame->write(pg,strlen(pg));
+ frame->document()->close();
+#endif
}
gtk_main();
class SpinneretWebHost : public IWebFrameLoadDelegate
{
public:
+ SpinneretWebHost() : m_refCount(1) {}
+
// IUnknown
virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject);
virtual ULONG STDMETHODCALLTYPE AddRef(void);