[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
cblu
cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:52:49 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 68c92173e9171a485a227b7aba5da1c595a1ba8b
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Oct 23 00:24:49 2002 +0000
WebCore:
Fixed: 3023814 - contexual menus and dragging doesn't work for some images
Added a innerNonSharedNode to NodeInfo that points to the node which is not shared by another node. In this case, the innerNonSharedNode is the image node not the area node.
* khtml/rendering/render_frames.cpp:
(RenderFrameSet::nodeAtPoint): call setInnerNonSharedNode
* khtml/rendering/render_image.cpp:
(RenderImage::nodeAtPoint): call setInnerNonSharedNode
* khtml/rendering/render_object.cpp:
(RenderObject::nodeAtPoint): call setInnerNonSharedNode
* khtml/rendering/render_object.h:
* kwq/WebCoreBridge.mm:
(-[WebCoreBridge elementAtPoint:]): use the innerNonSharedNode
WebKit:
Made new plug-in API headers private.
* WebKit.pbproj/project.pbxproj:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2425 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index f500747..90ce5dd 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,19 @@
+2002-10-22 Chris Blumenberg <cblu at apple.com>
+
+ Fixed: 3023814 - contexual menus and dragging doesn't work for some images
+
+ Added a innerNonSharedNode to NodeInfo that points to the node which is not shared by another node. In this case, the innerNonSharedNode is the image node not the area node.
+
+ * khtml/rendering/render_frames.cpp:
+ (RenderFrameSet::nodeAtPoint): call setInnerNonSharedNode
+ * khtml/rendering/render_image.cpp:
+ (RenderImage::nodeAtPoint): call setInnerNonSharedNode
+ * khtml/rendering/render_object.cpp:
+ (RenderObject::nodeAtPoint): call setInnerNonSharedNode
+ * khtml/rendering/render_object.h:
+ * kwq/WebCoreBridge.mm:
+ (-[WebCoreBridge elementAtPoint:]): use the innerNonSharedNode
+
2002-10-22 David Hyatt <hyatt at apple.com>
Fix slashdot. Make sure the KONQBLOCK hack just throws away
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index f500747..90ce5dd 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,19 @@
+2002-10-22 Chris Blumenberg <cblu at apple.com>
+
+ Fixed: 3023814 - contexual menus and dragging doesn't work for some images
+
+ Added a innerNonSharedNode to NodeInfo that points to the node which is not shared by another node. In this case, the innerNonSharedNode is the image node not the area node.
+
+ * khtml/rendering/render_frames.cpp:
+ (RenderFrameSet::nodeAtPoint): call setInnerNonSharedNode
+ * khtml/rendering/render_image.cpp:
+ (RenderImage::nodeAtPoint): call setInnerNonSharedNode
+ * khtml/rendering/render_object.cpp:
+ (RenderObject::nodeAtPoint): call setInnerNonSharedNode
+ * khtml/rendering/render_object.h:
+ * kwq/WebCoreBridge.mm:
+ (-[WebCoreBridge elementAtPoint:]): use the innerNonSharedNode
+
2002-10-22 David Hyatt <hyatt at apple.com>
Fix slashdot. Make sure the KONQBLOCK hack just throws away
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index f500747..90ce5dd 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,19 @@
+2002-10-22 Chris Blumenberg <cblu at apple.com>
+
+ Fixed: 3023814 - contexual menus and dragging doesn't work for some images
+
+ Added a innerNonSharedNode to NodeInfo that points to the node which is not shared by another node. In this case, the innerNonSharedNode is the image node not the area node.
+
+ * khtml/rendering/render_frames.cpp:
+ (RenderFrameSet::nodeAtPoint): call setInnerNonSharedNode
+ * khtml/rendering/render_image.cpp:
+ (RenderImage::nodeAtPoint): call setInnerNonSharedNode
+ * khtml/rendering/render_object.cpp:
+ (RenderObject::nodeAtPoint): call setInnerNonSharedNode
+ * khtml/rendering/render_object.h:
+ * kwq/WebCoreBridge.mm:
+ (-[WebCoreBridge elementAtPoint:]): use the innerNonSharedNode
+
2002-10-22 David Hyatt <hyatt at apple.com>
Fix slashdot. Make sure the KONQBLOCK hack just throws away
diff --git a/WebCore/khtml/rendering/render_frames.cpp b/WebCore/khtml/rendering/render_frames.cpp
index 1409404..19f0db4 100644
--- a/WebCore/khtml/rendering/render_frames.cpp
+++ b/WebCore/khtml/rendering/render_frames.cpp
@@ -89,8 +89,10 @@ bool RenderFrameSet::nodeAtPoint(NodeInfo& info, int _x, int _y, int _tx, int _t
bool inside = m_resizing || canResize(_x, _y);
- if ( inside && element() && !element()->noResize() && !info.readonly())
+ if ( inside && element() && !element()->noResize() && !info.readonly()){
info.setInnerNode(element());
+ info.setInnerNonSharedNode(element());
+ }
return inside || m_clientresizing;
}
diff --git a/WebCore/khtml/rendering/render_image.cpp b/WebCore/khtml/rendering/render_image.cpp
index 0af1fc4..007ff91 100644
--- a/WebCore/khtml/rendering/render_image.cpp
+++ b/WebCore/khtml/rendering/render_image.cpp
@@ -352,6 +352,7 @@ bool RenderImage::nodeAtPoint(NodeInfo& info, int _x, int _y, int _tx, int _ty)
(map = static_cast<HTMLDocumentImpl*>(i->getDocument())->getMap(i->imageMap()))) {
// we're a client side image map
inside = map->mapMouseEvent(_x - tx, _y - ty, contentWidth(), contentHeight(), info);
+ info.setInnerNonSharedNode(element());
}
}
diff --git a/WebCore/khtml/rendering/render_object.cpp b/WebCore/khtml/rendering/render_object.cpp
index 65c40b5..f5f8997 100644
--- a/WebCore/khtml/rendering/render_object.cpp
+++ b/WebCore/khtml/rendering/render_object.cpp
@@ -931,6 +931,9 @@ bool RenderObject::nodeAtPoint(NodeInfo& info, int _x, int _y, int _tx, int _ty)
if (!info.innerNode())
info.setInnerNode(element());
+ if(!info.innerNonSharedNode())
+ info.setInnerNonSharedNode(element());
+
if (!info.URLElement()) {
RenderObject* p = this;
while (p) {
diff --git a/WebCore/khtml/rendering/render_object.h b/WebCore/khtml/rendering/render_object.h
index 55c6169..39b722a 100644
--- a/WebCore/khtml/rendering/render_object.h
+++ b/WebCore/khtml/rendering/render_object.h
@@ -279,19 +279,22 @@ public:
friend class DOM::HTMLAreaElementImpl;
public:
NodeInfo(bool readonly, bool active)
- : m_innerNode(0), m_innerURLElement(0), m_readonly(readonly), m_active(active)
+ : m_innerNode(0), m_innerNonSharedNode(0), m_innerURLElement(0), m_readonly(readonly), m_active(active)
{ }
DOM::NodeImpl* innerNode() const { return m_innerNode; }
+ DOM::NodeImpl* innerNonSharedNode() const { return m_innerNonSharedNode; }
DOM::NodeImpl* URLElement() const { return m_innerURLElement; }
bool readonly() const { return m_readonly; }
bool active() const { return m_active; }
private:
void setInnerNode(DOM::NodeImpl* n) { m_innerNode = n; }
+ void setInnerNonSharedNode(DOM::NodeImpl* n) { m_innerNonSharedNode = n; }
void setURLElement(DOM::NodeImpl* n) { m_innerURLElement = n; }
DOM::NodeImpl* m_innerNode;
+ DOM::NodeImpl* m_innerNonSharedNode;
DOM::NodeImpl* m_innerURLElement;
bool m_readonly;
bool m_active;
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index 6ed71fe..a7c913f 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -472,8 +472,8 @@ using khtml::RenderPart;
}
}
- NodeImpl *node = nodeInfo.innerNode();
- if (isImage(node)) {
+ NodeImpl *node = nodeInfo.innerNonSharedNode();
+ if (node && isImage(node)) {
ElementImpl* i = static_cast<ElementImpl*>(node);
NSURL *URL = [self completeURLForDOMString:parseURL(i->getAttribute(ATTR_SRC))];
if (URL) {
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 8d83b35..39b7699 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,9 @@
+2002-10-22 Chris Blumenberg <cblu at apple.com>
+
+ Made new plug-in API headers private.
+
+ * WebKit.pbproj/project.pbxproj:
+
2002-10-22 Darin Adler <darin at apple.com>
* Misc.subproj/WebKitErrors.h:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 8d83b35..39b7699 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-10-22 Chris Blumenberg <cblu at apple.com>
+
+ Made new plug-in API headers private.
+
+ * WebKit.pbproj/project.pbxproj:
+
2002-10-22 Darin Adler <darin at apple.com>
* Misc.subproj/WebKitErrors.h:
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index e2cde5e..8ed4874 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -1490,18 +1490,27 @@
fileRef = 848DFF840365FE6A00CA2ACA;
isa = PBXBuildFile;
settings = {
+ ATTRIBUTES = (
+ Private,
+ );
};
};
848DFF880365FE6A00CA2ACA = {
fileRef = 848DFF850365FE6A00CA2ACA;
isa = PBXBuildFile;
settings = {
+ ATTRIBUTES = (
+ Private,
+ );
};
};
848DFF890365FE6A00CA2ACA = {
fileRef = 848DFF860365FE6A00CA2ACA;
isa = PBXBuildFile;
settings = {
+ ATTRIBUTES = (
+ Private,
+ );
};
};
84D4BFF70348EF7600CA2ACA = {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list