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

[tkent at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 6c1100ba5f153dfd997df23a9baa402c77e02aa7
Author: tkent at chromium.org <tkent at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 24 02:30:50 2010 +0000

    2010-08-23  Kent Tamura  <tkent at chromium.org>
    
            Unreviewed, build fix for r65852.
    
            * rendering/RenderTextControlSingleLine.cpp:
            (WebCore::RenderTextControlSingleLine::createSubtreeIfNeeded):
            * rendering/TextControlInnerElements.cpp:
            (WebCore::InputFieldSpeechButtonElement::InputFieldSpeechButtonElement):
            (WebCore::InputFieldSpeechButtonElement::create):
            * rendering/TextControlInnerElements.h:
    2010-08-23  Kent Tamura  <tkent at chromium.org>
    
            Unreviewed, build fix for r65852.
    
            * src/WebNode.cpp:
            (WebKit::WebNode::parentNode):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65856 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 201e957..a17ce52 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-23  Kent Tamura  <tkent at chromium.org>
+
+        Unreviewed, build fix for r65852.
+
+        * rendering/RenderTextControlSingleLine.cpp:
+        (WebCore::RenderTextControlSingleLine::createSubtreeIfNeeded):
+        * rendering/TextControlInnerElements.cpp:
+        (WebCore::InputFieldSpeechButtonElement::InputFieldSpeechButtonElement):
+        (WebCore::InputFieldSpeechButtonElement::create):
+        * rendering/TextControlInnerElements.h:
+
 2010-08-23  Ryosuke Niwa  <rniwa at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/rendering/RenderTextControlSingleLine.cpp b/WebCore/rendering/RenderTextControlSingleLine.cpp
index afecccb..b553c56 100644
--- a/WebCore/rendering/RenderTextControlSingleLine.cpp
+++ b/WebCore/rendering/RenderTextControlSingleLine.cpp
@@ -606,7 +606,7 @@ void RenderTextControlSingleLine::createSubtreeIfNeeded()
 #if ENABLE(INPUT_SPEECH)
         if (inputElement()->isSpeechEnabled() && !m_speechButton) {
             // Create the speech button element.
-            m_speechButton = InputFieldSpeechButtonElement::create(node());
+            m_speechButton = InputFieldSpeechButtonElement::create(static_cast<HTMLElement*>(node()));
             m_speechButton->attachInnerElement(node(), createSpeechButtonStyle(), renderArena());
         }
 #endif
@@ -630,7 +630,7 @@ void RenderTextControlSingleLine::createSubtreeIfNeeded()
 #if ENABLE(INPUT_SPEECH)
     if (inputElement()->isSpeechEnabled() && !m_speechButton) {
         // Create the speech button element.
-        m_speechButton = InputFieldSpeechButtonElement::create(node());
+        m_speechButton = InputFieldSpeechButtonElement::create(static_cast<HTMLElement*>(node()));
         m_speechButton->attachInnerElement(node(), createSpeechButtonStyle(), renderArena());
     }
 #endif
diff --git a/WebCore/rendering/TextControlInnerElements.cpp b/WebCore/rendering/TextControlInnerElements.cpp
index 5ce353b..8091bb6 100644
--- a/WebCore/rendering/TextControlInnerElements.cpp
+++ b/WebCore/rendering/TextControlInnerElements.cpp
@@ -342,7 +342,7 @@ void SpinButtonElement::setHovered(bool flag)
 
 #if ENABLE(INPUT_SPEECH)
 
-inline InputFieldSpeechButtonElement::InputFieldSpeechButtonElement(Node* shadowParent)
+inline InputFieldSpeechButtonElement::InputFieldSpeechButtonElement(HTMLElement* shadowParent)
     : TextControlInnerElement(shadowParent->document(), shadowParent)
     , m_capturing(false)
     , m_state(Idle)
@@ -360,7 +360,7 @@ InputFieldSpeechButtonElement::~InputFieldSpeechButtonElement()
     }
 }
 
-PassRefPtr<InputFieldSpeechButtonElement> InputFieldSpeechButtonElement::create(Node* shadowParent)
+PassRefPtr<InputFieldSpeechButtonElement> InputFieldSpeechButtonElement::create(HTMLElement* shadowParent)
 {
     return adoptRef(new InputFieldSpeechButtonElement(shadowParent));
 }
diff --git a/WebCore/rendering/TextControlInnerElements.h b/WebCore/rendering/TextControlInnerElements.h
index 72927f2..791d24d 100644
--- a/WebCore/rendering/TextControlInnerElements.h
+++ b/WebCore/rendering/TextControlInnerElements.h
@@ -125,7 +125,7 @@ public:
         Recognizing,
     };
 
-    static PassRefPtr<InputFieldSpeechButtonElement> create(Node*);
+    static PassRefPtr<InputFieldSpeechButtonElement> create(HTMLElement*);
     virtual ~InputFieldSpeechButtonElement();
 
     virtual void detach();
@@ -138,7 +138,7 @@ public:
     void setRecognitionResult(int, const String& result);
 
 private:
-    InputFieldSpeechButtonElement(Node*);
+    InputFieldSpeechButtonElement(HTMLElement*);
     SpeechInput* speechInput();
     void setState(SpeechInputState state);
 
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 0033deb..df00a00 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-23  Kent Tamura  <tkent at chromium.org>
+
+        Unreviewed, build fix for r65852.
+
+        * src/WebNode.cpp:
+        (WebKit::WebNode::parentNode):
+
 2010-08-23  Kenneth Russell  <kbr at google.com>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebKit/chromium/src/WebNode.cpp b/WebKit/chromium/src/WebNode.cpp
index 5cfc495..caea589 100644
--- a/WebKit/chromium/src/WebNode.cpp
+++ b/WebKit/chromium/src/WebNode.cpp
@@ -79,7 +79,7 @@ WebNode::NodeType WebNode::nodeType() const
 
 WebNode WebNode::parentNode() const
 {
-    return WebNode(const_cast<Node*>(m_private->parentNode()));
+    return WebNode(const_cast<ContainerNode*>(m_private->parentNode()));
 }
 
 WebString WebNode::nodeName() const

-- 
WebKit Debian packaging