Part 2 of the feature requested in

        <rdar://problem/3752791> Dashboard: Need a better solution for control regions

        This patch actually collections the regions and converts to absolute coordinates.
        Only remaining piece is to pass over the bridge and up the alley to WebKit
        UI delegate.

        Reviewed by Ken.

        * khtml/css/css_valueimpl.h:
        (DOM::CSSPrimitiveValueImpl::getDashboardRegionValue):
        * khtml/css/cssparser.cpp:
        (CSSParser::parseValue):
        (CSSParser::parseDashboardRegions):
        * khtml/css/cssproperties.c:
        * khtml/css/cssproperties.h:
        * khtml/css/cssproperties.in:
        * khtml/css/cssstyleselector.cpp:
        (khtml::CSSStyleSelector::applyProperty):
        * khtml/khtmlview.cpp:
        (KHTMLView::layout):
        * khtml/rendering/render_object.cpp:
        (RenderObject::computeDashboardRegions):
        (RenderObject::addDashboardRegions):
        (RenderObject::collectDashboardRegions):
        * khtml/rendering/render_object.h:
        (khtml::DashboardRegionValue::operator==):
        * khtml/rendering/render_style.cpp:
        * khtml/rendering/render_style.h:
        (khtml::StyleDashboardRegion::):
        (khtml::RenderStyle::dashboardRegions):
        (khtml::RenderStyle::setDashboardRegion):
        * khtml/xml/dom_docimpl.cpp:
        (DocumentImpl::DocumentImpl):
        (DocumentImpl::updateLayout):
        (DocumentImpl::acceptsEditingFocus):
        (DocumentImpl::dashboardRegions):
        (DocumentImpl::setDashboardRegions):
        * khtml/xml/dom_docimpl.h:
        (DOM::DocumentImpl::hasDashboardRegions):
        (DOM::DocumentImpl::setHasDashboardRegions):

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

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 1d02d400160777ad7d05fd595a8723282c4940c2..3df57fd273edae1378809f11ffd938acf48df5ce 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,47 @@
+2004-09-21  Richard Williamson   <rjw@apple.com>
+
+        Part 2 of the feature requested in
+        <rdar://problem/3752791> Dashboard: Need a better solution for control regions
+       
+        This patch actually collections the regions and converts to absolute coordinates.
+        Only remaining piece is to pass over the bridge and up the alley to WebKit
+        UI delegate.
+ 
+        Reviewed by Ken.
+
+        * khtml/css/css_valueimpl.h:
+        (DOM::CSSPrimitiveValueImpl::getDashboardRegionValue):
+        * khtml/css/cssparser.cpp:
+        (CSSParser::parseValue):
+        (CSSParser::parseDashboardRegions):
+        * khtml/css/cssproperties.c:
+        * khtml/css/cssproperties.h:
+        * khtml/css/cssproperties.in:
+        * khtml/css/cssstyleselector.cpp:
+        (khtml::CSSStyleSelector::applyProperty):
+        * khtml/khtmlview.cpp:
+        (KHTMLView::layout):
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::computeDashboardRegions):
+        (RenderObject::addDashboardRegions):
+        (RenderObject::collectDashboardRegions):
+        * khtml/rendering/render_object.h:
+        (khtml::DashboardRegionValue::operator==):
+        * khtml/rendering/render_style.cpp:
+        * khtml/rendering/render_style.h:
+        (khtml::StyleDashboardRegion::):
+        (khtml::RenderStyle::dashboardRegions):
+        (khtml::RenderStyle::setDashboardRegion):
+        * khtml/xml/dom_docimpl.cpp:
+        (DocumentImpl::DocumentImpl):
+        (DocumentImpl::updateLayout):
+        (DocumentImpl::acceptsEditingFocus):
+        (DocumentImpl::dashboardRegions):
+        (DocumentImpl::setDashboardRegions):
+        * khtml/xml/dom_docimpl.h:
+        (DOM::DocumentImpl::hasDashboardRegions):
+        (DOM::DocumentImpl::setHasDashboardRegions):
+
 2004-09-21  John Sullivan  <sullivan@apple.com>
 
         Reviewed by Darin.

diff --git a/WebCore/khtml/css/css_valueimpl.h b/WebCore/khtml/css/css_valueimpl.h
index 9d045ccaec144cbd7b1e3e314a26227aff9148e1..be1cfed395f035b74b93f05d047e676cea8159ec 100644 (file)
--- a/WebCore/khtml/css/css_valueimpl.h
+++ b/WebCore/khtml/css/css_valueimpl.h
@@ -221,6 +221,12 @@ public:
        return ( m_type != CSSPrimitiveValue::CSS_RGBCOLOR ? 0 : m_value.rgbcolor );
     }
 
+#if APPLE_CHANGES
+    DashboardRegionImpl *getDashboardRegionValue () const {
+       return ( m_type != CSSPrimitiveValue::CSS_DASHBOARD_REGION ? 0 : m_value.region );
+    }
+#endif
+
     virtual bool isPrimitiveValue() const { return true; }
     virtual unsigned short cssValueType() const;
 
@@ -292,6 +298,7 @@ protected:
     CSSPrimitiveValueImpl *m_left;
 };
 
+#if APPLE_CHANGES
 class DashboardRegionImpl : public RectImpl {
 public:
     DashboardRegionImpl() : RectImpl(), m_next(0), m_isCircle(0), m_isRectangle(0) { };
@@ -306,16 +313,13 @@ public:
         m_next = next;
     };
     
-    void setLabel(const QString &label) {
-        m_label = label;
-    };
-
 public:
     DashboardRegionImpl *m_next;
     QString m_label;
     unsigned int m_isCircle:1;
     unsigned int m_isRectangle:1;
 };
+#endif
 
 class CSSImageValueImpl : public CSSPrimitiveValueImpl, public khtml::CachedObjectClient
 {

diff --git a/WebCore/khtml/css/cssparser.cpp b/WebCore/khtml/css/cssparser.cpp
index 343fdd7304d9fee51e468ad8585fb920feb3473d..e963b8cc5227a64a80a0b43c1b9695f98b6a00e1 100644 (file)
--- a/WebCore/khtml/css/cssparser.cpp
+++ b/WebCore/khtml/css/cssparser.cpp
@@ -521,10 +521,12 @@ bool CSSParser::parseValue( int propId, bool important )
            return parseShape( propId, important );
        break;
 
+#if APPLE_CHANGES
     case CSS_PROP__APPLE_DASHBOARD_REGION:                 // <dashboard-region-circle> | <dashboard-region-rectangle> 
        if ( value->unit == Value::Function )
            return parseDashboardRegions( propId, important );
        break;
+#endif
 
     /* Start of supported CSS properties with validation. This is needed for parseShortHand to work
      * correctly and allows optimization in khtml::applyRule(..)
@@ -1510,6 +1512,7 @@ static Value *skipCommaInDashboardRegion (ValueList *args)
     return args->current();
 }
 
+#if APPLE_CHANGES
 bool CSSParser::parseDashboardRegions( int propId, bool important )
 {
     bool valid = true;
@@ -1561,7 +1564,7 @@ bool CSSParser::parseDashboardRegions( int propId, bool important )
             break;
         }
             
-        region->setLabel (qString(arg->string));
+        region->m_label = qString(arg->string);
 
         // Next four arguments must be offset numbers
         int i;
@@ -1593,6 +1596,7 @@ bool CSSParser::parseDashboardRegions( int propId, bool important )
         
     return valid;
 }
+#endif
 
 bool CSSParser::parseShape( int propId, bool important )
 {

diff --git a/WebCore/khtml/css/cssproperties.c b/WebCore/khtml/css/cssproperties.c
index 3e74776b1ad818cb8f72d4594878e2bff659451d..49048c50bfa7705e70241cfae9a566cf72a19e9d 100644 (file)
--- a/WebCore/khtml/css/cssproperties.c
+++ b/WebCore/khtml/css/cssproperties.c
@@ -588,6 +588,7 @@ static const char * const propertyList[] = {
 "text-underline-style", 
 "text-underline-width", 
 "-apple-text-size-adjust", 
+"-apple-dashboard-region", 
 "top", 
 "unicode-bidi", 
 "-khtml-user-drag", 
@@ -622,7 +623,6 @@ static const char * const propertyList[] = {
 "scrollbar-track-color", 
 "scrollbar-arrow-color", 
 "-khtml-flow-mode", 
-"-apple-dashboard-region", 
     0
 };
 DOMString getPropertyName(unsigned short id)

diff --git a/WebCore/khtml/css/cssproperties.h b/WebCore/khtml/css/cssproperties.h
index bf22b46b3d33e6fcaff4d9e20c389fd42b74539e..56d09de3f9ca640ce6b44d72d956751104398586 100644 (file)
--- a/WebCore/khtml/css/cssproperties.h
+++ b/WebCore/khtml/css/cssproperties.h
@@ -126,41 +126,41 @@
 #define CSS_PROP_TEXT_UNDERLINE_STYLE 117
 #define CSS_PROP_TEXT_UNDERLINE_WIDTH 118
 #define CSS_PROP__APPLE_TEXT_SIZE_ADJUST 119
-#define CSS_PROP_TOP 120
-#define CSS_PROP_UNICODE_BIDI 121
-#define CSS_PROP__KHTML_USER_DRAG 122
-#define CSS_PROP__KHTML_USER_MODIFY 123
-#define CSS_PROP__KHTML_USER_SELECT 124
-#define CSS_PROP_VERTICAL_ALIGN 125
-#define CSS_PROP_VISIBILITY 126
-#define CSS_PROP_WHITE_SPACE 127
-#define CSS_PROP_WIDOWS 128
-#define CSS_PROP_WIDTH 129
-#define CSS_PROP_WORD_SPACING 130
-#define CSS_PROP_Z_INDEX 131
-#define CSS_PROP_BACKGROUND 132
-#define CSS_PROP_BORDER 133
-#define CSS_PROP_BORDER_COLOR 134
-#define CSS_PROP_BORDER_STYLE 135
-#define CSS_PROP_BORDER_TOP 136
-#define CSS_PROP_BORDER_RIGHT 137
-#define CSS_PROP_BORDER_BOTTOM 138
-#define CSS_PROP_BORDER_LEFT 139
-#define CSS_PROP_BORDER_WIDTH 140
-#define CSS_PROP_FONT 141
-#define CSS_PROP_LIST_STYLE 142
-#define CSS_PROP_MARGIN 143
-#define CSS_PROP_OUTLINE 144
-#define CSS_PROP_PADDING 145
-#define CSS_PROP_SCROLLBAR_FACE_COLOR 146
-#define CSS_PROP_SCROLLBAR_SHADOW_COLOR 147
-#define CSS_PROP_SCROLLBAR_HIGHLIGHT_COLOR 148
-#define CSS_PROP_SCROLLBAR_3DLIGHT_COLOR 149
-#define CSS_PROP_SCROLLBAR_DARKSHADOW_COLOR 150
-#define CSS_PROP_SCROLLBAR_TRACK_COLOR 151
-#define CSS_PROP_SCROLLBAR_ARROW_COLOR 152
-#define CSS_PROP__KHTML_FLOW_MODE 153
-#define CSS_PROP__APPLE_DASHBOARD_REGION 154
+#define CSS_PROP__APPLE_DASHBOARD_REGION 120
+#define CSS_PROP_TOP 121
+#define CSS_PROP_UNICODE_BIDI 122
+#define CSS_PROP__KHTML_USER_DRAG 123
+#define CSS_PROP__KHTML_USER_MODIFY 124
+#define CSS_PROP__KHTML_USER_SELECT 125
+#define CSS_PROP_VERTICAL_ALIGN 126
+#define CSS_PROP_VISIBILITY 127
+#define CSS_PROP_WHITE_SPACE 128
+#define CSS_PROP_WIDOWS 129
+#define CSS_PROP_WIDTH 130
+#define CSS_PROP_WORD_SPACING 131
+#define CSS_PROP_Z_INDEX 132
+#define CSS_PROP_BACKGROUND 133
+#define CSS_PROP_BORDER 134
+#define CSS_PROP_BORDER_COLOR 135
+#define CSS_PROP_BORDER_STYLE 136
+#define CSS_PROP_BORDER_TOP 137
+#define CSS_PROP_BORDER_RIGHT 138
+#define CSS_PROP_BORDER_BOTTOM 139
+#define CSS_PROP_BORDER_LEFT 140
+#define CSS_PROP_BORDER_WIDTH 141
+#define CSS_PROP_FONT 142
+#define CSS_PROP_LIST_STYLE 143
+#define CSS_PROP_MARGIN 144
+#define CSS_PROP_OUTLINE 145
+#define CSS_PROP_PADDING 146
+#define CSS_PROP_SCROLLBAR_FACE_COLOR 147
+#define CSS_PROP_SCROLLBAR_SHADOW_COLOR 148
+#define CSS_PROP_SCROLLBAR_HIGHLIGHT_COLOR 149
+#define CSS_PROP_SCROLLBAR_3DLIGHT_COLOR 150
+#define CSS_PROP_SCROLLBAR_DARKSHADOW_COLOR 151
+#define CSS_PROP_SCROLLBAR_TRACK_COLOR 152
+#define CSS_PROP_SCROLLBAR_ARROW_COLOR 153
+#define CSS_PROP__KHTML_FLOW_MODE 154
 
 #define CSS_PROP_MAX CSS_PROP_Z_INDEX
 #define CSS_PROP_TOTAL 155

diff --git a/WebCore/khtml/css/cssproperties.in b/WebCore/khtml/css/cssproperties.in
index c27481b0e31206c4851e74fb2d02a7469c82b751..e1288b8719857b422a7919272f39d43ebfa6dc33 100644 (file)
--- a/WebCore/khtml/css/cssproperties.in
+++ b/WebCore/khtml/css/cssproperties.in
@@ -131,6 +131,7 @@ text-underline-mode
 text-underline-style
 text-underline-width
 -apple-text-size-adjust
+-apple-dashboard-region
 top
 unicode-bidi
 -khtml-user-drag
@@ -165,4 +166,3 @@ scrollbar-darkshadow-color
 scrollbar-track-color
 scrollbar-arrow-color
 -khtml-flow-mode
--apple-dashboard-region

diff --git a/WebCore/khtml/css/cssstyleselector.cpp b/WebCore/khtml/css/cssstyleselector.cpp
index 05a08b5bb68331181a87d158f31d3ca8a09370fd..8e4f83409e23d65be6073fbbeea2a614a2b6b96d 100644 (file)
--- a/WebCore/khtml/css/cssstyleselector.cpp
+++ b/WebCore/khtml/css/cssstyleselector.cpp
@@ -3709,7 +3709,33 @@ void CSSStyleSelector::applyProperty( int id, DOM::CSSValueImpl *value )
         style->setTextSizeAdjust(primitiveValue->getIdent() == CSS_VAL_AUTO);
         fontDirty = true;
         break;
-    }        
+    }
+    case CSS_PROP__APPLE_DASHBOARD_REGION: {
+        if (!primitiveValue)
+            return;
+        DashboardRegionImpl *region = primitiveValue->getDashboardRegionValue();
+        if (!region)
+            return;
+            
+        DashboardRegionImpl *first = region;
+        while (region) {
+            Length top = convertToLength (region->top(), style, paintDeviceMetrics );
+            Length right = convertToLength (region->right(), style, paintDeviceMetrics );
+            Length bottom = convertToLength (region->bottom(), style, paintDeviceMetrics );
+            Length left = convertToLength (region->left(), style, paintDeviceMetrics );
+            if (region->m_isCircle) {
+                style->setDashboardRegion (StyleDashboardRegion::Circle, region->m_label, top, right, bottom, left, region == first ? false : true);
+            }
+            else if (region->m_isRectangle) {
+                style->setDashboardRegion (StyleDashboardRegion::Rectangle, region->m_label, top, right, bottom, left, region == first ? false : true);
+            }
+            region = region->m_next;
+        }
+        
+        element->getDocument()->setHasDashboardRegions (true);
+        
+        break;
+    }   
 #endif
 
     default:

diff --git a/WebCore/khtml/khtmlview.cpp b/WebCore/khtml/khtmlview.cpp
index 8083d1cf5871dcf4b817e3d30743ba139df0433f..fe4c211a340bd6af4ddd34d02be4bc60255654a4 100644 (file)
--- a/WebCore/khtml/khtmlview.cpp
+++ b/WebCore/khtml/khtmlview.cpp
@@ -701,6 +701,17 @@ void KHTMLView::layout()
         root->document()->getOrCreateAccObjectCache()->postNotification(root, "AXLayoutComplete");
 #endif
 
+#if APPLE_CHANGES
+    if (document->hasDashboardRegions()) {
+        QValueList<DashboardRegionValue> newRegions = document->renderer()->computeDashboardRegions();
+        QValueList<DashboardRegionValue> currentRegions = document->dashboardRegions();
+        if (!(newRegions == currentRegions)) {
+            document->setDashboardRegions(newRegions);
+            // FIXME:  Pass the regions on up to webkit.
+        }
+    }
+#endif
+
     if (root->needsLayout()) {
         //qDebug("needs layout, delaying repaint");
         scheduleRelayout();

diff --git a/WebCore/khtml/rendering/render_object.cpp b/WebCore/khtml/rendering/render_object.cpp
index 0746ebdac09ee17b17d2c8dc90a3d82379d0dc58..7b232a0db826a42ba1a1008586fd8de50d5cb2ec 100644 (file)
--- a/WebCore/khtml/rendering/render_object.cpp
+++ b/WebCore/khtml/rendering/render_object.cpp
@@ -2149,6 +2149,51 @@ void RenderObject::updateWidgetPositions()
     for (RenderObject* curr = firstChild(); curr; curr = curr->nextSibling())
         curr->updateWidgetPositions();
 }
+
+QValueList<DashboardRegionValue> RenderObject::computeDashboardRegions()
+{
+    QValueList<DashboardRegionValue> regions;
+    collectDashboardRegions(regions);
+    return regions;
+}
+
+void RenderObject::addDashboardRegions (QValueList<DashboardRegionValue>& regions)
+{
+    // Convert the style regions to absolute coordinates.
+    QValueList<StyleDashboardRegion> styleRegions = style()->dashboardRegions();
+    if (styleRegions.count() > 0) {
+        uint i, count = styleRegions.count();
+        for (i = 0; i < count; i++){
+            StyleDashboardRegion styleRegion = styleRegions[i];
+
+            int x, y;
+            absolutePosition (x, y);
+            
+            int w = width() + marginLeft() + marginRight();
+            int h = height() + marginTop() + marginBottom();
+            
+            DashboardRegionValue region;
+            region.label = styleRegion.label;
+            region.bounds = QRect (
+                x + styleRegion.offset.left.value,
+                y + styleRegion.offset.top.value,
+                w - styleRegion.offset.left.value - styleRegion.offset.right.value,
+                h - styleRegion.offset.top.value - styleRegion.offset.bottom.value);
+            region.type = styleRegion.type;
+            
+            regions.append (region);
+        }
+    }
+}
+
+void RenderObject::collectDashboardRegions (QValueList<DashboardRegionValue>& regions)
+{
+    addDashboardRegions (regions);
+    for (RenderObject* curr = firstChild(); curr; curr = curr->nextSibling()) {
+        curr->collectDashboardRegions(regions);
+    }
+}
+
 #endif
 
 void RenderObject::collectBorders(QValueList<CollapsedBorderValue>& borderStyles)

diff --git a/WebCore/khtml/rendering/render_object.h b/WebCore/khtml/rendering/render_object.h
index 2f6d5eda19d7431d6072fa6f4b67187e42ead79e..a5549892f9afd719a2e150ed3a5fd75064a8ff3b 100644 (file)
--- a/WebCore/khtml/rendering/render_object.h
+++ b/WebCore/khtml/rendering/render_object.h
@@ -102,6 +102,21 @@ namespace khtml {
     class InlineFlowBox;
     class CollapsedBorderValue;
 
+#if APPLE_CHANGES
+struct DashboardRegionValue
+{
+    QString label;
+    QRect bounds;
+    int type;
+
+    bool operator==(const DashboardRegionValue& o) const
+    {
+        return type == o.type && bounds == o.bounds && label == o.label;
+    }
+};
+#endif
+
+
 /**
  * Base Class for all rendering tree objects.
  */
@@ -432,6 +447,10 @@ public:
 #if APPLE_CHANGES
     // Called recursively to update the absolute positions of all widgets.
     virtual void updateWidgetPositions();
+    
+    QValueList<DashboardRegionValue> RenderObject::computeDashboardRegions();
+    void addDashboardRegions (QValueList<DashboardRegionValue>& regions);
+    void collectDashboardRegions (QValueList<DashboardRegionValue>& regions);
 #endif
 
     // does a query on the rendertree and finds the innernode

diff --git a/WebCore/khtml/rendering/render_style.cpp b/WebCore/khtml/rendering/render_style.cpp
index 888b7b086673c5c3b2cf161a22ff69a439290985..0b18e93091dfc329e0dc1d2be546722f38ae0285 100644 (file)
--- a/WebCore/khtml/rendering/render_style.cpp
+++ b/WebCore/khtml/rendering/render_style.cpp
@@ -82,6 +82,7 @@ bool StyleBoxData::operator==(const StyleBoxData& o) const
         z_auto == o.z_auto;
 }
 
+
 StyleVisualData::StyleVisualData()
       : hasClip(false), 
       textDecoration(RenderStyle::initialTextDecoration()), 

diff --git a/WebCore/khtml/rendering/render_style.h b/WebCore/khtml/rendering/render_style.h
index aac9d932e53f59f3d1c9baef7b410db4183e2dc1..e546611834e32a88bed5c60f0f3c03d7433b8da6 100644 (file)
--- a/WebCore/khtml/rendering/render_style.h
+++ b/WebCore/khtml/rendering/render_style.h
@@ -339,6 +339,24 @@ public:
     bool z_auto : 1;
 };
 
+//------------------------------------------------
+// Dashboard region attributes. Not inherited.
+
+#if APPLE_CHANGES
+struct StyleDashboardRegion
+{
+    QString label;
+    LengthBox offset;
+    int type;
+    
+    enum {
+        None,
+        Circle,
+        Rectangle
+    };
+};
+#endif
+
 //------------------------------------------------
 // Random visual rendering model attributes. Not inherited.
 
@@ -856,7 +874,11 @@ protected:
     DataRef<StyleBackgroundData> background;
     DataRef<StyleSurroundData> surround;
     DataRef<StyleCSS3NonInheritedData> css3NonInheritedData;
-    
+
+#if APPLE_CHANGES
+    QValueList<StyleDashboardRegion> m_dashboardRegions;
+#endif
+
 // inherited attributes
     DataRef<StyleCSS3InheritedData> css3InheritedData;
     DataRef<StyleInheritedData> inherited;
@@ -1142,6 +1164,23 @@ public:
     void setMinHeight(Length v) { SET_VAR(box,min_height,v) }
     void setMaxHeight(Length v) { SET_VAR(box,max_height,v) }
 
+#if APPLE_CHANGES
+    QValueList<StyleDashboardRegion> dashboardRegions() { return m_dashboardRegions; }
+    void setDashboardRegion (int type, QString label, Length t, Length r, Length b, Length l, bool append) {
+        StyleDashboardRegion region;
+        region.label = label;
+        region.offset.top  = t;
+        region.offset.right = r;
+        region.offset.bottom = b;
+        region.offset.left = l;
+        region.type = type;
+        if (!append) {
+            m_dashboardRegions.clear ();
+        }
+        m_dashboardRegions.append (region);
+    }
+#endif
+
     void resetBorderTop() { SET_VAR(surround, border.top, BorderValue()) }
     void resetBorderRight() { SET_VAR(surround, border.right, BorderValue()) }
     void resetBorderBottom() { SET_VAR(surround, border.bottom, BorderValue()) }

diff --git a/WebCore/khtml/xml/dom_docimpl.cpp b/WebCore/khtml/xml/dom_docimpl.cpp
index 3f3b6235ca2546bea431b42140c821826982cfd3..af3d1aeceab017a42ace5b240d6591519a47f864 100644 (file)
--- a/WebCore/khtml/xml/dom_docimpl.cpp
+++ b/WebCore/khtml/xml/dom_docimpl.cpp
@@ -51,6 +51,7 @@
 #include "rendering/render_canvas.h"
 #include "rendering/render_frames.h"
 #include "rendering/render_image.h"
+#include "rendering/render_object.h"
 #include "render_arena.h"
 
 #include "khtmlview.h"
@@ -260,6 +261,7 @@ DocumentImpl::DocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v)
     , m_inPageCache(false), m_savedRenderer(0)
     , m_passwordFields(0), m_secureForms(0)
     , m_decoder(0), m_createRenderers(true)
+    , m_hasDashboardRegions(false)
 #endif
 {
     document->doc = this;
@@ -1159,8 +1161,9 @@ void DocumentImpl::updateLayout()
     updateRendering();
 
     // Only do a layout if changes have occurred that make it necessary.      
-    if (m_view && renderer() && renderer()->needsLayout())
+    if (m_view && renderer() && renderer()->needsLayout()) {
        m_view->layout();
+    }
 
     m_ignorePendingStylesheets = oldIgnore;
 }
@@ -2342,6 +2345,16 @@ bool DocumentImpl::acceptsEditingFocus(NodeImpl *node)
     return part()->shouldBeginEditing(range);
 }
 
+QValueList<DashboardRegionValue> DocumentImpl::dashboardRegions() const
+{
+    return m_dashboardRegions;
+}
+
+void DocumentImpl::setDashboardRegions (QValueList<DashboardRegionValue>& regions)
+{
+    m_dashboardRegions = regions;
+}
+
 #endif
 
 bool DocumentImpl::setFocusNode(NodeImpl *newFocusNode)

diff --git a/WebCore/khtml/xml/dom_docimpl.h b/WebCore/khtml/xml/dom_docimpl.h
index 861c6bf696e015082bcfcf894cc331e09c0b1670..7f0aed99ea70045246664783c9ba67d2230dc870 100644 (file)
--- a/WebCore/khtml/xml/dom_docimpl.h
+++ b/WebCore/khtml/xml/dom_docimpl.h
@@ -70,6 +70,9 @@ namespace khtml {
     class RenderImage;
     class Tokenizer;
     class XMLHandler;
+#if APPLE_CHANGES    
+    struct DashboardRegionValue;
+#endif
 }
 
 #ifndef KHTML_NO_XBL
@@ -708,6 +711,11 @@ public:
     void setDecoder(khtml::Decoder *);
     khtml::Decoder *decoder() const { return m_decoder; }
 
+    bool hasDashboardRegions () const { return m_hasDashboardRegions; }
+    void setHasDashboardRegions (bool f) { m_hasDashboardRegions = f; }
+    QValueList<khtml::DashboardRegionValue> dashboardRegions() const;
+    void setDashboardRegions (QValueList<khtml::DashboardRegionValue>& regions);
+    
 private:
     JSEditor *jsEditor();
 
@@ -729,6 +737,9 @@ private:
     bool m_accessKeyDictValid;
  
     bool m_createRenderers;
+    
+    QValueList<khtml::DashboardRegionValue> m_dashboardRegions;
+    bool m_hasDashboardRegions;
 #endif
 };