[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

abarth at webkit.org abarth at webkit.org
Wed Dec 22 12:07:01 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 5d648ab9927b5209745da850beb67de6833b4b0c
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Aug 14 22:00:57 2010 +0000

    2010-08-14  Adam Barth  <abarth at webkit.org>
    
            Propagate name change to Qt.
    
            * Api/qwebelement.cpp:
            (QWebElement::appendInside):
            (QWebElement::prependInside):
            (QWebElement::prependOutside):
            (QWebElement::appendOutside):
            (QWebElement::encloseContentsWith):
            (QWebElement::encloseWith):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65373 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebelement.cpp b/WebKit/qt/Api/qwebelement.cpp
index d2cdf79..ce2f283 100644
--- a/WebKit/qt/Api/qwebelement.cpp
+++ b/WebKit/qt/Api/qwebelement.cpp
@@ -970,7 +970,7 @@ void QWebElement::appendInside(const QString &markup)
         return;
 
     HTMLElement* htmlElement = static_cast<HTMLElement*>(m_element);
-    RefPtr<DocumentFragment> fragment = htmlElement->createContextualFragment(markup);
+    RefPtr<DocumentFragment> fragment = htmlElement->deprecatedCreateContextualFragment(markup);
 
     ExceptionCode exception = 0;
     m_element->appendChild(fragment, exception);
@@ -1016,7 +1016,7 @@ void QWebElement::prependInside(const QString &markup)
         return;
 
     HTMLElement* htmlElement = static_cast<HTMLElement*>(m_element);
-    RefPtr<DocumentFragment> fragment = htmlElement->createContextualFragment(markup);
+    RefPtr<DocumentFragment> fragment = htmlElement->deprecatedCreateContextualFragment(markup);
 
     ExceptionCode exception = 0;
 
@@ -1068,7 +1068,7 @@ void QWebElement::prependOutside(const QString &markup)
         return;
 
     HTMLElement* htmlElement = static_cast<HTMLElement*>(m_element);
-    RefPtr<DocumentFragment> fragment = htmlElement->createContextualFragment(markup);
+    RefPtr<DocumentFragment> fragment = htmlElement->deprecatedCreateContextualFragment(markup);
 
     ExceptionCode exception = 0;
     m_element->parent()->insertBefore(fragment, m_element, exception);
@@ -1118,7 +1118,7 @@ void QWebElement::appendOutside(const QString &markup)
         return;
 
     HTMLElement* htmlElement = static_cast<HTMLElement*>(m_element);
-    RefPtr<DocumentFragment> fragment = htmlElement->createContextualFragment(markup);
+    RefPtr<DocumentFragment> fragment = htmlElement->deprecatedCreateContextualFragment(markup);
 
     ExceptionCode exception = 0;
     if (!m_element->nextSibling())
@@ -1263,7 +1263,7 @@ void QWebElement::encloseContentsWith(const QString &markup)
         return;
 
     HTMLElement* htmlElement = static_cast<HTMLElement*>(m_element);
-    RefPtr<DocumentFragment> fragment = htmlElement->createContextualFragment(markup);
+    RefPtr<DocumentFragment> fragment = htmlElement->deprecatedCreateContextualFragment(markup);
 
     if (!fragment || !fragment->firstChild())
         return;
@@ -1338,7 +1338,7 @@ void QWebElement::encloseWith(const QString &markup)
         return;
 
     HTMLElement* htmlElement = static_cast<HTMLElement*>(m_element);
-    RefPtr<DocumentFragment> fragment = htmlElement->createContextualFragment(markup);
+    RefPtr<DocumentFragment> fragment = htmlElement->deprecatedCreateContextualFragment(markup);
 
     if (!fragment || !fragment->firstChild())
         return;
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 9ba7bf8..2c964d3 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-14  Adam Barth  <abarth at webkit.org>
+
+        Propagate name change to Qt.
+
+        * Api/qwebelement.cpp:
+        (QWebElement::appendInside):
+        (QWebElement::prependInside):
+        (QWebElement::prependOutside):
+        (QWebElement::appendOutside):
+        (QWebElement::encloseContentsWith):
+        (QWebElement::encloseWith):
+
 2010-08-12  Jeremy Orlow  <jorlow at chromium.org>
 
         Revert for now

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list