2006-10-03 Mark Rowe <bdash@webkit.org>
authorbdash <bdash@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 3 Oct 2006 09:42:33 +0000 (09:42 +0000)
committerbdash <bdash@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 3 Oct 2006 09:42:33 +0000 (09:42 +0000)
        Reviewed by Eric.

        Stop Bakefile-generated Makefile from running `pkg-config' multiple times per file.

        * presets.bkl: Make use of "options" and Python commands to run pkg-config etc up front.

2006-10-03  Mark Rowe  <bdash@webkit.org>

        Reviewed by Eric.

        http://bugs.webkit.org/show_bug.cgi?id=10981
        Linux/GDK build fixes

        Based on a patch by Krzysztof Kowalczyk.

        * WebCoreSources.bkl:
        * platform/gdk/FrameGdk.cpp:
        (WebCore::doScroll):
        (WebCore::FrameGdk::handleGdkEvent):
        * platform/gdk/PlatformScrollBar.h: Added.
        (WebCore::PlatformScrollBar::isWidget):
        * platform/gdk/ScrollViewGdk.cpp:
        * platform/gdk/TemporaryLinkStubs.cpp:
        (FrameView::passMousePressEventToScrollbar):
        (FrameView::passMousePressEventToSubframe):
        (FrameView::passMouseReleaseEventToSubframe):
        (FrameView::passMouseMoveEventToSubframe):
        (FrameView::passWheelEventToSubframe):
        (Cursor::Cursor):
        (Widget::invalidate):
        (Widget::invalidateRect):
        (ScrollView::wheelEvent):
        (ScrollView::convertToContainingWindow):
        (ScrollView::convertFromContainingWindow):
        (GraphicsContext::clip):
        (PlatformScrollBar::PlatformScrollBar):
        (PlatformScrollBar::updateThumbPosition):
        (PlatformScrollBar::updateThumbProportion):
        (ScrollBar::ScrollBar):
        (ScrollBar::setProportion):
        (WebCore::supportedKeySizes):
        (WebCore::signedPublicKeyAndChallengeString):
        * platform/gdk/WheelEventGdk.cpp:
        (WebCore::PlatformWheelEvent::PlatformWheelEvent):
        * platform/gdk/WidgetGdk.cpp:
        (WebCore::Widget::convertToContainingWindow):
        (WebCore::Widget::convertFromContainingWindow):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16733 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Bakefiles/ChangeLog
Bakefiles/presets.bkl
WebCore/ChangeLog
WebCore/WebCoreSources.bkl
WebCore/platform/gdk/FrameGdk.cpp
WebCore/platform/gdk/PlatformScrollBar.h [new file with mode: 0644]
WebCore/platform/gdk/ScrollViewGdk.cpp
WebCore/platform/gdk/TemporaryLinkStubs.cpp
WebCore/platform/gdk/WheelEventGdk.cpp
WebCore/platform/gdk/WidgetGdk.cpp

index 71d84b19015780e354ce3e2116965960e9a756cd..0dfc6a05ab66b3a8b410ce20ab6c59f6276a0346 100644 (file)
@@ -1,3 +1,11 @@
+2006-10-03  Mark Rowe  <bdash@webkit.org>
+
+        Reviewed by Eric.
+
+        Stop Bakefile-generated Makefile from running `pkg-config' multiple times per file.
+
+        * presets.bkl: Make use of "options" and Python commands to run pkg-config etc up front.
+
 2006-05-11  Kevin M. Ollivier  <kevino@theolliviers.com>
 
         - http://bugzilla.opendarwin.org/show_bug.cgi?id=8528
index 15d099177e6aed91add23528058bd444abf4f869..3fd4622049c9558cb5d686d3b156a392bb4d9309 100644 (file)
@@ -42,80 +42,160 @@ and WebCore. Include this file to use these settings.
             <include>$(SRCDIR)/../JavaScriptCore/os-win32</include><!-- stdint.h is here -->
         </if>
         <if cond="FORMAT=='gnu'">
-                       <ldflags>$(SRCDIR)/../JavaScriptCore/libjscore.a</ldflags>
+            <ldflags>$(SRCDIR)/../JavaScriptCore/libjscore.a</ldflags>
         </if>
     </template>
 
+
+    <option name="SQLITE3_LIBS">
+        <default-value>$(os.popen("pkg-config --libs sqlite3").read())</default-value>
+    </option>
+
+    <option name="SQLITE3_CFLAGS">
+        <default-value>$(os.popen("pkg-config --cflags sqlite3").read())</default-value>
+    </option>
+
     <template id="sqlite3">
-          <ldflags>`pkg-config --libs sqlite3`</ldflags>
-          <cxxflags>`pkg-config --cflags sqlite3`</cxxflags>
-       </template>
+        <ldflags>$(SQLITE3_LIBS)</ldflags>
+        <cxxflags>$(SQLITE3_CFLAGS)</cxxflags>
+    </template>
+
+
+    <option name="FREETYPE2_LIBS">
+        <default-value>$(os.popen("pkg-config --libs freetype2").read())</default-value>
+    </option>
+
+    <option name="FREETYPE2_CFLAGS">
+        <default-value>$(os.popen("pkg-config --cflags freetype2").read())</default-value>
+    </option>
+
+    <option name="FONTCONFIG_LIBS">
+        <default-value>$(os.popen("pkg-config --libs fontconfig").read())</default-value>
+    </option>
+
+    <option name="FONTCONFIG_CFLAGS">
+        <default-value>$(os.popen("pkg-config --cflags fontconfig").read())</default-value>
+    </option>
 
     <template id="freetype">
-          <ldflags>`pkg-config --libs freetype2`</ldflags>
-          <cxxflags>`pkg-config --cflags freetype2`</cxxflags>
-          <ldflags>`pkg-config --libs fontconfig`</ldflags>
-          <cxxflags>`pkg-config --cflags fontconfig`</cxxflags>
-       </template>
-
-     <template id="curl">
-          <ldflags>`curl-config --libs `</ldflags>
-          <cxxflags>`curl-config --cflags `</cxxflags>
-       </template>
+        <ldflags>$(FREETYPE2_LIBS)</ldflags>
+        <cxxflags>$(FREETYPE2_CFLAGS)</cxxflags>
+        <ldflags>$(FONTCONFIG_LIBS)</ldflags>
+        <cxxflags>$(FONTCONFIG_CFLAGS)</cxxflags>
+    </template>
+
+
+    <option name="CURL_LIBS">
+        <default-value>$(os.popen("curl-config --libs").read())</default-value>
+    </option>
+
+    <option name="CURL_CFLAGS">
+        <default-value>$(os.popen("curl-config --cflags").read())</default-value>
+    </option>
+
+    <template id="curl">
+        <ldflags>$(CURL_LIBS)</ldflags>
+        <cxxflags>$(CURL_CFLAGS)</cxxflags>
+    </template>
+
+
+    <option name="CAIRO_LIBS">
+        <default-value>$(os.popen("pkg-config --libs cairo").read())</default-value>
+    </option>
+
+    <option name="CAIRO_CFLAGS">
+        <default-value>$(os.popen("pkg-config --cflags cairo").read())</default-value>
+    </option>
+
     <template id="cairo">
-          <ldflags>`pkg-config --libs cairo`</ldflags>
-          <cxxflags>`pkg-config --cflags cairo`</cxxflags>
-       </template>
+        <ldflags>$(CAIRO_LIBS)</ldflags>
+        <cxxflags>$(CAIRO_CFLAGS)</cxxflags>
+    </template>
+
+
+    <option name="GTK_LIBS">
+        <default-value>$(os.popen("pkg-config --libs gtk+-2.0").read())</default-value>
+    </option>
+
+    <option name="GTK_CFLAGS">
+        <default-value>$(os.popen("pkg-config --cflags gtk+-2.0").read())</default-value>
+    </option>
 
     <!-- GTK settings, for GTK ports - wx doesn't use these -->
     <template id="gtk">
         <if cond="FORMAT=='gnu'">
-          <ldflags>`pkg-config --libs gtk+-2.0`</ldflags>
-          <cxxflags>`pkg-config --cflags gtk+-2.0`</cxxflags>
+            <ldflags>$(GTK_LIBS)</ldflags>
+            <cxxflags>$(GTK_CFLAGS)</cxxflags>
         </if>
-        
+
         <!--    TODO: non-Cygwin Windows support for this? :) --> 
     </template>
 
+
+    <option name="XML2_LIBS">
+        <default-value>$(os.popen("xml2-config --libs").read())</default-value>
+    </option>
+
+    <option name="XML2_CFLAGS">
+        <default-value>$(os.popen("xml2-config --cflags").read())</default-value>
+    </option>
+
     <!-- XML2 library settings -->
     <template id="xml2">
         <if cond="FORMAT=='gnu'">
-          <ldflags>`xml2-config --libs`</ldflags>
-          <cxxflags>`xml2-config --cflags`</cxxflags>
+            <ldflags>$(XML2_LIBS)</ldflags>
+            <cxxflags>$(XML2_CFLAGS)</cxxflags>
         </if>
-        
+
         <if cond="PLATFORM_WIN32=='1'">
             <include>$(SRCDIR)/../libxml/include</include>
-        </if>        
-    </template>    
-    
-    
+        </if>
+    </template>
+
+
+    <option name="XSLT_LIBS">
+        <default-value>$(os.popen("xslt-config --libs").read())</default-value>
+    </option>
+
+    <option name="XSLT_CFLAGS">
+        <default-value>$(os.popen("xslt-config --cflags").read())</default-value>
+    </option>
+
     <!-- XSLT library settings -->
     <template id="xslt">
         <if cond="FORMAT=='gnu'">
-          <ldflags>`xslt-config --libs`</ldflags>
-          <cxxflags>`xslt-config --cflags`</cxxflags>
+            <ldflags>$(XSLT_LIBS)</ldflags>
+            <cxxflags>$(XSLT_CFLAGS)</cxxflags>
         </if>
-        
+
         <if cond="PLATFORM_WIN32=='1'">
             <include>$(SRCDIR)/../libxslt/include</include>
             <include>$(SRCDIR)/../libxml/include</include>
-        </if>        
+        </if>
     </template>
 
+
+    <option name="ICU_LIBS">
+        <default-value>$(os.popen("icu-config --ldflags").read())</default-value>
+    </option>
+
+    <option name="ICU_CFLAGS">
+        <default-value>$(os.popen("icu-config --cxxflags").read())</default-value>
+    </option>
+
     <!-- IBM ICU settings -->
     <template id="icu">
         <if cond="FORMAT=='gnu'">
-          <ldflags>`icu-config --ldflags`</ldflags>
-          <cxxflags>`icu-config --cxxflags`</cxxflags>
+            <ldflags>$(ICU_LIBS)</ldflags>
+            <cxxflags>$(ICU_CFLAGS)</cxxflags>
         </if>
-        
+
         <if cond="PLATFORM_WIN32=='1'">
             <include>$(SRCDIR)/../icu/include</include>
         </if>
     </template>
-    
+
+
     <template id="iconv">
         <if cond="PLATFORM_WIN32=='1'">
             <include>$(SRCDIR)/../iconv/include</include>
@@ -123,5 +203,3 @@ and WebCore. Include this file to use these settings.
     </template>
     
 </makefile>
-
-
index 2eacedb8ca7b6338bc5d345c0d7d6e4ecd0ffaa3..61aeeb9bca791a33bc642aefc18e72bd7f296604 100644 (file)
@@ -1,3 +1,45 @@
+2006-10-03  Mark Rowe  <bdash@webkit.org>
+
+        Reviewed by Eric.
+
+        http://bugs.webkit.org/show_bug.cgi?id=10981
+        Linux/GDK build fixes
+
+        Based on a patch by Krzysztof Kowalczyk.
+
+        * WebCoreSources.bkl:
+        * platform/gdk/FrameGdk.cpp:
+        (WebCore::doScroll):
+        (WebCore::FrameGdk::handleGdkEvent):
+        * platform/gdk/PlatformScrollBar.h: Added.
+        (WebCore::PlatformScrollBar::isWidget):
+        * platform/gdk/ScrollViewGdk.cpp:
+        * platform/gdk/TemporaryLinkStubs.cpp:
+        (FrameView::passMousePressEventToScrollbar):
+        (FrameView::passMousePressEventToSubframe):
+        (FrameView::passMouseReleaseEventToSubframe):
+        (FrameView::passMouseMoveEventToSubframe):
+        (FrameView::passWheelEventToSubframe):
+        (Cursor::Cursor):
+        (Widget::invalidate):
+        (Widget::invalidateRect):
+        (ScrollView::wheelEvent):
+        (ScrollView::convertToContainingWindow):
+        (ScrollView::convertFromContainingWindow):
+        (GraphicsContext::clip):
+        (PlatformScrollBar::PlatformScrollBar):
+        (PlatformScrollBar::updateThumbPosition):
+        (PlatformScrollBar::updateThumbProportion):
+        (ScrollBar::ScrollBar):
+        (ScrollBar::setProportion):
+        (WebCore::supportedKeySizes):
+        (WebCore::signedPublicKeyAndChallengeString):
+        * platform/gdk/WheelEventGdk.cpp:
+        (WebCore::PlatformWheelEvent::PlatformWheelEvent):
+        * platform/gdk/WidgetGdk.cpp:
+        (WebCore::Widget::convertToContainingWindow):
+        (WebCore::Widget::convertFromContainingWindow):
+
 2006-10-02  Adam Roben  <aroben@apple.com>
 
         Reviewed by Maciej.
index 5c2fbd2366ec0f21e630694b8242ea3adb3eab07..a0d477bca69d1c83737cd7f6c9250a68e3d8302b 100644 (file)
                css/CSSBorderImageValue.cpp
                css/CSSCharsetRule.cpp
                css/CSSComputedStyleDeclaration.cpp
+               css/CSSCursorImageValue.cpp
                css/CSSFontFaceRule.cpp
                css/csshelper.cpp
                css/CSSImageValue.cpp
                rendering/AutoTableLayout.cpp
                rendering/bidi.cpp
                rendering/break_lines.cpp
+               rendering/CounterNode.cpp
+               rendering/CounterResetNode.cpp
                rendering/EllipsisBox.cpp
                rendering/FixedTableLayout.cpp
                rendering/InlineBox.cpp
                rendering/RenderBR.cpp
                rendering/RenderButton.cpp
                rendering/RenderContainer.cpp
+               rendering/RenderCounter.cpp
                rendering/RenderFieldset.cpp
                rendering/RenderFileUploadControl.cpp
                rendering/RenderFlexibleBox.cpp
                rendering/RenderLayer.cpp
                rendering/RenderLegend.cpp
                rendering/RenderLineEdit.cpp
+               rendering/RenderListBox.cpp
                rendering/RenderListItem.cpp
                rendering/RenderListMarker.cpp
                rendering/RenderMenuList.cpp
                editing/AppendNodeCommand.cpp
                editing/ApplyStyleCommand.cpp
                editing/BreakBlockquoteCommand.cpp
+               editing/CommandByName.cpp
                editing/CompositeEditCommand.cpp
                editing/CreateLinkCommand.cpp
                editing/DeleteFromTextNodeCommand.cpp
index b648b164dcf2596bea398a786f75e0189bbf9559..d998f505799b229beedc919ac1d378c6ccbb5fc6 100644 (file)
@@ -69,7 +69,7 @@ Vector<char> loadResourceIntoArray(const char* resourceName)
 
 namespace WebCore {
 
-static void doScroll(const RenderObject* r, bool isHorizontal, int multiplier)
+static void doScroll(const RenderObject* r, float deltaX, float deltaY)
 {
     // FIXME: The scrolling done here should be done in the default handlers
     // of the elements rather than here in the part.
@@ -81,18 +81,10 @@ static void doScroll(const RenderObject* r, bool isHorizontal, int multiplier)
     //r->scroll(direction, ScrollByWheel, multiplier);
     if (!r->layer())
         return;
-    int x = r->layer()->scrollXOffset();
-    int y = r->layer()->scrollYOffset();
-    if (isHorizontal)
-        x += multiplier;
-    else
-        y += multiplier;
-    r->layer()->scrollToOffset(x, y, true, true);
-}
 
-bool FrameView::isFrameView() const
-{
-    return true;
+    int x = r->layer()->scrollXOffset() + deltaX;
+    int y = r->layer()->scrollYOffset() + deltaY;
+    r->layer()->scrollToOffset(x, y, true, true);
 }
 
 FrameGdk::FrameGdk(GdkDrawable* gdkdrawable)
@@ -203,7 +195,7 @@ void FrameGdk::handleGdkEvent(GdkEvent* event)
             //Default to scrolling the page
             //not sure why its null
             //broke anyway when its not null
-            doScroll(renderer(), wheelEvent.isHorizontal(), wheelEvent.delta());
+            doScroll(renderer(), wheelEvent.deltaX(), wheelEvent.deltaY());
             break;
         }
         case GDK_DRAG_ENTER:
diff --git a/WebCore/platform/gdk/PlatformScrollBar.h b/WebCore/platform/gdk/PlatformScrollBar.h
new file mode 100644 (file)
index 0000000..7bb00a3
--- /dev/null
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2004, 2006 Apple Computer, Inc.  All rights reserved.
+ *
+ * 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 PlatformScrollBar_h
+#define PlatformScrollBar_h
+
+#include "Widget.h"
+#include "ScrollBar.h"
+
+namespace WebCore {
+
+class PlatformScrollBar : public Widget, public ScrollBar {
+public:
+    PlatformScrollBar(ScrollBarClient*, ScrollBarOrientation, ScrollBarControlSize);
+    virtual ~PlatformScrollBar();
+
+    virtual bool isWidget() const { return true; }
+
+    virtual int width() const;
+    virtual int height() const;
+    virtual void setRect(const IntRect&);
+    virtual void setEnabled(bool);
+    virtual void paint(GraphicsContext*, const IntRect& damageRect);
+
+protected:
+    virtual void updateThumbPosition();
+    virtual void updateThumbProportion();
+};
+
+}
+
+#endif // PlatformScrollBar_h
index 452f8fe29df884266828ed544dfd9be8fef8754b..27b283dabbbc2b8794fb235c6aba6c3365991811 100644 (file)
@@ -147,16 +147,6 @@ int ScrollView::contentsHeight() const
     return m_data->contentsSize.height();
 }
 
-IntPoint ScrollView::viewportToContents(const IntPoint& contentsPoint)
-{
-    return contentsPoint + scrollOffset();
-}
-
-IntPoint ScrollView::contentsToViewport(const IntPoint& viewportPoint)
-{
-    return IntPoint(viewportPoint) - scrollOffset();
-}
-
 IntSize ScrollView::scrollOffset() const
 {
     return m_data->scrollOffset;
index 3553e14557c0945d23b59f7214c01821b653517a..ae8703d3aa9b25502320768bc526c2ecab536ddf 100644 (file)
@@ -36,7 +36,7 @@
 #include "TextField.h"
 #include "FileChooser.h"
 #include "Font.h"
-#include "PopUpButton.h"
+#include "ListBox.h"
 #include "IntPoint.h"
 #include "Widget.h"
 #include "GraphicsContext.h"
@@ -74,10 +74,11 @@ using namespace WebCore;
 static void notImplemented() { puts("Not yet implemented"); }
 
 void FrameView::updateBorder() { notImplemented(); }
-
-
-Widget::FocusPolicy PopUpButton::focusPolicy() const { notImplemented(); return NoFocus; }
-void PopUpButton::populate() { notImplemented(); }
+bool FrameView::passMousePressEventToScrollbar(MouseEventWithHitTestResults&) { return false; }
+bool FrameView::passMousePressEventToSubframe(MouseEventWithHitTestResults&, Frame*) { return true; }
+bool FrameView::passMouseReleaseEventToSubframe(MouseEventWithHitTestResults&, Frame*) { return true; }
+bool FrameView::passMouseMoveEventToSubframe(MouseEventWithHitTestResults&, Frame*) { return true; }
+bool FrameView::passWheelEventToSubframe(PlatformWheelEvent&, Frame*) { return true; }
 
 void Widget::enableFlushDrawing() { notImplemented(); }
 bool Widget::isEnabled() const { notImplemented(); return 0; }
@@ -122,7 +123,7 @@ Widget::FocusPolicy Slider::focusPolicy() const { notImplemented(); return NoFoc
 Widget::FocusPolicy ListBox::focusPolicy() const { notImplemented(); return NoFocus; }
 Widget::FocusPolicy TextField::focusPolicy() const { notImplemented(); return NoFocus; }
 
-Cursor::Cursor(Image*) { notImplemented(); }
+Cursor::Cursor(Image*, const IntPoint&) { notImplemented(); }
 
 PlatformMouseEvent::PlatformMouseEvent(const CurrentEventTag&) { notImplemented(); }
 String WebCore::searchableIndexIntroduction() { notImplemented(); return String(); }
@@ -246,13 +247,18 @@ void CheckCacheObjectStatus(DocLoader*, CachedResource*) { }
 void Widget::setEnabled(bool) { }
 void Widget::paint(GraphicsContext*, IntRect const&) { }
 void Widget::setIsSelected(bool) { }
+void Widget::invalidate() { }
+void Widget::invalidateRect(const IntRect& r) { }
 
 void ScrollView::addChild(Widget*, int, int) { }
 void ScrollView::removeChild(Widget*) { }
 void ScrollView::scrollPointRecursively(int x, int y) { }
 bool ScrollView::inWindow() const { return true; }
+void ScrollView::wheelEvent(PlatformWheelEvent&) { }
 void ScrollView::updateScrollBars() { }
 int ScrollView::updateScrollInfo(short type, int current, int max, int pageSize) { return 0; }
+IntPoint ScrollView::convertToContainingWindow(const IntPoint& point) const { return point; }
+IntPoint ScrollView::convertFromContainingWindow(const IntPoint& point) const { return point; }
 
 void GraphicsContext::addRoundedRectClip(const IntRect& rect, const IntSize& topLeft, const IntSize& topRight,
         const IntSize& bottomLeft, const IntSize& bottomRight) { notImplemented(); }
@@ -270,7 +276,6 @@ void GraphicsContext::setMiterLimit(float) { }
 void GraphicsContext::setAlpha(float) { }
 void GraphicsContext::setCompositeOperation(CompositeOperator) { }
 void GraphicsContext::clip(const Path&) { }
-void GraphicsContext::translate(const FloatSize&) { }
 void GraphicsContext::rotate(float) { }
 void GraphicsContext::scale(const FloatSize&) { }
 
@@ -311,33 +316,21 @@ IntSize TextField::sizeForCharacterWidth(int) const { return IntSize(); }
 int TextField::baselinePosition(int) const { return 0; }
 void TextField::setLiveSearch(bool) { }
 
-PopUpButton::PopUpButton() { }
-PopUpButton::~PopUpButton() { }
-void PopUpButton::setFont(WebCore::Font const&) { }
-int PopUpButton::baselinePosition(int) const { return 0; }
-void PopUpButton::setWritingDirection(TextDirection) { }
-void PopUpButton::clear() { }
-void PopUpButton::appendItem(DeprecatedString const&, ListBoxItemType, bool) { }
-void PopUpButton::setCurrentItem(int) { }
-IntSize PopUpButton::sizeHint() const { return IntSize(); }
-IntRect PopUpButton::frameGeometry() const { return IntRect(); }
-void PopUpButton::setFrameGeometry(IntRect const&) { }
-
-PlatformScrollBar::PlatformScrollBar(ScrollBarClient* client, ScrollBarOrientation orientation) : ScrollBar(client, orientation) { }
+PlatformScrollBar::PlatformScrollBar(ScrollBarClient* client, ScrollBarOrientation orientation, ScrollBarControlSize controlSize) : ScrollBar(client, orientation, controlSize) { }
 PlatformScrollBar::~PlatformScrollBar() { }
 int PlatformScrollBar::width() const { return 0; }
 int PlatformScrollBar::height() const { return 0; }
 void PlatformScrollBar::setEnabled(bool) { }
 void PlatformScrollBar::paint(GraphicsContext*, const IntRect& damageRect) { }
-void PlatformScrollBar::setScrollBarValue(int v) { }
-void PlatformScrollBar::setKnobProportion(int visibleSize, int totalSize) { }
+void PlatformScrollBar::updateThumbPosition() { }
+void PlatformScrollBar::updateThumbProportion() { }
 void PlatformScrollBar::setRect(const IntRect&) { }
 
-ScrollBar::ScrollBar(ScrollBarClient*, ScrollBarOrientation) { }
+ScrollBar::ScrollBar(ScrollBarClient*, ScrollBarOrientation, ScrollBarControlSize controlSize) { }
 void ScrollBar::setSteps(int, int) { }
 bool ScrollBar::scroll(ScrollDirection, ScrollGranularity, float) { return 0; }
 bool ScrollBar::setValue(int) { return 0; }
-void ScrollBar::setKnobProportion(int, int) { }
+void ScrollBar::setProportion(int, int) { }
 
 ListBox::ListBox() { }
 ListBox::~ListBox() { }
@@ -384,8 +377,7 @@ float Font::floatWidthForComplexText(const TextRun&, const TextStyle&) const { n
 int Font::offsetForPositionForComplexText(const TextRun&, const TextStyle&, int, bool) const { notImplemented(); return 0; }
 
 namespace WebCore {
-
-DeprecatedStringList supportedKeySizes(){return DeprecatedStringList();};
-DeprecatedString signedPublicKeyAndChallengeString(unsigned keySizeIndex, const DeprecatedString &challengeString, const KURL &url){return DeprecatedString();};
+Vector<String> supportedKeySizes() { notImplemented(); return Vector<String>(); }
+String signedPublicKeyAndChallengeString(unsigned keySizeIndex, const String &challengeString, const KURL &url) { return String(); }
 
 }
index f280553a971bf3ff3e764d687f17f7bc671074f3..e14732c1ee1c8bfb04e3c67260dd2e02c63e8568 100644 (file)
@@ -34,19 +34,17 @@ namespace WebCore {
 
 PlatformWheelEvent::PlatformWheelEvent(GdkEvent* event)
 {
-    if (event->scroll.direction == GDK_SCROLL_UP) {
-        m_delta = -120;
-        m_isHorizontal = false;
-    } else if (event->scroll.direction == GDK_SCROLL_LEFT) {
-        m_delta = -120;
-        m_isHorizontal = true;
-    } else if (event->scroll.direction == GDK_SCROLL_RIGHT) {
-        m_delta = 120;
-        m_isHorizontal = true;
-    } else {
-        m_delta = 120;
-        m_isHorizontal = false;
-    }
+    m_deltaX = 0;
+    m_deltaY = 0;
+
+    if (event->scroll.direction == GDK_SCROLL_UP)
+        m_deltaY = -120;
+    else if (event->scroll.direction == GDK_SCROLL_LEFT)
+        m_deltaX = -120;
+    else if (event->scroll.direction == GDK_SCROLL_RIGHT)
+        m_deltaX = 120;
+    else
+        m_deltaY = 120;
 
     m_position = IntPoint((int)event->scroll.x, (int)event->scroll.y);
     m_globalPosition = IntPoint((int)event->scroll.x_root, (int)event->scroll.y_root);
index ae7c940bb101497d0eb7e2b15f9c053d15c613e8..1fb789d30cf22d1daab1feda1607f0bd43fb6074 100644 (file)
@@ -158,15 +158,14 @@ void Widget::setFrameGeometry(const IntRect& r)
     gdk_window_move_resize(window, r.x(), r.y(), r.width(), r.height());
 }
 
-IntPoint Widget::mapFromGlobal(const IntPoint& p) const
+IntPoint Widget::convertToContainingWindow(const IntPoint& point) const
 {
-    GdkDrawable* drawable = data->drawable;
-    if (!drawable || !GDK_IS_WINDOW(drawable))
-        return p;
-    GdkWindow* window = GDK_WINDOW(drawable);
-    gint x, y;
-    gdk_window_get_origin(window, &x, &y);
-    return IntPoint(p.x() - x, p.y() - y);
+  return point;
+}
+
+IntPoint Widget::convertFromContainingWindow(const IntPoint& point) const
+{
+  return point;
 }
 
 }