From 00c4ac1b800d19d7473941ad26373196f49efc66 Mon Sep 17 00:00:00 2001 From: thatcher Date: Sat, 2 Sep 2006 19:15:52 +0000 Subject: [PATCH] JavaScriptCore: Reviewed by Tim H. Bug 10454: Unix bakefile fixes http://bugzilla.opendarwin.org/show_bug.cgi?id=10454 * JavaScriptCoreSources.bkl: WebCore: Reviewed by Tim H. Bug 10454: Unix bakefile fixes http://bugzilla.opendarwin.org/show_bug.cgi?id=10454 * WebCoreSources.bkl: * platform/gdk/RenderPopupMenuGdk.cpp: (WebCore::RenderPopupMenuGdk::RenderPopupMenuGdk): * platform/gdk/RenderPopupMenuGdk.h: * platform/gdk/RenderThemeGdk.cpp: (WebCore::RenderThemeGdk::createPopupMenu): (WebCore::RenderThemeGdk::systemFont): * platform/gdk/RenderThemeGdk.h: * platform/gdk/TemporaryLinkStubs.cpp: * webcore-base.bkl: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@16193 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- JavaScriptCore/ChangeLog | 9 ++++ JavaScriptCore/JavaScriptCoreSources.bkl | 1 + WebCore/ChangeLog | 18 +++++++ WebCore/WebCoreSources.bkl | 54 ++++++++++----------- WebCore/platform/gdk/RenderPopupMenuGdk.cpp | 4 +- WebCore/platform/gdk/RenderPopupMenuGdk.h | 2 +- WebCore/platform/gdk/RenderThemeGdk.cpp | 9 +++- WebCore/platform/gdk/RenderThemeGdk.h | 5 +- WebCore/platform/gdk/TemporaryLinkStubs.cpp | 29 ----------- WebCore/webcore-base.bkl | 4 -- 10 files changed, 68 insertions(+), 67 deletions(-) diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog index a9eea188754..772622e27f1 100644 --- a/JavaScriptCore/ChangeLog +++ b/JavaScriptCore/ChangeLog @@ -1,3 +1,12 @@ +2006-09-02 Krzysztof Kowalczyk + + Reviewed by Tim H. + + Bug 10454: Unix bakefile fixes + http://bugzilla.opendarwin.org/show_bug.cgi?id=10454 + + * JavaScriptCoreSources.bkl: + 2006-09-01 Nikolas Zimmermann Reviewed by hyatt. Landed by eseidel. diff --git a/JavaScriptCore/JavaScriptCoreSources.bkl b/JavaScriptCore/JavaScriptCoreSources.bkl index c368504e70c..09816ffc54b 100644 --- a/JavaScriptCore/JavaScriptCoreSources.bkl +++ b/JavaScriptCore/JavaScriptCoreSources.bkl @@ -20,6 +20,7 @@ kjs/interpreter.cpp kjs/JSImmediate.cpp kjs/JSLock.cpp + kjs/JSWrapperObject.cpp kjs/lexer.cpp kjs/list.cpp kjs/lookup.cpp diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index 7d57632fe9f..1c30780ac90 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -1,3 +1,21 @@ +2006-09-02 Krzysztof Kowalczyk + + Reviewed by Tim H. + + Bug 10454: Unix bakefile fixes + http://bugzilla.opendarwin.org/show_bug.cgi?id=10454 + + * WebCoreSources.bkl: + * platform/gdk/RenderPopupMenuGdk.cpp: + (WebCore::RenderPopupMenuGdk::RenderPopupMenuGdk): + * platform/gdk/RenderPopupMenuGdk.h: + * platform/gdk/RenderThemeGdk.cpp: + (WebCore::RenderThemeGdk::createPopupMenu): + (WebCore::RenderThemeGdk::systemFont): + * platform/gdk/RenderThemeGdk.h: + * platform/gdk/TemporaryLinkStubs.cpp: + * webcore-base.bkl: + 2006-09-02 Adele Peterson Reviewed by Anders. diff --git a/WebCore/WebCoreSources.bkl b/WebCore/WebCoreSources.bkl index d098fcbc9d4..76842d91cdf 100644 --- a/WebCore/WebCoreSources.bkl +++ b/WebCore/WebCoreSources.bkl @@ -26,6 +26,7 @@ DerivedSources/WebCore/JSDocumentFragment.cpp DerivedSources/WebCore/JSDocumentType.cpp DerivedSources/WebCore/JSDOMImplementation.cpp + DerivedSources/WebCore/JSDOMParser.cpp DerivedSources/WebCore/JSDOMWindow.cpp DerivedSources/WebCore/JSElement.cpp DerivedSources/WebCore/JSEntity.cpp @@ -81,13 +82,16 @@ DerivedSources/WebCore/JSMutationEvent.cpp DerivedSources/WebCore/JSNode.cpp DerivedSources/WebCore/JSNodeFilter.cpp + DerivedSources/WebCore/JSNodeIterator.cpp DerivedSources/WebCore/JSNotation.cpp DerivedSources/WebCore/JSProcessingInstruction.cpp DerivedSources/WebCore/JSRange.cpp DerivedSources/WebCore/JSText.cpp + DerivedSources/WebCore/JSTreeWalker.cpp DerivedSources/WebCore/JSOverflowEvent.cpp DerivedSources/WebCore/JSUIEvent.cpp DerivedSources/WebCore/JSWheelEvent.cpp + DerivedSources/WebCore/JSXMLSerializer.cpp DerivedSources/WebCore/JSXPathEvaluator.cpp DerivedSources/WebCore/JSXPathExpression.cpp DerivedSources/WebCore/JSXPathNSResolver.cpp @@ -466,35 +470,28 @@ rendering/RootInlineBox.cpp - - - xpath/XPathEvaluator.cpp - xpath/XPathExpression.cpp - xpath/XPathNamespace.cpp - xpath/XPathNSResolver.cpp - xpath/XPathResult.cpp - - - - - xpath/impl/XPathExpressionNode.cpp - xpath/impl/XPathFunctions.cpp - xpath/impl/XPathParser.cpp - xpath/impl/XPathPath.cpp - xpath/impl/XPathPredicate.cpp - xpath/impl/XPathStep.cpp - xpath/impl/XPathUtil.cpp - xpath/impl/XPathValue.cpp - xpath/impl/XPathVariableReference.cpp - - + xml/DOMParser.cpp xml/xmlhttprequest.cpp - xml/XSLImportRule.cpp + xml/XMLSerializer.cpp + xml/XPathEvaluator.cpp + xml/XPathExpression.cpp + xml/XPathExpressionNode.cpp + xml/XPathFunctions.cpp + xml/XPathNamespace.cpp + xml/XPathNSResolver.cpp + xml/XPathParser.cpp + xml/XPathPath.cpp + xml/XPathPredicate.cpp + xml/XPathResult.cpp + xml/XPathStep.cpp + xml/XPathUtil.cpp + xml/XPathValue.cpp + xml/XPathVariableReference.cpp + xml/XSLImportRule.cpp xml/XSLStyleSheet.cpp xml/XSLTProcessor.cpp - @@ -701,14 +698,14 @@ bindings/js/JSCanvasRenderingContext2DCustom.cpp - bindings/js/JSDOMParser.cpp bindings/js/JSHTMLElementWrapperFactory.cpp - bindings/js/JSHTMLFormElementCustom.cpp + bindings/js/JSHTMLFormElementCustom.cpp bindings/js/JSHTMLInputElementBase.cpp - bindings/js/JSHTMLOptionsCollectionCustom.cpp bindings/js/JSHTMLOptionElementConstructor.cpp + bindings/js/JSHTMLOptionsCollectionCustom.cpp + bindings/js/JSNodeIteratorCustom.cpp + bindings/js/JSTreeWalkerCustom.cpp bindings/js/JSXMLHttpRequest.cpp - bindings/js/JSXMLSerializer.cpp bindings/js/JSXSLTProcessor.cpp bindings/js/kjs_binding.cpp bindings/js/kjs_css.cpp @@ -721,4 +718,5 @@ bindings/js/kjs_window.cpp + diff --git a/WebCore/platform/gdk/RenderPopupMenuGdk.cpp b/WebCore/platform/gdk/RenderPopupMenuGdk.cpp index 5dc9badab58..4502f772b36 100644 --- a/WebCore/platform/gdk/RenderPopupMenuGdk.cpp +++ b/WebCore/platform/gdk/RenderPopupMenuGdk.cpp @@ -26,8 +26,8 @@ namespace WebCore { -RenderPopupMenuGdk::RenderPopupMenuGdk(Node* element) - : RenderPopupMenu(element) +RenderPopupMenuGdk::RenderPopupMenuGdk(Node* element, RenderMenuList* list) + : RenderPopupMenu(element,list) { } diff --git a/WebCore/platform/gdk/RenderPopupMenuGdk.h b/WebCore/platform/gdk/RenderPopupMenuGdk.h index b625d9bc57d..8ef0304312c 100644 --- a/WebCore/platform/gdk/RenderPopupMenuGdk.h +++ b/WebCore/platform/gdk/RenderPopupMenuGdk.h @@ -33,7 +33,7 @@ class HTMLOptGroupElement; class RenderPopupMenuGdk : public RenderPopupMenu { public: - RenderPopupMenuGdk(Node*); + RenderPopupMenuGdk(Node*, RenderMenuList*); ~RenderPopupMenuGdk(); virtual void clear(); diff --git a/WebCore/platform/gdk/RenderThemeGdk.cpp b/WebCore/platform/gdk/RenderThemeGdk.cpp index e7a239061b2..a15de6586f6 100644 --- a/WebCore/platform/gdk/RenderThemeGdk.cpp +++ b/WebCore/platform/gdk/RenderThemeGdk.cpp @@ -157,9 +157,14 @@ void RenderThemeGdk::adjustButtonStyle(CSSStyleSelector* selector, RenderStyle* addIntrinsicMargins(style); } -RenderPopupMenu* RenderThemeGdk::createPopupMenu(RenderArena* arena, Document* doc) +RenderPopupMenu* RenderThemeGdk::createPopupMenu(RenderArena* arena, Document* doc, RenderMenuList* list) { - return new (arena) RenderPopupMenuGdk(doc); + return new (arena) RenderPopupMenuGdk(doc,list); +} + +void RenderThemeGdk::systemFont(int propId, FontDescription&) const +{ + } } diff --git a/WebCore/platform/gdk/RenderThemeGdk.h b/WebCore/platform/gdk/RenderThemeGdk.h index b56f1018001..b75e80f1a8d 100644 --- a/WebCore/platform/gdk/RenderThemeGdk.h +++ b/WebCore/platform/gdk/RenderThemeGdk.h @@ -58,7 +58,10 @@ public: virtual void adjustTextFieldStyle(CSSStyleSelector*, RenderStyle*, Element*) const; virtual bool paintTextField(RenderObject*, const RenderObject::PaintInfo&, const IntRect&); - virtual RenderPopupMenu* createPopupMenu(RenderArena*, Document*); + // System fonts. + virtual void systemFont(int propId, FontDescription&) const; + + virtual RenderPopupMenu* createPopupMenu(RenderArena*, Document*, RenderMenuList*); private: void addIntrinsicMargins(RenderStyle*) const; diff --git a/WebCore/platform/gdk/TemporaryLinkStubs.cpp b/WebCore/platform/gdk/TemporaryLinkStubs.cpp index 2057d769929..81a91c38e61 100644 --- a/WebCore/platform/gdk/TemporaryLinkStubs.cpp +++ b/WebCore/platform/gdk/TemporaryLinkStubs.cpp @@ -35,7 +35,6 @@ #include "TextField.h" #include "Font.h" #include "FileButton.h" -#include "TextBox.h" #include "PopUpButton.h" #include "IntPoint.h" #include "Widget.h" @@ -72,31 +71,6 @@ static void notImplemented() { puts("Not yet implemented"); } void FrameView::updateBorder() { notImplemented(); } -TextBox::TextBox(Widget*) { notImplemented(); } -TextBox::~TextBox() { notImplemented(); } -String TextBox::textWithHardLineBreaks() const { notImplemented(); return String(); } -IntSize TextBox::sizeWithColumnsAndRows(int, int) const { notImplemented(); return IntSize(); } -void TextBox::setText(String const&) { notImplemented(); } -void TextBox::setColors(Color const&, Color const&) { notImplemented(); } -void TextBox::setFont(WebCore::Font const&) { notImplemented(); } -void TextBox::setWritingDirection(enum WebCore::TextDirection) { notImplemented(); } -bool TextBox::checksDescendantsForFocus() const { notImplemented(); return false; } -int TextBox::selectionStart() { notImplemented(); return 0; } -bool TextBox::hasSelectedText() const { notImplemented(); return 0; } -int TextBox::selectionEnd() { notImplemented(); return 0; } -void TextBox::setScrollBarModes(ScrollBarMode, ScrollBarMode) { notImplemented(); } -void TextBox::setReadOnly(bool) { notImplemented(); } -void TextBox::selectAll() { notImplemented(); } -void TextBox::setDisabled(bool) { notImplemented(); } -void TextBox::setLineHeight(int) { notImplemented(); } -void TextBox::setSelectionStart(int) { notImplemented(); } -void TextBox::setCursorPosition(int, int) { notImplemented(); } -String TextBox::text() const { notImplemented(); return String(); } -void TextBox::setWordWrap(TextBox::WrapStyle) { notImplemented(); } -void TextBox::setAlignment(HorizontalAlignment) { notImplemented(); } -void TextBox::setSelectionEnd(int) { notImplemented(); } -void TextBox::getCursorPosition(int*, int*) const { notImplemented(); } -void TextBox::setSelectionRange(int, int) { notImplemented(); } Widget::FocusPolicy PopUpButton::focusPolicy() const { notImplemented(); return NoFocus; } void PopUpButton::populate() { notImplemented(); } @@ -150,7 +124,6 @@ int FileButton::baselinePosition(int) const { notImplemented(); return 0; } void FileButton::setFrameGeometry(WebCore::IntRect const&) { notImplemented(); } void FileButton::setDisabled(bool) { notImplemented(); } -Widget::FocusPolicy TextBox::focusPolicy() const { notImplemented(); return NoFocus; } Widget::FocusPolicy Slider::focusPolicy() const { notImplemented(); return NoFocus; } Widget::FocusPolicy ListBox::focusPolicy() const { notImplemented(); return NoFocus; } Widget::FocusPolicy TextField::focusPolicy() const { notImplemented(); return NoFocus; } @@ -349,8 +322,6 @@ IntSize PopUpButton::sizeHint() const { return IntSize(); } IntRect PopUpButton::frameGeometry() const { return IntRect(); } void PopUpButton::setFrameGeometry(IntRect const&) { } -ScrollBar::ScrollBar(ScrollBarOrientation) { } -ScrollBar::~ScrollBar() { } void ScrollBar::setSteps(int, int) { } bool ScrollBar::scroll(ScrollDirection, ScrollGranularity, float) { return 0; } bool ScrollBar::setValue(int) { return 0; } diff --git a/WebCore/webcore-base.bkl b/WebCore/webcore-base.bkl index a5dd09adc2b..c667bc37d1d 100644 --- a/WebCore/webcore-base.bkl +++ b/WebCore/webcore-base.bkl @@ -62,8 +62,6 @@ Base settings shared by all Bakefile-based ports. $(WEBCORE_SOURCES_HTML) $(WEBCORE_SOURCES_BINDINGS) $(WEBCORE_SOURCES_JS) - $(WEBCORE_SOURCES_XPATH) - $(WEBCORE_SOURCES_IMPL) obj-$(FORMAT) @@ -100,8 +98,6 @@ Base settings shared by all Bakefile-based ports. $(SRCDIR)/platform/image-decoders/zlib $(SRCDIR)/rendering $(SRCDIR)/xml - $(SRCDIR)/xpath - $(SRCDIR)/xpath/impl $(SRCDIR)/kcanvas $(SRCDIR)/kcanvas/device -- GitLab