Reviewed by Oliver.
authoraroben <aroben@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 9 Apr 2007 03:32:13 +0000 (03:32 +0000)
committeraroben <aroben@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 9 Apr 2007 03:32:13 +0000 (03:32 +0000)
        Bestowed the gift of -webkit-dashboard-region upon all platforms, since
        there's nothing Mac-specific about it other than the name. This also
        allowed me to get rid of FrameViewMac.mm.

        Removed a lot of #if PLATFORM(MAC):

        * css/CSSComputedStyleDeclaration.cpp:
        (WebCore::):
        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
        * css/CSSPrimitiveValue.cpp:
        (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
        (WebCore::CSSPrimitiveValue::cleanup):
        (WebCore::CSSPrimitiveValue::cssText):
        * css/CSSPrimitiveValue.h:
        (WebCore::CSSPrimitiveValue::getDashboardRegionValue):
        (WebCore::CSSPrimitiveValue::):
        * css/cssparser.cpp:
        (WebCore::CSSParser::parseValue):
        (WebCore::CSSParser::parseDashboardRegions):
        * css/cssparser.h:
        * css/cssstyleselector.cpp:
        (WebCore::CSSStyleSelector::applyProperty):
        * dom/Document.cpp:
        (WebCore::Document::Document):
        * dom/Document.h:
        * page/Frame.cpp:
        (WebCore::Frame::paint):
        * page/Frame.h:
        * page/FrameView.cpp:
        (WebCore::FrameView::layout):
        (WebCore::FrameView::updateDashboardRegions): Moved from FrameViewMac.mm.
        * page/FrameView.h:
        * page/qt/FrameQt.cpp:
        (WebCore::Frame::dashboardRegionsChanged): Stubbed out.
        * platform/gdk/FrameGdk.cpp:
        (WebCore::Frame::dashboardRegionsChanged): Ditto.
        * rendering/RenderLayer.cpp:
        (WebCore::RenderLayer::scrollToOffset):
        (WebCore::RenderLayer::setHasHorizontalScrollbar):
        (WebCore::RenderLayer::setHasVerticalScrollbar):
        (WebCore::RenderLayer::updateScrollInfoAfterLayout):
        * rendering/RenderObject.cpp:
        (WebCore::RenderObject::setStyle):

        * WebCore.xcodeproj/project.pbxproj: Removed FrameViewMac.mm.
        * bridge/mac/FrameViewMac.mm: Removed.

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

19 files changed:
WebCore/ChangeLog
WebCore/WebCore.xcodeproj/project.pbxproj
WebCore/bridge/mac/FrameViewMac.mm [deleted file]
WebCore/css/CSSComputedStyleDeclaration.cpp
WebCore/css/CSSPrimitiveValue.cpp
WebCore/css/CSSPrimitiveValue.h
WebCore/css/cssparser.cpp
WebCore/css/cssparser.h
WebCore/css/cssstyleselector.cpp
WebCore/dom/Document.cpp
WebCore/dom/Document.h
WebCore/page/Frame.cpp
WebCore/page/Frame.h
WebCore/page/FrameView.cpp
WebCore/page/FrameView.h
WebCore/page/qt/FrameQt.cpp
WebCore/platform/gdk/FrameGdk.cpp
WebCore/rendering/RenderLayer.cpp
WebCore/rendering/RenderObject.cpp

index 4485710..24d3492 100644 (file)
@@ -1,3 +1,54 @@
+2007-04-08  Adam Roben  <aroben@apple.com>
+
+        Reviewed by Oliver.
+
+        Bestowed the gift of -webkit-dashboard-region upon all platforms, since
+        there's nothing Mac-specific about it other than the name. This also
+        allowed me to get rid of FrameViewMac.mm.
+
+        Removed a lot of #if PLATFORM(MAC):
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::):
+        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
+        * css/CSSPrimitiveValue.cpp:
+        (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+        (WebCore::CSSPrimitiveValue::cleanup):
+        (WebCore::CSSPrimitiveValue::cssText):
+        * css/CSSPrimitiveValue.h:
+        (WebCore::CSSPrimitiveValue::getDashboardRegionValue):
+        (WebCore::CSSPrimitiveValue::):
+        * css/cssparser.cpp:
+        (WebCore::CSSParser::parseValue):
+        (WebCore::CSSParser::parseDashboardRegions):
+        * css/cssparser.h:
+        * css/cssstyleselector.cpp:
+        (WebCore::CSSStyleSelector::applyProperty):
+        * dom/Document.cpp:
+        (WebCore::Document::Document):
+        * dom/Document.h:
+        * page/Frame.cpp:
+        (WebCore::Frame::paint):
+        * page/Frame.h:
+        * page/FrameView.cpp:
+        (WebCore::FrameView::layout):
+        (WebCore::FrameView::updateDashboardRegions): Moved from FrameViewMac.mm.
+        * page/FrameView.h:
+        * page/qt/FrameQt.cpp:
+        (WebCore::Frame::dashboardRegionsChanged): Stubbed out.
+        * platform/gdk/FrameGdk.cpp:
+        (WebCore::Frame::dashboardRegionsChanged): Ditto.
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::scrollToOffset):
+        (WebCore::RenderLayer::setHasHorizontalScrollbar):
+        (WebCore::RenderLayer::setHasVerticalScrollbar):
+        (WebCore::RenderLayer::updateScrollInfoAfterLayout):
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::setStyle):
+
+        * WebCore.xcodeproj/project.pbxproj: Removed FrameViewMac.mm.
+        * bridge/mac/FrameViewMac.mm: Removed.
+
 2007-04-08  Mark Rowe  <mrowe@apple.com>
 
         Qt build fix.
index bbecfe4..2adb1c5 100644 (file)
                9380F47309A11AB4001FDB34 /* Widget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9380F47109A11AB4001FDB34 /* Widget.cpp */; };
                9380F47409A11AB4001FDB34 /* Widget.h in Headers */ = {isa = PBXBuildFile; fileRef = 9380F47209A11AB4001FDB34 /* Widget.h */; settings = {ATTRIBUTES = (Private, ); }; };
                9380F47809A11ACC001FDB34 /* WidgetMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9380F47709A11ACC001FDB34 /* WidgetMac.mm */; };
-               9380F68709A143B2001FDB34 /* FrameViewMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9380F68609A143B2001FDB34 /* FrameViewMac.mm */; };
                938E65F109F09840008A48EC /* JSHTMLElementWrapperFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 938E65F009F09840008A48EC /* JSHTMLElementWrapperFactory.h */; };
                938E65F709F0985D008A48EC /* JSHTMLElementWrapperFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 938E65F609F0985D008A48EC /* JSHTMLElementWrapperFactory.cpp */; };
                938E666009F09B81008A48EC /* JSHTMLCanvasElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 938E665F09F09B81008A48EC /* JSHTMLCanvasElement.cpp */; };
                9380F47109A11AB4001FDB34 /* Widget.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Widget.cpp; sourceTree = "<group>"; };
                9380F47209A11AB4001FDB34 /* Widget.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Widget.h; sourceTree = "<group>"; };
                9380F47709A11ACC001FDB34 /* WidgetMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WidgetMac.mm; sourceTree = "<group>"; };
-               9380F68609A143B2001FDB34 /* FrameViewMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FrameViewMac.mm; sourceTree = "<group>"; };
                938E65F009F09840008A48EC /* JSHTMLElementWrapperFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSHTMLElementWrapperFactory.h; sourceTree = "<group>"; };
                938E65F609F0985D008A48EC /* JSHTMLElementWrapperFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLElementWrapperFactory.cpp; sourceTree = "<group>"; };
                938E662509F09956008A48EC /* HTMLCanvasElement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLCanvasElement.idl; sourceTree = "<group>"; };
                        isa = PBXGroup;
                        children = (
                                55998A5D052B59CC0017A6C1 /* AXObjectCacheMac.mm */,
-                               9380F68609A143B2001FDB34 /* FrameViewMac.mm */,
                                935C475E09AC4CAE00A6AAB4 /* HistoryMac.mm */,
                                55998A5A052B59CC0017A6C1 /* WebCoreAXObject.h */,
                                55998A5B052B59CC0017A6C1 /* WebCoreAXObject.mm */,
                                9380F47309A11AB4001FDB34 /* Widget.cpp in Sources */,
                                9380F47809A11ACC001FDB34 /* WidgetMac.mm in Sources */,
                                936B424E09A436CD00BAA820 /* SVGCSSParser.cpp in Sources */,
-                               9380F68709A143B2001FDB34 /* FrameViewMac.mm in Sources */,
                                BCC47E2609A3D6F100ADB771 /* FontFamily.cpp in Sources */,
                                935C475F09AC4CAE00A6AAB4 /* HistoryMac.mm in Sources */,
                                935C477009AC4D7300A6AAB4 /* KeyEventMac.mm in Sources */,
diff --git a/WebCore/bridge/mac/FrameViewMac.mm b/WebCore/bridge/mac/FrameViewMac.mm
deleted file mode 100644 (file)
index 6dfcbd9..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 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. 
- */
-
-#import "config.h"
-#import "FrameView.h"
-
-#import "BlockExceptions.h"
-#import "Document.h"
-#import "Frame.h"
-#import "MouseEventWithHitTestResults.h"
-#import "PlatformScrollBar.h"
-#import "RenderObject.h"
-#import "WebCoreFrameBridge.h"
-
-namespace WebCore {
-
-void FrameView::updateDashboardRegions()
-{
-    Document* doc = m_frame->document();
-    if (doc->hasDashboardRegions()) {
-        Vector<DashboardRegionValue> newRegions;
-        doc->renderer()->collectDashboardRegions(newRegions);
-        doc->setDashboardRegions(newRegions);
-        m_frame.get()->dashboardRegionsChanged();
-    }
-}
-
-}
index 00740ae..d412b5a 100644 (file)
@@ -167,10 +167,7 @@ static const int computedProperties[] = {
     CSS_PROP__WEBKIT_USER_DRAG,
     CSS_PROP__WEBKIT_USER_MODIFY,
     CSS_PROP__WEBKIT_USER_SELECT,
-
-#if PLATFORM(MAC)
     CSS_PROP__WEBKIT_DASHBOARD_REGION,
-#endif
 };
 
 const unsigned numComputedProperties = sizeof(computedProperties) / sizeof(computedProperties[0]);
@@ -1469,7 +1466,6 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
                 return new CSSPrimitiveValue(CSS_VAL_CONTENT_BOX);
             return new CSSPrimitiveValue(CSS_VAL_BORDER_BOX);
         case CSS_PROP__WEBKIT_DASHBOARD_REGION:
-#if PLATFORM(MAC)
         {
             const Vector<StyleDashboardRegion>& regions = style->dashboardRegions();
             unsigned count = regions.size();
@@ -1499,9 +1495,6 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
             }
             return new CSSPrimitiveValue(firstRegion.release());
         }
-#else
-            break;
-#endif
         case CSS_PROP__WEBKIT_APPEARANCE:
             return valueForAppearance(style->appearance());
         case CSS_PROP__WEBKIT_FONT_SIZE_DELTA:
index 267da7a..97b3e7f 100644 (file)
@@ -143,13 +143,11 @@ CSSPrimitiveValue::CSSPrimitiveValue(PassRefPtr<RectImpl> r)
     m_value.rect = r.releaseRef();
 }
 
-#if PLATFORM(MAC)
 CSSPrimitiveValue::CSSPrimitiveValue(PassRefPtr<DashboardRegion> r)
     : m_type(CSS_DASHBOARD_REGION)
 {
     m_value.region = r.releaseRef();
 }
-#endif
 
 CSSPrimitiveValue::CSSPrimitiveValue(RGBA32 color)
     : m_type(CSS_RGBCOLOR)
@@ -186,12 +184,10 @@ void CSSPrimitiveValue::cleanup()
         case CSS_PAIR:
             m_value.pair->deref();
             break;
-#if PLATFORM(MAC)
         case CSS_DASHBOARD_REGION:
             if (m_value.region)
                 m_value.region->deref();
             break;
-#endif
         default:
             break;
     }
@@ -550,7 +546,6 @@ String CSSPrimitiveValue::cssText() const
             text += " ";
             text += m_value.pair->second()->cssText();
             break;
-#if PLATFORM(MAC)
         case CSS_DASHBOARD_REGION:
             for (DashboardRegion* region = getDashboardRegionValue(); region; region = region->m_next.get()) {
                 text = "dashboard-region(";
@@ -568,7 +563,6 @@ String CSSPrimitiveValue::cssText() const
                 text += ")";
             }
             break;
-#endif
     }
     return text;
 }
index e7a0938..72c2571 100644 (file)
@@ -79,10 +79,7 @@ public:
     CSSPrimitiveValue(PassRefPtr<RectImpl>);
     CSSPrimitiveValue(unsigned color); // RGB value
     CSSPrimitiveValue(PassRefPtr<Pair>);
-
-#if PLATFORM(MAC)
     CSSPrimitiveValue(PassRefPtr<DashboardRegion>); // FIXME: Why is dashboard region a primitive value? This makes no sense.
-#endif
 
     virtual ~CSSPrimitiveValue();
 
@@ -122,9 +119,7 @@ public:
     unsigned getRGBColorValue() const { return m_type != CSS_RGBCOLOR ? 0 : m_value.rgbcolor; }
     Pair* getPairValue() const { return m_type != CSS_PAIR ? 0 : m_value.pair; }
 
-#if PLATFORM(MAC)
     DashboardRegion* getDashboardRegionValue () const { return m_type != CSS_DASHBOARD_REGION ? 0 : m_value.region; }
-#endif
 
     virtual bool isPrimitiveValue() const { return true; }
 
@@ -147,9 +142,7 @@ protected:
         RectImpl* rect;
         unsigned rgbcolor;
         Pair* pair;
-#if PLATFORM(MAC)
         DashboardRegion* region;
-#endif
     } m_value;
 };
 
index b133b1f..e42f54a 100644 (file)
@@ -1357,12 +1357,10 @@ bool CSSParser::parseValue(int propId, bool important)
             valid_primitive = true;
         break;
 
-#if PLATFORM(MAC)
     case CSS_PROP__WEBKIT_DASHBOARD_REGION:                 // <dashboard-region> | <dashboard-region> 
         if (value->unit == Value::Function || id == CSS_VAL_NONE)
             return parseDashboardRegions(propId, important);
         break;
-#endif
     // End Apple-specific properties
 
         /* shorthand properties */
@@ -2043,8 +2041,6 @@ failed:
     return false;
 }
 
-#if PLATFORM(MAC)
-
 #define DASHBOARD_REGION_NUM_PARAMETERS  6
 #define DASHBOARD_REGION_SHORT_NUM_PARAMETERS  2
 
@@ -2180,7 +2176,6 @@ bool CSSParser::parseDashboardRegions(int propId, bool important)
         
     return valid;
 }
-#endif
 
 PassRefPtr<CSSValue> CSSParser::parseCounterContent(ValueList* args, bool counters)
 {
index ad3185b..5a35287 100644 (file)
@@ -146,9 +146,7 @@ namespace WebCore {
 
         void addBackgroundValue(CSSValue*& lval, CSSValue* rval);
 
-#if PLATFORM(MAC)
         bool parseDashboardRegions(int propId, bool important);
-#endif
 
         bool parseShape(int propId, bool important);
 
index 7179697..e53514f 100644 (file)
@@ -4256,7 +4256,6 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
         style->setTextSecurity(textSecurity);
         return;
     }
-#if PLATFORM(MAC)
     case CSS_PROP__WEBKIT_DASHBOARD_REGION: {
         HANDLE_INHERIT_AND_INITIAL(dashboardRegions, DashboardRegions)
         if (!primitiveValue)
@@ -4288,7 +4287,6 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
         
         return;
     }
-#endif
     case CSS_PROP__WEBKIT_RTL_ORDERING:
         HANDLE_INHERIT_AND_INITIAL(visuallyOrdered, VisuallyOrdered)
         if (!primitiveValue || !primitiveValue->getIdent())
index 9b8113d..20891b0 100644 (file)
@@ -294,10 +294,8 @@ Document::Document(DOMImplementation* impl, FrameView *v)
 #if ENABLE(SVG)
     , m_svgExtensions(0)
 #endif
-#if PLATFORM(MAC)
     , m_hasDashboardRegions(false)
     , m_dashboardRegionsDirty(false)
-#endif
     , m_accessKeyMapValid(false)
     , m_createRenderers(true)
     , m_inPageCache(false)
@@ -2129,8 +2127,6 @@ void Document::activeChainNodeDetached(Node* node)
         m_activeNode = m_activeNode->parent();
 }
 
-#if PLATFORM(MAC)
-
 const Vector<DashboardRegionValue>& Document::dashboardRegions() const
 {
     return m_dashboardRegions;
@@ -2142,8 +2138,6 @@ void Document::setDashboardRegions(const Vector<DashboardRegionValue>& regions)
     setDashboardRegionsDirty(false);
 }
 
-#endif
-
 bool Document::setFocusedNode(PassRefPtr<Node> newFocusedNode)
 {    
     // Make sure newFocusedNode is actually in this document
index 71eca9e..5922eef 100644 (file)
@@ -767,14 +767,12 @@ public:
 
     UChar backslashAsCurrencySymbol() const;
 
-#if PLATFORM(MAC)
     void setDashboardRegionsDirty(bool f) { m_dashboardRegionsDirty = f; }
     bool dashboardRegionsDirty() const { return m_dashboardRegionsDirty; }
     bool hasDashboardRegions () const { return m_hasDashboardRegions; }
     void setHasDashboardRegions (bool f) { m_hasDashboardRegions = f; }
     const Vector<DashboardRegionValue>& dashboardRegions() const;
     void setDashboardRegions(const Vector<DashboardRegionValue>&);
-#endif
 
     void removeAllEventListenersFromAllNodes();
 
@@ -830,11 +828,9 @@ private:
     SVGDocumentExtensions* m_svgExtensions;
 #endif
     
-#if PLATFORM(MAC)
     Vector<DashboardRegionValue> m_dashboardRegions;
     bool m_hasDashboardRegions;
     bool m_dashboardRegionsDirty;
-#endif
 
     mutable bool m_accessKeyMapValid;
     bool m_createRenderers;
index 3853451..6026626 100644 (file)
@@ -1301,11 +1301,9 @@ void Frame::paint(GraphicsContext* p, const IntRect& rect)
             renderer()->document()->invalidateRenderedRectsForMarkersInRect(rect);
         renderer()->layer()->paint(p, rect, d->m_paintRestriction, eltRenderer);
 
-#if PLATFORM(MAC)
         // Regions may have changed as a result of the visibility/z-index of element changing.
         if (renderer()->document()->dashboardRegionsDirty())
             renderer()->view()->frameView()->updateDashboardRegions();
-#endif
     } else
         LOG_ERROR("called Frame::paint with nil renderer");
 }
index 5f50e25..cb80f87 100644 (file)
@@ -241,6 +241,8 @@ public:
     bool prohibitsScrolling() const;
     void setProhibitsScrolling(const bool);
 
+    void dashboardRegionsChanged();
+
 private:
     void cleanupScriptObjects();
     void cleanupPlatformScriptObjects();
@@ -365,7 +367,6 @@ public:
     NSString* matchLabelsAgainstElement(NSArray* labels, Element*);
 
     NSMutableDictionary* dashboardRegionsDictionary();
-    void dashboardRegionsChanged();
 
     void willPopupMenu(NSMenu*);
 
index fff72af..6ddaae7 100644 (file)
@@ -449,8 +449,8 @@ void FrameView::layout(bool allowSubtree)
 #if PLATFORM(MAC)
     if (AXObjectCache::accessibilityEnabled())
         root->document()->axObjectCache()->postNotificationToElement(root, "AXLayoutComplete");
-    updateDashboardRegions();
 #endif
+    updateDashboardRegions();
 
     if (didFirstLayout)
         m_frame->loader()->didFirstLayout();
@@ -882,4 +882,15 @@ bool FrameView::handleMouseReleaseEvent(const PlatformMouseEvent& event)
     return m_frame->eventHandler()->handleMouseReleaseEvent(event);
 }
 
+void FrameView::updateDashboardRegions()
+{
+    Document* doc = m_frame->document();
+    if (doc->hasDashboardRegions()) {
+        Vector<DashboardRegionValue> newRegions;
+        doc->renderer()->collectDashboardRegions(newRegions);
+        doc->setDashboardRegions(newRegions);
+        m_frame.get()->dashboardRegionsChanged();
+    }
+}
+
 }
index 1f858a9..826d6f0 100644 (file)
@@ -120,9 +120,7 @@ public:
     void addSlowRepaintObject();
     void removeSlowRepaintObject();
 
-#if PLATFORM(MAC)
     void updateDashboardRegions();
-#endif
 
     void restoreScrollbar();
 
index 28e8cbe..61c1aa8 100644 (file)
@@ -127,6 +127,9 @@ DragImageRef Frame::dragImageForSelection()
     return 0;
 }
     
+void Frame::dashboardRegionsChanged()
+{
+}
 
 }
 // vim: ts=4 sw=4 et
index f9c2152..5c6bd31 100644 (file)
@@ -307,4 +307,9 @@ DragImageRef Frame::dragImageForSelection()
     return 0;
 }
 
+void Frame::dashboardRegionsChanged()
+{
+    notImplementedGdk();
+}
+
 }
index dd7674c..d9b1130 100644 (file)
@@ -695,11 +695,9 @@ void RenderLayer::scrollToOffset(int x, int y, bool updateScrollbars, bool repai
     // We should have a RenderView if we're trying to scroll.
     ASSERT(view);
     if (view) {
-#if PLATFORM(MAC)
         // Update dashboard regions, scrolling may change the clip of a
         // particular region.
         view->frameView()->updateDashboardRegions();
-#endif
 
         view->updateWidgetPositions();
     }
@@ -1028,12 +1026,9 @@ void RenderLayer::setHasHorizontalScrollbar(bool hasScrollbar)
     else
         destroyScrollbar(HorizontalScrollbar);
 
-#if PLATFORM(MAC)
     // Force an update since we know the scrollbars have changed things.
     if (m_object->document()->hasDashboardRegions())
         m_object->document()->setDashboardRegionsDirty(true);
-#endif
-
 }
 
 void RenderLayer::setHasVerticalScrollbar(bool hasScrollbar)
@@ -1046,12 +1041,9 @@ void RenderLayer::setHasVerticalScrollbar(bool hasScrollbar)
     else
         destroyScrollbar(VerticalScrollbar);
 
-#if PLATFORM(MAC)
     // Force an update since we know the scrollbars have changed things.
     if (m_object->document()->hasDashboardRegions())
         m_object->document()->setDashboardRegionsDirty(true);
-#endif
-
 }
 
 int RenderLayer::verticalScrollbarWidth() const
@@ -1220,11 +1212,9 @@ RenderLayer::updateScrollInfoAfterLayout()
         if (m_object->hasAutoVerticalScrollbar())
             setHasVerticalScrollbar(verticalOverflow);
 
-#if PLATFORM(MAC)
         // Force an update since we know the scrollbars have changed things.
         if (m_object->document()->hasDashboardRegions())
             m_object->document()->setDashboardRegionsDirty(true);
-#endif
 
         m_object->repaint();
 
index 6db96fe..6613076 100644 (file)
@@ -2134,12 +2134,10 @@ void RenderObject::setStyle(RenderStyle* style)
         // If our z-index changes value or our visibility changes,
         // we need to dirty our stacking context's z-order list.
         if (style) {
-#if PLATFORM(MAC)
             if (m_style->visibility() != style->visibility() ||
                     m_style->zIndex() != style->zIndex() ||
                     m_style->hasAutoZIndex() != style->hasAutoZIndex())
                 document()->setDashboardRegionsDirty(true);
-#endif
 
             if ((m_style->hasAutoZIndex() != style->hasAutoZIndex() ||
                     m_style->zIndex() != style->zIndex() ||