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

commit-queue at webkit.org commit-queue at webkit.org
Wed Dec 22 13:11:08 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit d989873eca497a4ed2305eed0c488c31dbe878f5
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 8 13:27:44 2010 +0000

    2010-09-08  Gyuyoung Kim  <gyuyoung.kim at samsung.com>
    
            Reviewed by Dirk Schulze.
    
            [WML] Add create functions to WML.
            https://bugs.webkit.org/show_bug.cgi?id=44950
    
            There are missing definitions of create function in WML area.
            So, there are build breaks when enabling WML. The create functions and the construction
            are added. In addition, a style error and duplicated adoptRef usage are fixed.
    
            * wml/WMLDocument.h:
            (WebCore::WMLDocument::create):
            * wml/WMLFormControlElement.h:
            * wml/WMLIntrinsicEvent.cpp:
            (WebCore::WMLIntrinsicEvent::WMLIntrinsicEvent):
            * wml/WMLIntrinsicEvent.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66977 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 90bfb3a..883d8e8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2010-09-08  Gyuyoung Kim  <gyuyoung.kim at samsung.com>
+
+        Reviewed by Dirk Schulze.
+
+        [WML] Add create functions to WML.
+        https://bugs.webkit.org/show_bug.cgi?id=44950
+
+        There are missing definitions of create function in WML area. 
+        So, there are build breaks when enabling WML. The create functions and the construction 
+        are added. In addition, a style error and duplicated adoptRef usage are fixed.
+
+        * wml/WMLDocument.h:
+        (WebCore::WMLDocument::create):
+        * wml/WMLFormControlElement.h:
+        * wml/WMLIntrinsicEvent.cpp:
+        (WebCore::WMLIntrinsicEvent::WMLIntrinsicEvent):
+        * wml/WMLIntrinsicEvent.h:
+
 2010-09-08  Nico Weber  <thakis at chromium.org>
 
         Reviewed by Kenneth Russell.
diff --git a/WebCore/wml/WMLDocument.h b/WebCore/wml/WMLDocument.h
index f2be938..3057d9b 100644
--- a/WebCore/wml/WMLDocument.h
+++ b/WebCore/wml/WMLDocument.h
@@ -34,7 +34,7 @@ class WMLDocument : public Document {
 public:
     static PassRefPtr<WMLDocument> create(Frame* frame, const KURL& url)
     {
-        return adoptRef(adoptRef(new WMLDocument(frame, url))));
+        return adoptRef(new WMLDocument(frame, url));
     }
 
     virtual ~WMLDocument();
diff --git a/WebCore/wml/WMLFormControlElement.h b/WebCore/wml/WMLFormControlElement.h
index 43f8dee..674303b 100644
--- a/WebCore/wml/WMLFormControlElement.h
+++ b/WebCore/wml/WMLFormControlElement.h
@@ -28,7 +28,9 @@ namespace WebCore {
 
 class WMLFormControlElement : public WMLElement {
 public:
-    WMLFormControlElement(const QualifiedName&, Document*);
+    static PassRefPtr<WMLFormControlElement> create(const QualifiedName&, Document*);
+
+
     virtual ~WMLFormControlElement();
 
     virtual bool isFormControlElement() const { return true; }
@@ -44,6 +46,9 @@ public:
     virtual void attach();
     virtual void recalcStyle(StyleChange);
 
+protected:
+    WMLFormControlElement(const QualifiedName&, Document*);
+
 private:
     bool m_valueMatchesRenderer;
 };
diff --git a/WebCore/wml/WMLIntrinsicEvent.cpp b/WebCore/wml/WMLIntrinsicEvent.cpp
index ec5e987..bb631b9 100644
--- a/WebCore/wml/WMLIntrinsicEvent.cpp
+++ b/WebCore/wml/WMLIntrinsicEvent.cpp
@@ -43,11 +43,6 @@ WMLIntrinsicEvent::WMLIntrinsicEvent(Document* document, const String& targetURL
     m_taskElement->setAttribute(HTMLNames::hrefAttr, targetURL);
 }
 
-PassRefPtr<WMLIntrinsicEvent> WMLIntrinsicEvent::create(const QualifiedName& tagName, Document* document)
-{
-    return adoptRef(new WMLIntrinsicEvent(tagName, document));
-}
-
 WMLIntrinsicEvent::WMLIntrinsicEvent(WMLTaskElement* taskElement)
     : m_taskElement(taskElement)
 {
diff --git a/WebCore/wml/WMLIntrinsicEvent.h b/WebCore/wml/WMLIntrinsicEvent.h
index 2a98bee..9a974fb 100644
--- a/WebCore/wml/WMLIntrinsicEvent.h
+++ b/WebCore/wml/WMLIntrinsicEvent.h
@@ -22,12 +22,12 @@
 #define WMLIntrinsicEvent_h
 
 #if ENABLE(WML)
+#include "WMLTaskElement.h"
+
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>
 
-#include "WMLTaskElement.h"
-
 namespace WebCore {
 
 class Document;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list