Changeset 20538 for S60/trunk/WebCore

Timestamp:

03/27/07 15:13:39 (22 months ago)

Author:

zbujtas

Message:

yadavall, reviewed by <zbujtas@gmail.com>

DESC: Rich File Upload implementation
http://bugs.webkit.org/show_bug.cgi?id=13195

WARNING: NO TEST CASES ADDED OR CHANGED

• bridge/WebCoreFormControls.h:
• khtml/html/html_formimpl.cpp: (DOM::):
• khtml/html/html_formimpl.h:
• khtml/rendering/render_form.cpp: (RenderFileButton::updateFromElement):
• kwq/KWQFileButton.cpp: (KWQFileButton::setAccept):
• kwq/KWQFileButton.h:

Location:

S60/trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bridge/WebCoreFormControls.h (modified) (1 diff)
• khtml/html/html_formimpl.cpp (modified) (3 diffs)
• khtml/html/html_formimpl.h (modified) (2 diffs)
• khtml/rendering/render_form.cpp (modified) (1 diff)
• kwq/KWQFileButton.cpp (modified) (3 diffs)
• kwq/KWQFileButton.h (modified) (2 diffs)

S60/trunk/WebCore/ChangeLog

@@ +1 @@
+yadavall, reviewed by <zbujtas@gmail.com>
+ DESC: Rich File Upload implementation
+ http://bugs.webkit.org/show_bug.cgi?id=13195
+
+        WARNING: NO TEST CASES ADDED OR CHANGED
+
+        * bridge/WebCoreFormControls.h:
+        * khtml/html/html_formimpl.cpp:
+        (DOM::):
+        * khtml/html/html_formimpl.h:
+        * khtml/rendering/render_form.cpp:
+        (RenderFileButton::updateFromElement):
+        * kwq/KWQFileButton.cpp:
+        (KWQFileButton::setAccept):
+        * kwq/KWQFileButton.h:
+
 rathnasa, reviewed by zalan
  DESC: [S60] ESMS-6YDMWP: TRUE - GSM - broswer crashes on certain web pages

S60/trunk/WebCore/bridge/WebCoreFormControls.h

@@ -132 +132 @@
         virtual void SetEventHandler(MWebCoreFormEventHandler* aInputEventHandler) = 0;
 
-                virtual TSize SizeForCharacterWidth(TInt aNumCharacters) const= 0;
-
-                virtual void SetFont (CFont* aFont) = 0;
-        };
+        virtual TSize SizeForCharacterWidth(TInt aNumCharacters) const= 0;
+
+        virtual void SetFont (CFont* aFont) = 0;
+        
+        virtual void SetAcceptedMimeType( const TDesC& aMimeType ) =0;
+    };
 
 /**

S60/trunk/WebCore/khtml/html/html_formimpl.cpp

@@ -1273 +1273 @@
 #if APPLE_CHANGES
     m_maxResults = -1;
+#endif
+#ifdef NOKIA_CHANGES
+    m_accept = "";
 #endif
 
@@ -1682 +1685 @@
 #endif            
         break;
+#if NOKIA_CHANGES
+    case ATTR_ACCEPT:
+        m_accept = !attr->isNull() ? attr->value() : "";
+        break;
+#endif
     case ATTR_ALT:
         if (m_render && m_type == IMAGE)
@@ -2173 +2181 @@
     return false;
 }
+
+#ifdef NOKIA_CHANGES
+DOMString HTMLInputElementImpl::accept() const
+{
+    return m_accept;
+}
+#endif
 
 void HTMLInputElementImpl::blur()

S60/trunk/WebCore/khtml/html/html_formimpl.h

@@ -380 +380 @@
 #endif
     
+#ifdef NOKIA_CHANGES
+    DOMString accept() const;
+#endif
+
 protected:
     bool storesValueSeparateFromAttribute() const;
@@ -403 +407 @@
     bool m_autocomplete : 1;
     bool m_valueMatchesRenderer : 1;
+    
+#ifdef NOKIA_CHANGES
+    DOMString m_accept;
+#endif
+
 };
 

S60/trunk/WebCore/khtml/rendering/render_form.cpp

@@ -1077 +1077 @@
     m_edit->setEdited( false );
 #endif
+#if NOKIA_CHANGES
+    static_cast<KWQFileButton *>(widget())->setAccept(element()->accept().string());
+#endif
 
     RenderFormElement::updateFromElement();

S60/trunk/WebCore/kwq/KWQFileButton.cpp

@@ -34 +34 @@
     , _textChanged(this, SIGNAL(textChanged(const QString &)))
 {
-        _fileInputWidget = TWebCoreFormControlFactory::Factory()->ConstructFile();
-        if (_fileInputWidget)
-        {
-                _fileInputWidget->SetEventHandler(this);
-                setView(_fileInputWidget);
-        }
+    _fileInputWidget = TWebCoreFormControlFactory::Factory()->ConstructFile();
+    if (_fileInputWidget)
+    {
+        _fileInputWidget->SetEventHandler(this);
+        setView(_fileInputWidget);
+    }
 }
 
 void KWQFileButton::setFont(const QFont &font)
 {
-        QWidget::setFont(font);
-        if (_fileInputWidget)
-        {
-                QFont fontCpy = font;
-                CFont* symFont = const_cast<CFont*>(fontCpy.Font());
-                _fileInputWidget->SetFont(symFont );
-        }
+    QWidget::setFont(font);
+    if (_fileInputWidget)
+    {
+        QFont fontCpy = font;
+        CFont* symFont = const_cast<CFont*>(fontCpy.Font());
+        _fileInputWidget->SetFont(symFont );
+    }
 }
 
@@ -56 +56 @@
 KWQFileButton::~KWQFileButton()
 {
-        if (_fileInputWidget)
-        {
-                _fileInputWidget->Close();
-        }
+    if (_fileInputWidget)
+    {
+        _fileInputWidget->Close();
+    }
 }
 
 void KWQFileButton::setFilename(const QString &f)
 {
-        if (_fileInputWidget)
-        {
-                _fileInputWidget->SetFileName(f.Des());
-        }
+    if (_fileInputWidget)
+    {
+        _fileInputWidget->SetFileName(f.Des());
+    }
 }
 
 void KWQFileButton::click(bool sendMouseEvents)
 {
-        if (_fileInputWidget)
-        {
-                _fileInputWidget->Activate();
-        }
+    if (_fileInputWidget)
+    {
+        _fileInputWidget->Activate();
+    }
 }
 
 QSize KWQFileButton::sizeForCharacterWidth(int characters) const
 {
-        if (_fileInputWidget)
-        {
-                return QSize(_fileInputWidget->SizeForCharacterWidth(characters));
-        }
-        return QSize(0,0);
+    if (_fileInputWidget)
+    {
+        return QSize(_fileInputWidget->SizeForCharacterWidth(characters));
+    }
+    return QSize(0,0);
 }
 
 QRect KWQFileButton::frameGeometry() const
 {
-        return QWidget::frameGeometry();
+    return QWidget::frameGeometry();
 }
 
 void KWQFileButton::setFrameGeometry(const QRect &rect)
 {
-        return QWidget::setFrameGeometry(rect);
+    return QWidget::setFrameGeometry(rect);
 }
 
@@ -123 +123 @@
 void KWQFileButton::HandleEvent(TEvent aEvent)
 {
-        if(aEvent == EValueChanged && _fileInputWidget)
-                filenameChanged(QString::FromDes(_fileInputWidget->FileName()));
+    if(aEvent == EValueChanged && _fileInputWidget)
+        filenameChanged(QString::FromDes(_fileInputWidget->FileName()));
 }
 
+void KWQFileButton::setAccept(const QString &a)
+{
+    if (_fileInputWidget)
+    {
+        _fileInputWidget->SetAcceptedMimeType(a.Des());
+    }
+}

S60/trunk/WebCore/kwq/KWQFileButton.h

@@ -50 +50 @@
     int baselinePosition(int height) const;
 
-        void setFont(const QFont &font);
+    void setFont(const QFont &font);
 
 
@@ -59 +59 @@
     void clicked();
 
-        void HandleEvent(TEvent aEvent);
+    void HandleEvent(TEvent aEvent);
 
+    void setAccept(const QString &);
 
 private:
     KWQSignal _clicked;
     KWQSignal _textChanged;
-        MWebCoreFileInputWidget* _fileInputWidget;
+    MWebCoreFileInputWidget* _fileInputWidget;
 };