[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/khtml
From:       Germain Garand <germain () ebooksfrance ! com>
Date:       2007-10-22 16:34:55
Message-ID: 1193070895.444716.26257.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 728183 by ggarand:

Support msie extension offsetLeft/offsetTop.
Hard to avoid now that Gecko 1.9 adopted them..
Make that ecma only though.


 M  +8 -0      ecma/kjs_dom.cpp  
 M  +1 -1      ecma/kjs_dom.h  
 M  +10 -0     rendering/render_object.cpp  
 M  +2 -0      rendering/render_object.h  


--- trunk/KDE/kdelibs/khtml/ecma/kjs_dom.cpp #728182:728183
@@ -174,6 +174,8 @@
   offsetParent	DOMNode::OffsetParent		DontDelete|ReadOnly
   clientWidth	DOMNode::ClientWidth		DontDelete|ReadOnly
   clientHeight	DOMNode::ClientHeight		DontDelete|ReadOnly
+  clientLeft    DOMNode::ClientLeft		DontDelete|ReadOnly
+  clientTop	DOMNode::ClientTop		DontDelete|ReadOnly
   scrollLeft	DOMNode::ScrollLeft		DontDelete
   scrollTop	DOMNode::ScrollTop		DontDelete
   scrollWidth   DOMNode::ScrollWidth            DontDelete|ReadOnly
@@ -218,6 +220,8 @@
       break;
     case DOMNode::ClientHeight:
     case DOMNode::ClientWidth:
+    case DOMNode::ClientLeft:
+    case DOMNode::ClientTop:
       needViewport = true;
       break;
   }
@@ -366,6 +370,10 @@
       return rend ? Number( rend->clientWidth() ) : Undefined();
     case ClientHeight:
       return rend ? Number( rend->clientHeight() ) : Undefined();
+    case ClientLeft:
+      return rend ? Number( rend->clientLeft() ) : Undefined();
+    case ClientTop:
+      return rend ? Number( rend->clientTop() ) : Undefined();
     case ScrollWidth:
       return rend ? Number(rend->scrollWidth()) : Undefined();
     case ScrollHeight:
--- trunk/KDE/kdelibs/khtml/ecma/kjs_dom.h #728182:728183
@@ -64,7 +64,7 @@
            OnMouseMove, OnMouseOut, OnMouseOver, OnMouseUp, OnMove, OnReset,
            OnResize, OnSelect, OnSubmit, OnUnload,
            OffsetLeft, OffsetTop, OffsetWidth, OffsetHeight, OffsetParent,
-           ClientWidth, ClientHeight, ScrollLeft, ScrollTop,
+           ClientLeft, ClientTop, ClientWidth, ClientHeight, ScrollLeft, ScrollTop,
 	   ScrollWidth, ScrollHeight, SourceIndex, TextContent };
 
     //### toNode? virtual
--- trunk/KDE/kdelibs/khtml/rendering/render_object.cpp #728182:728183
@@ -503,6 +503,16 @@
         (layer() ? layer()->verticalScrollbarWidth() : 0);
 }
 
+int RenderObject::clientLeft() const
+{
+    return borderLeft();
+}
+
+int RenderObject::clientTop() const
+{
+    return borderTop();
+}
+
 int RenderObject::clientHeight() const
 {
     return height() - borderTop() - borderBottom() -
--- trunk/KDE/kdelibs/khtml/rendering/render_object.h #728182:728183
@@ -622,6 +622,8 @@
     virtual int offsetLeft() const;
     virtual int offsetTop() const;
     virtual RenderObject* offsetParent() const;
+    int clientLeft() const;
+    int clientTop() const;
     short clientWidth() const;
     int clientHeight() const;
     short scrollWidth() const;
[prev in list] [next in list] [prev in thread] [next in thread]