[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 382a4ea1d3996d6bc45448535e746caa5e51020e
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 21 19:18:10 2003 +0000

            Reviewed by Trey.
    
     	- fixed 3145317 - Unable to add or remove menu items on Site Menu page using Safari Beta
    
    	This turned out to be a problem with event.layerX / event.layerY.
    
            * khtml/xml/dom2_eventsimpl.cpp:
            (MouseEventImpl::computeLayerPos): Since layer position is
    	relative to parent layer, go up the layer tree adjusting for layer
    	offset to compute true layer position.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3364 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 4d38a19..ead64f3 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,18 @@
 2003-01-21  Maciej Stachowiak  <mjs at apple.com>
 
+        Reviewed by Trey.
+
+ 	- fixed 3145317 - Unable to add or remove menu items on Site Menu page using Safari Beta
+
+	This turned out to be a problem with event.layerX / event.layerY.
+	
+        * khtml/xml/dom2_eventsimpl.cpp:
+        (MouseEventImpl::computeLayerPos): Since layer position is
+	relative to parent layer, go up the layer tree adjusting for layer
+	offset to compute true layer position.
+ 
+2003-01-21  Maciej Stachowiak  <mjs at apple.com>
+
         Reviewed by Ken.
 
 	- fixed 3151982 - missing content at debka.com after iframe is written using document.write
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 4d38a19..ead64f3 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,18 @@
 2003-01-21  Maciej Stachowiak  <mjs at apple.com>
 
+        Reviewed by Trey.
+
+ 	- fixed 3145317 - Unable to add or remove menu items on Site Menu page using Safari Beta
+
+	This turned out to be a problem with event.layerX / event.layerY.
+	
+        * khtml/xml/dom2_eventsimpl.cpp:
+        (MouseEventImpl::computeLayerPos): Since layer position is
+	relative to parent layer, go up the layer tree adjusting for layer
+	offset to compute true layer position.
+ 
+2003-01-21  Maciej Stachowiak  <mjs at apple.com>
+
         Reviewed by Ken.
 
 	- fixed 3151982 - missing content at debka.com after iframe is written using document.write
diff --git a/WebCore/khtml/xml/dom2_eventsimpl.cpp b/WebCore/khtml/xml/dom2_eventsimpl.cpp
index feab215..b426b49 100644
--- a/WebCore/khtml/xml/dom2_eventsimpl.cpp
+++ b/WebCore/khtml/xml/dom2_eventsimpl.cpp
@@ -436,8 +436,11 @@ void MouseEventImpl::computeLayerPos()
     }
 
     node->renderer()->enclosingLayer()->updateLayerPosition();
-    m_layerX -= node->renderer()->enclosingLayer()->xPos();
-    m_layerY -= node->renderer()->enclosingLayer()->yPos();
+    
+    for (khtml::RenderLayer *layer = node->renderer()->enclosingLayer(); layer != NULL; layer = layer->parent()) {
+	m_layerX -= layer->xPos();
+	m_layerY -= layer->yPos();
+    }
 }
 
 MouseEventImpl::~MouseEventImpl()

-- 
WebKit Debian packaging