build fix.

        * WebCore.xcodeproj/project.pbxproj:
        * bridge/mac/BrowserExtensionMac.mm:
        (WebCore::BrowserExtensionMac::createNewWindow):
        * bridge/mac/FrameMac.mm:
        (WebCore::FrameMac::createFrame):
        * bridge/mac/FrameViewMac.mm:
        (WebCore::FrameView::passMousePressEventToScrollbar):
        * bridge/mac/WebCoreFrameBridge.mm:
        (-[WebCoreFrameBridge installInFrame:]):
        * bridge/mac/WebCoreFrameView.h:
        * platform/ScrollBar.cpp:
        * platform/Widget.h:
        * platform/mac/PlatformScrollBar.h:
        * platform/mac/PlatformScrollBarMac.mm:
        (NSControlSizeForScrollBarControlSize):
        (-[WebCoreScrollBar initWithPlatformScrollbar:]):
        (-[WebCoreScrollBar detachPlatformScrollbar]):
        (-[WebCoreScrollBar scroll:]):
        (-[WebCoreScrollBar widget]):
        (WebCore::PlatformScrollbar::PlatformScrollbar):
        (WebCore::PlatformScrollbar::~PlatformScrollbar):
        (WebCore::PlatformScrollbar::updateThumbPosition):
        (WebCore::PlatformScrollbar::updateThumbProportion):
        (WebCore::PlatformScrollbar::scrollbarHit):
        (WebCore::PlatformScrollbar::width):
        (WebCore::PlatformScrollbar::height):
        (WebCore::PlatformScrollbar::setRect):
        (WebCore::PlatformScrollbar::setEnabled):
        (WebCore::PlatformScrollbar::paint):
        * platform/mac/ScrollViewMac.mm:
        (WebCore::ScrollView::setVScrollbarMode):
        (WebCore::ScrollView::setHScrollbarMode):
        (WebCore::ScrollView::setScrollbarsMode):
        (WebCore::ScrollView::vScrollbarMode):
        (WebCore::ScrollView::hScrollbarMode):
        (WebCore::ScrollView::suppressScrollbars):
        (WebCore::ScrollView::scrollbarUnderMouse):
        * platform/mac/WidgetMac.mm:
        (WebCore::Widget::removeFromParent):
        * rendering/RenderLayer.cpp:
        (WebCore::RenderLayer::destroyScrollbar):

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a452aae4e5d217939b032983acb41b3262da0163..9bb3e96dbd409c10fb365fda354f13b25a2ef38c 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,57 @@
+2006-10-05  Geoffrey Garen  <ggaren@apple.com>
+
+        build fix.
+        
+        * WebCore.xcodeproj/project.pbxproj:
+        * bridge/mac/BrowserExtensionMac.mm:
+        (WebCore::BrowserExtensionMac::createNewWindow):
+        * bridge/mac/FrameMac.mm:
+        (WebCore::FrameMac::createFrame):
+        * bridge/mac/FrameViewMac.mm:
+        (WebCore::FrameView::passMousePressEventToScrollbar):
+        * bridge/mac/WebCoreFrameBridge.mm:
+        (-[WebCoreFrameBridge installInFrame:]):
+        * bridge/mac/WebCoreFrameView.h:
+        * platform/ScrollBar.cpp:
+        * platform/Widget.h:
+        * platform/mac/PlatformScrollBar.h:
+        * platform/mac/PlatformScrollBarMac.mm:
+        (NSControlSizeForScrollBarControlSize):
+        (-[WebCoreScrollBar initWithPlatformScrollbar:]):
+        (-[WebCoreScrollBar detachPlatformScrollbar]):
+        (-[WebCoreScrollBar scroll:]):
+        (-[WebCoreScrollBar widget]):
+        (WebCore::PlatformScrollbar::PlatformScrollbar):
+        (WebCore::PlatformScrollbar::~PlatformScrollbar):
+        (WebCore::PlatformScrollbar::updateThumbPosition):
+        (WebCore::PlatformScrollbar::updateThumbProportion):
+        (WebCore::PlatformScrollbar::scrollbarHit):
+        (WebCore::PlatformScrollbar::width):
+        (WebCore::PlatformScrollbar::height):
+        (WebCore::PlatformScrollbar::setRect):
+        (WebCore::PlatformScrollbar::setEnabled):
+        (WebCore::PlatformScrollbar::paint):
+        * platform/mac/ScrollViewMac.mm:
+        (WebCore::ScrollView::setVScrollbarMode):
+        (WebCore::ScrollView::setHScrollbarMode):
+        (WebCore::ScrollView::setScrollbarsMode):
+        (WebCore::ScrollView::vScrollbarMode):
+        (WebCore::ScrollView::hScrollbarMode):
+        (WebCore::ScrollView::suppressScrollbars):
+        (WebCore::ScrollView::scrollbarUnderMouse):
+        * platform/mac/WidgetMac.mm:
+        (WebCore::Widget::removeFromParent):
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::destroyScrollbar):
+
+2006-10-05  Geoffrey Garen  <ggaren@apple.com>
+
+        build fix.
+        
+        * platform/Widget.h:
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::destroyScrollbar):
+
 2006-10-06  Mitz Pettel  <mitz@webkit.org>
 
         http://bugs.webkit.org/show_bug.cgi?id=8276

diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index 57c053ec0b151e7cdee7d9e96584adb545ddd2dc..a3a62291aaebe1c1c15608b595850c8ec96a6b9d 100644 (file)
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -9366,7 +9366,6 @@
                0867D690FE84028FC02AAC07 /* Project object */ = {
                        isa = PBXProject;
                        buildConfigurationList = 149C284308902B11008A9EFC /* Build configuration list for PBXProject "WebCore" */;
-                       compatibilityVersion = "Xcode 2.4";
                        hasScannedForEncodings = 1;
                        knownRegions = (
                                English,
@@ -9381,7 +9380,6 @@
                        productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
                        projectDirPath = "";
                        projectRoot = "";
-                       shouldCheckCompatibility = 1;
                        targets = (
                                93F198A508245E59001E9ABC /* WebCore */,
                                DD041FBE09D9DDBE0010AF2A /* Derived Sources */,

diff --git a/WebCore/bridge/mac/BrowserExtensionMac.mm b/WebCore/bridge/mac/BrowserExtensionMac.mm
index 2a1985f46a69f435b2b06472c883d251b3cfe826..93136401c0910d87a14b61711ae75ce941e95b0c 100644 (file)
--- a/WebCore/bridge/mac/BrowserExtensionMac.mm
+++ b/WebCore/bridge/mac/BrowserExtensionMac.mm
@@ -115,7 +115,7 @@ void BrowserExtensionMac::createNewWindow(const ResourceRequest& request,
     
     [frameBridge setToolbarsVisible:winArgs.toolBarVisible || winArgs.locationBarVisible];
     [frameBridge setStatusbarVisible:winArgs.statusBarVisible];
-    [frameBridge setScrollbarsVisible:winArgs.scrollBarsVisible];
+    [frameBridge setScrollbarsVisible:winArgs.scrollbarsVisible];
     [frameBridge setWindowIsResizable:winArgs.resizable];
     
     NSRect windowRect = [pageBridge impl]->windowRect();

diff --git a/WebCore/bridge/mac/FrameMac.mm b/WebCore/bridge/mac/FrameMac.mm
index 4e9f8146b38c95528f016646b522a2191d4bf564..45c1af2fc77acf056d3da7b7559b638e6726601d 100644 (file)
--- a/WebCore/bridge/mac/FrameMac.mm
+++ b/WebCore/bridge/mac/FrameMac.mm
@@ -57,7 +57,7 @@
 #import "Logging.h"
 #import "MouseEventWithHitTestResults.h"
 #import "PlatformKeyboardEvent.h"
-#import "PlatformScrollBar.h"
+#import "PlatformScrollbar.h"
 #import "PlatformWheelEvent.h"
 #import "Plugin.h"
 #import "RegularExpression.h"
@@ -550,7 +550,7 @@ Frame* FrameMac::createFrame(const KURL& url, const String& name, Element* owner
     int marginHeight = -1;
     if (ownerElement->hasTagName(frameTag) || ownerElement->hasTagName(iframeTag)) {
         HTMLFrameElement* o = static_cast<HTMLFrameElement*>(ownerElement);
-        allowsScrolling = o->scrollingMode() != ScrollBarAlwaysOff;
+        allowsScrolling = o->scrollingMode() != ScrollbarAlwaysOff;
         marginWidth = o->getMarginWidth();
         marginHeight = o->getMarginHeight();
     }

diff --git a/WebCore/bridge/mac/FrameViewMac.mm b/WebCore/bridge/mac/FrameViewMac.mm
index 10a6cfd549c37eed5c7a0f9cc4eed7d7d10d0af3..c5b6232c3a7d84e25d2b70b28c02f6b0bab29f52 100644 (file)
--- a/WebCore/bridge/mac/FrameViewMac.mm
+++ b/WebCore/bridge/mac/FrameViewMac.mm
@@ -74,7 +74,7 @@ bool FrameView::passWheelEventToSubframe(PlatformWheelEvent&, Frame* subframe)
     return Mac(m_frame.get())->passWheelEventToWidget(subframe->view());
 }
 
-bool FrameView::passMousePressEventToScrollbar(MouseEventWithHitTestResults& mev, PlatformScrollBar* scrollbar)
+bool FrameView::passMousePressEventToScrollbar(MouseEventWithHitTestResults& mev, PlatformScrollbar* scrollbar)
 {
     return Mac(m_frame.get())->passMouseDownEventToWidget(scrollbar);
 }

diff --git a/WebCore/bridge/mac/WebCoreFrameBridge.mm b/WebCore/bridge/mac/WebCoreFrameBridge.mm
index 4d8848017f35e34c45e06e3a7a93738debbb693f..e9bbd826b2bea1f9f6ab79ce7e07db14295f5863 100644 (file)
--- a/WebCore/bridge/mac/WebCoreFrameBridge.mm
+++ b/WebCore/bridge/mac/WebCoreFrameBridge.mm
@@ -1051,7 +1051,7 @@ static BOOL nowPrinting(WebCoreFrameBridge *self)
         // Now the render part owns the view, so we don't any more.
     }
 
-    m_frame->view()->initScrollBars();
+    m_frame->view()->initScrollbars();
 }
 
 - (void)setActivationEventNumber:(int)num

diff --git a/WebCore/bridge/mac/WebCoreFrameView.h b/WebCore/bridge/mac/WebCoreFrameView.h
index ac3ac8bb30060f4d65e6784357f65fcc9b6e4df8..a478dcacf490c9eb64563f5b46ce390444d62cbc 100644 (file)
--- a/WebCore/bridge/mac/WebCoreFrameView.h
+++ b/WebCore/bridge/mac/WebCoreFrameView.h
@@ -30,18 +30,18 @@
 // scroll view is resized.
 
 typedef enum {
-    WebCoreScrollBarAuto,
-    WebCoreScrollBarAlwaysOff,
-    WebCoreScrollBarAlwaysOn
-} WebCoreScrollBarMode;
+    WebCoreScrollbarAuto,
+    WebCoreScrollbarAlwaysOff,
+    WebCoreScrollbarAlwaysOn
+} WebCoreScrollbarMode;
 
 @protocol WebCoreFrameView
-- (void)setHorizontalScrollingMode:(WebCoreScrollBarMode)mode;
-- (void)setVerticalScrollingMode:(WebCoreScrollBarMode)mode;
-- (void)setScrollingMode:(WebCoreScrollBarMode)mode;
+- (void)setHorizontalScrollingMode:(WebCoreScrollbarMode)mode;
+- (void)setVerticalScrollingMode:(WebCoreScrollbarMode)mode;
+- (void)setScrollingMode:(WebCoreScrollbarMode)mode;
 
-- (WebCoreScrollBarMode)horizontalScrollingMode;
-- (WebCoreScrollBarMode)verticalScrollingMode;
+- (WebCoreScrollbarMode)horizontalScrollingMode;
+- (WebCoreScrollbarMode)verticalScrollingMode;
 
 - (void)setScrollBarsSuppressed:(BOOL)suppressed repaintOnUnsuppress:(BOOL)repaint;
 

diff --git a/WebCore/platform/ScrollBar.cpp b/WebCore/platform/ScrollBar.cpp
index fa90b06d7a949c9d2553c82a3702497593d6545f..4b89aefe77a2690a7a4f03987060fce59b777029 100644 (file)
--- a/WebCore/platform/ScrollBar.cpp
+++ b/WebCore/platform/ScrollBar.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include "ScrollBar.h"
+#include "Scrollbar.h"
 
 namespace WebCore {
 

diff --git a/WebCore/platform/Widget.h b/WebCore/platform/Widget.h
index 12ee60775e5a6c8e744270cfe67ea08a479b3b53..841a2d147c72fda83124fd35a67efe561ac91274 100644 (file)
--- a/WebCore/platform/Widget.h
+++ b/WebCore/platform/Widget.h
@@ -57,6 +57,7 @@ namespace WebCore {
     class IntRect;
     class IntSize;
     class PlatformMouseEvent;
+    class ScrollView;
     class WidgetClient;
     class WidgetPrivate;
 
@@ -129,12 +130,14 @@ namespace WebCore {
 
         virtual bool isFrameView() const;
 
+        virtual void removeFromParent();
+
 #if PLATFORM(WIN)
         void setContainingWindow(HWND);
         HWND containingWindow() const;
 
-        void setParent(Widget*);
-        Widget* parent() const;
+        void setParent(ScrollView*);
+        ScrollView* parent() const;
 
         virtual void scrolled() const {};
 

diff --git a/WebCore/platform/mac/PlatformScrollBar.h b/WebCore/platform/mac/PlatformScrollBar.h
index 1f5975612ffe3204e1f0c65b6d98f11ec5554b37..fd0ed568e01ce916dc9a9191f645ece27cc9c813 100644 (file)
--- a/WebCore/platform/mac/PlatformScrollBar.h
+++ b/WebCore/platform/mac/PlatformScrollBar.h
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef PlatformScrollBar_h
-#define PlatformScrollBar_h
+#ifndef PlatformScrollbar_h
+#define PlatformScrollbar_h
 
 #include "Widget.h"
 #include "ScrollBar.h"
@@ -38,10 +38,10 @@ typedef int NSScrollerPart;
 
 namespace WebCore {
 
-class PlatformScrollBar : public Widget, public ScrollBar {
+class PlatformScrollbar : public Widget, public Scrollbar {
 public:
-    PlatformScrollBar(ScrollBarClient*, ScrollBarOrientation, ScrollBarControlSize);
-    virtual ~PlatformScrollBar();
+    PlatformScrollbar(ScrollbarClient*, ScrollbarOrientation, ScrollbarControlSize);
+    virtual ~PlatformScrollbar();
 
     virtual bool isWidget() const { return true; }
 
@@ -60,5 +60,5 @@ protected:
 
 }
 
-#endif // PlatformScrollBar_h
+#endif // PlatformScrollbar_h
 

diff --git a/WebCore/platform/mac/PlatformScrollBarMac.mm b/WebCore/platform/mac/PlatformScrollBarMac.mm
index 17a8e964bc11fd167b01d6acd58d6c37845110fe..f3d60489b7bbe4cff31a92f14f757a2c25d61874 100644 (file)
--- a/WebCore/platform/mac/PlatformScrollBarMac.mm
+++ b/WebCore/platform/mac/PlatformScrollBarMac.mm
@@ -34,32 +34,32 @@ using namespace WebCore;
 
 @interface WebCoreScrollBar : NSScroller <WebCoreWidgetHolder>
 {
-    PlatformScrollBar* scrollBar;
+    PlatformScrollbar* scrollbar;
 }
 
-- (id)initWithPlatformScrollBar:(PlatformScrollBar*)s;
-- (void)detachPlatformScrollBar;
+- (id)initWithPlatformScrollbar:(PlatformScrollbar*)s;
+- (void)detachPlatformScrollbar;
 
 @end
 
 @implementation WebCoreScrollBar
 
-static NSControlSize NSControlSizeForScrollBarControlSize(ScrollBarControlSize size)
+static NSControlSize NSControlSizeForScrollBarControlSize(ScrollbarControlSize size)
 {
-    if (size == SmallScrollBar)
+    if (size == SmallScrollbar)
         return NSSmallControlSize;
-    if (size == MiniScrollBar)
+    if (size == MiniScrollbar)
         return NSMiniControlSize;
     return NSRegularControlSize;
 }
 
-- (id)initWithPlatformScrollBar:(PlatformScrollBar*)s
+- (id)initWithPlatformScrollbar:(PlatformScrollbar*)s
 {
     // Cocoa scrollbars just set their orientation by examining their own
     // dimensions, so we have to do this unsavory hack.
     NSRect orientation;
     orientation.origin.x = orientation.origin.y = 0;
-    if (s->orientation() == VerticalScrollBar) {
+    if (s->orientation() == VerticalScrollbar) {
         orientation.size.width = [NSScroller scrollerWidth];
         orientation.size.height = 100;
     } else {
@@ -68,7 +68,7 @@ static NSControlSize NSControlSizeForScrollBarControlSize(ScrollBarControlSize s
     }
     self = [self initWithFrame:orientation];
 
-    scrollBar = s;
+    scrollbar = s;
 
     [self setEnabled:YES];
     [self setTarget:self];
@@ -78,21 +78,21 @@ static NSControlSize NSControlSizeForScrollBarControlSize(ScrollBarControlSize s
     return self;
 }
 
-- (void)detachPlatformScrollBar
+- (void)detachPlatformScrollbar
 {
     [self setTarget:nil];
-    scrollBar = 0;
+    scrollbar = 0;
 }
 
 - (IBAction)scroll:(NSScroller*)sender
 {
-    if (scrollBar)
-        scrollBar->scrollbarHit([sender hitPart]);
+    if (scrollbar)
+        scrollbar->scrollbarHit([sender hitPart]);
 }
 
 - (Widget *)widget
 {
-    return scrollBar;
+    return scrollbar;
 }
 
 - (void)mouseDown:(NSEvent *)event
@@ -107,31 +107,31 @@ static NSControlSize NSControlSizeForScrollBarControlSize(ScrollBarControlSize s
 namespace WebCore
 {
 
-PlatformScrollBar::PlatformScrollBar(ScrollBarClient* client, ScrollBarOrientation orientation, ScrollBarControlSize controlSize)
-    : ScrollBar(client, orientation, controlSize)
+PlatformScrollbar::PlatformScrollbar(ScrollbarClient* client, ScrollbarOrientation orientation, ScrollbarControlSize controlSize)
+    : Scrollbar(client, orientation, controlSize)
 {
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
 
-    WebCoreScrollBar *bar = [[WebCoreScrollBar alloc] initWithPlatformScrollBar:this];
+    WebCoreScrollBar *bar = [[WebCoreScrollBar alloc] initWithPlatformScrollbar:this];
     setView(bar);
     [bar release];
 
     END_BLOCK_OBJC_EXCEPTIONS;
 }
 
-PlatformScrollBar::~PlatformScrollBar()
+PlatformScrollbar::~PlatformScrollbar()
 {
     WebCoreScrollBar* bar = (WebCoreScrollBar*)getView();
-    [bar detachPlatformScrollBar];
+    [bar detachPlatformScrollbar];
 
     // Widget should probably do this for all widgets.
     // But we don't need it for form elements, and for frames it doesn't work
     // well because of the way the NSViews are created in WebKit. So for now,
-    // we'll just do it explictly for ScrollBar.
+    // we'll just do it explictly for Scrollbar.
     removeFromSuperview();
 }
 
-void PlatformScrollBar::updateThumbPosition()
+void PlatformScrollbar::updateThumbPosition()
 {
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
     WebCoreScrollBar *bar = (WebCoreScrollBar *)getView();
@@ -140,7 +140,7 @@ void PlatformScrollBar::updateThumbPosition()
     END_BLOCK_OBJC_EXCEPTIONS;
 }
 
-void PlatformScrollBar::updateThumbProportion()
+void PlatformScrollbar::updateThumbProportion()
 {
     float val = (float)m_visibleSize/m_totalSize;
 
@@ -151,7 +151,7 @@ void PlatformScrollBar::updateThumbProportion()
     END_BLOCK_OBJC_EXCEPTIONS;
 }
 
-bool PlatformScrollBar::scrollbarHit(NSScrollerPart hitPart)
+bool PlatformScrollbar::scrollbarHit(NSScrollerPart hitPart)
 {
     int maxPos = m_totalSize - m_visibleSize;
     if (maxPos <= 0)
@@ -186,27 +186,27 @@ bool PlatformScrollBar::scrollbarHit(NSScrollerPart hitPart)
     return setValue(newPos);
 }
 
-int PlatformScrollBar::width() const
+int PlatformScrollbar::width() const
 {
     return Widget::width();
 }
 
-int PlatformScrollBar::height() const
+int PlatformScrollbar::height() const
 {
     return Widget::height();
 }
 
-void PlatformScrollBar::setRect(const IntRect& rect)
+void PlatformScrollbar::setRect(const IntRect& rect)
 {
     setFrameGeometry(rect);
 }
 
-void PlatformScrollBar::setEnabled(bool enabled)
+void PlatformScrollbar::setEnabled(bool enabled)
 {
     Widget::setEnabled(enabled);
 }
 
-void PlatformScrollBar::paint(GraphicsContext* graphicsContext, const IntRect& damageRect)
+void PlatformScrollbar::paint(GraphicsContext* graphicsContext, const IntRect& damageRect)
 {
     Widget::paint(graphicsContext, damageRect);
 }

diff --git a/WebCore/platform/mac/ScrollViewMac.mm b/WebCore/platform/mac/ScrollViewMac.mm
index 08ed79b7e0978bbdadd14b6b815d087f9f4177cc..5130a5acc0837087c126d1b28f0fafe889f13b48 100644 (file)
--- a/WebCore/platform/mac/ScrollViewMac.mm
+++ b/WebCore/platform/mac/ScrollViewMac.mm
@@ -200,71 +200,71 @@ void ScrollView::setContentsPos(int x, int y)
     END_BLOCK_OBJC_EXCEPTIONS;
 }
 
-void ScrollView::setVScrollBarMode(ScrollBarMode vMode)
+void ScrollView::setVScrollbarMode(ScrollbarMode vMode)
 {
     NSView* view = getView();
 
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
     if ([view conformsToProtocol:@protocol(WebCoreFrameView)]) {
         NSView<WebCoreFrameView>* frameView = (NSView<WebCoreFrameView>*)view;
-        [frameView setVerticalScrollingMode: (WebCoreScrollBarMode)vMode];
+        [frameView setVerticalScrollingMode: (WebCoreScrollbarMode)vMode];
     }
     END_BLOCK_OBJC_EXCEPTIONS;
 }
 
-void ScrollView::setHScrollBarMode(ScrollBarMode hMode)
+void ScrollView::setHScrollbarMode(ScrollbarMode hMode)
 {
     NSView* view = getView();
 
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
     if ([view conformsToProtocol:@protocol(WebCoreFrameView)]) {
         NSView<WebCoreFrameView>* frameView = (NSView<WebCoreFrameView>*)view;
-        [frameView setHorizontalScrollingMode: (WebCoreScrollBarMode)hMode];
+        [frameView setHorizontalScrollingMode: (WebCoreScrollbarMode)hMode];
     }
     END_BLOCK_OBJC_EXCEPTIONS;
 }
 
-void ScrollView::setScrollBarsMode(ScrollBarMode mode)
+void ScrollView::setScrollbarsMode(ScrollbarMode mode)
 {
     NSView* view = getView();
 
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
     if ([view conformsToProtocol:@protocol(WebCoreFrameView)]) {
         NSView<WebCoreFrameView>* frameView = (NSView<WebCoreFrameView>*)view;
-        [frameView setScrollingMode: (WebCoreScrollBarMode)mode];
+        [frameView setScrollingMode: (WebCoreScrollbarMode)mode];
     }
     END_BLOCK_OBJC_EXCEPTIONS;
 }
 
-ScrollBarMode ScrollView::vScrollBarMode() const
+ScrollbarMode ScrollView::vScrollbarMode() const
 {
     NSView* view = getView();
 
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
     if ([view conformsToProtocol:@protocol(WebCoreFrameView)]) {
         NSView<WebCoreFrameView>* frameView = (NSView<WebCoreFrameView>*)view;
-        return (ScrollBarMode)[frameView verticalScrollingMode];
+        return (ScrollbarMode)[frameView verticalScrollingMode];
     }
     END_BLOCK_OBJC_EXCEPTIONS;
 
-    return ScrollBarAuto;
+    return ScrollbarAuto;
 }
 
-ScrollBarMode ScrollView::hScrollBarMode() const
+ScrollbarMode ScrollView::hScrollbarMode() const
 {
     NSView* view = getView();
 
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
     if ([view conformsToProtocol:@protocol(WebCoreFrameView)]) {
         NSView<WebCoreFrameView>* frameView = (NSView<WebCoreFrameView>*)view;
-        return (ScrollBarMode)[frameView horizontalScrollingMode];
+        return (ScrollbarMode)[frameView horizontalScrollingMode];
     }
     END_BLOCK_OBJC_EXCEPTIONS;
 
-    return ScrollBarAuto;
+    return ScrollbarAuto;
 }
 
-void ScrollView::suppressScrollBars(bool suppressed,  bool repaintOnUnsuppress)
+void ScrollView::suppressScrollbars(bool suppressed,  bool repaintOnUnsuppress)
 {
     NSView* view = getView();
 
@@ -417,7 +417,7 @@ NSView *ScrollView::getDocumentView() const
     return nil;
 }
 
-PlatformScrollBar* ScrollView::scrollbarUnderMouse(const PlatformMouseEvent& mouseEvent)
+PlatformScrollbar* ScrollView::scrollbarUnderMouse(const PlatformMouseEvent& mouseEvent)
 {
     // On Mac, the ScrollView is really the "document", so events will never flow into it to get to the scrollers.
     return 0;

diff --git a/WebCore/platform/mac/WidgetMac.mm b/WebCore/platform/mac/WidgetMac.mm
index 9cfd62a3c260fe521905b6afbaf7b70243e4673d..9af4e136e5d4049a90834584fa98323d56e1355c 100644 (file)
--- a/WebCore/platform/mac/WidgetMac.mm
+++ b/WebCore/platform/mac/WidgetMac.mm
@@ -452,4 +452,8 @@ WidgetClient* Widget::client() const
     return data->client;
 }
 
+void Widget::removeFromParent()
+{
+}
+
 }

diff --git a/WebCore/rendering/RenderLayer.cpp b/WebCore/rendering/RenderLayer.cpp
index 318000092ab9468e81ab6df759dd07cac03692bf..d7e586214f18d9330c21aafed7fc3ce41d0b5f8f 100644 (file)
--- a/WebCore/rendering/RenderLayer.cpp
+++ b/WebCore/rendering/RenderLayer.cpp
@@ -902,16 +902,11 @@ PassRefPtr<Scrollbar> RenderLayer::createScrollbar(ScrollbarOrientation orientat
 void RenderLayer::destroyScrollbar(ScrollbarOrientation orientation)
 {
     RefPtr<Scrollbar>& scrollbar = orientation == HorizontalScrollbar ? m_hBar : m_vBar;
-
     if (scrollbar) {
-        if (scrollbar->isWidget()) {
-            PlatformScrollbar* scrollbarWidget = static_cast<PlatformScrollbar*>(scrollbar.get());
-            if (scrollbarWidget->parent()->isFrameView())
-                static_cast<FrameView*>(scrollbarWidget->parent())->removeChild(scrollbarWidget);
-            scrollbarWidget->setParent(0);
-        }
-        // FIXME: Destroy the engine scrollbar.
+        if (scrollbar->isWidget())
+            static_cast<PlatformScrollbar*>(scrollbar.get())->removeFromParent();
 
+        // FIXME: Destroy the engine scrollbar.
         scrollbar = 0;
     }
 }