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

trey trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:45:36 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit e06ac6ab5929d3f05360f51432aab8d46086d5c9
Author: trey <trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jun 14 21:43:32 2004 +0000

    	Two tweaks to recently added "drag" pseudo-class, as suggested by
    	Dave.  The class is renamed to "-khtml-drag", and we update layout
    	when using it, instead of only updating styles.
    
            Reviewed by hyatt.
    
            * khtml/css/css_base.cpp:
            (CSSSelector::extractPseudoType):
            * kwq/KWQKHTMLPart.mm:
            (KWQKHTMLPart::snapshotDragImage):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6832 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a1ee56f..b0cd35a 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2004-06-14  Trey Matteson  <trey at apple.com>
+
+	Two tweaks to recently added "drag" pseudo-class, as suggested by
+	Dave.  The class is renamed to "-khtml-drag", and we update layout
+	when using it, instead of only updating styles.
+
+        Reviewed by hyatt.
+
+        * khtml/css/css_base.cpp:
+        (CSSSelector::extractPseudoType):
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::snapshotDragImage):
+
 2004-06-13  Trey Matteson  <trey at apple.com>
 
 	Support for DHTML cut/copy/paste.  We now support oncut, oncopy, onpaste.  The events
diff --git a/WebCore/khtml/css/css_base.cpp b/WebCore/khtml/css/css_base.cpp
index 5e8d86c..fd6e103 100644
--- a/WebCore/khtml/css/css_base.cpp
+++ b/WebCore/khtml/css/css_base.cpp
@@ -167,7 +167,7 @@ void CSSSelector::extractPseudoType() const
     static AtomicString after("after");
     static AtomicString anyLink("-khtml-any-link");
     static AtomicString before("before");
-    static AtomicString drag("drag");
+    static AtomicString drag("-khtml-drag");
     static AtomicString empty("empty");
     static AtomicString firstChild("first-child");
     static AtomicString firstLetter("first-letter");
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 32892d2..93a23f1 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -3055,7 +3055,7 @@ NSImage *KWQKHTMLPart::snapshotDragImage(DOM::Node node, NSRect *imageRect, NSRe
     }
     
     renderer->updateDragState(true);    // mark dragged nodes (so they pick up the right CSS)
-    d->m_doc->updateRendering();        // forces style recalc - needed since changing the drag state might
+    d->m_doc->updateLayout();        // forces style recalc - needed since changing the drag state might
                                         // imply new styles, plus JS could have changed other things
     QRect topLevelRect;
     NSRect paintingRect = renderer->paintingRootRect(topLevelRect);

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list