Changeset 21033 for S60/trunk/WebKit

Timestamp:

04/23/07 06:33:54 (21 months ago)

Author:

yongjzha

Message:

winship, reviewed by Yongjun

DESC: move DialogMimeFileSelectLC from DialogProvider API to MWidgetCallBack
http://bugs.webkit.org/show_bug.cgi?id=13406

• BrowserControl/inc/BrCtl.h:
• BrowserControl/inc/BrCtlDefs.h: (TBrCtlDefs::):
• BrowserControl/inc/BrCtlDialogsProvider.h: (TBrCtlSelectOptionData::TBrCtlSelectOptionData): (TBrCtlImageCarrier::TBrCtlImageCarrier):
• BrowserControl/inc/BrCtlInterface.h:
• BrowserControl/src/BrCtl.cpp: (CBrCtl::~CBrCtl): (CBrCtl::HandleCommandL): (CBrCtl::CreateWidgetExtensionL):
• BrowserCore/Formcontrols/inc/FControlFileInputSkin.h:
• BrowserCore/Formcontrols/src/FControlFileInputSkin.cpp: (TFileDialogWrapper::DialogMimeFileSelectLC): (CFormFileInputSkin::SetAcceptedMimeType): (CFormFileInputSkin::ActivateL):
• BrowserView/inc/WidgetExtension.h:
• group/BWINSCW/WebKit_30U.def:
• group/EABI/browserengineU.def:
• group/formcontrols.mmpi:

Location:

S60/trunk/WebKit

Files:

• BrowserControl/inc/BrCtl.h (modified) (2 diffs)
• BrowserControl/inc/BrCtlDefs.h (modified) (2 diffs)
• BrowserControl/inc/BrCtlDialogsProvider.h (modified) (42 diffs)
• BrowserControl/inc/BrCtlInterface.h (modified) (6 diffs)
• BrowserControl/src/BrCtl.cpp (modified) (3 diffs)
• BrowserCore/Formcontrols/inc/FControlFileInputSkin.h (modified) (5 diffs)
• BrowserCore/Formcontrols/src/FControlFileInputSkin.cpp (modified) (10 diffs)
• BrowserView/inc/WidgetExtension.h (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• group/BWINSCW/WebKit_30U.def (modified) (1 diff)
• group/EABI/browserengineU.def (modified) (1 diff)
• group/formcontrols.mmpi (modified) (1 diff)

S60/trunk/WebKit/BrowserControl/inc/BrCtl.h

@@ -651 +651 @@
         IMPORT_C TBrCtlDefs::TBrCtlFindResponse FindKeywordAgain( TBool aFowardDirection );
 
-#ifdef  RD_BROWSER_WIDGETS
         /**
         * Creates the widget extension object
@@ -658 +657 @@
         */
         IMPORT_C MWidgetExtension* CreateWidgetExtensionL(MWidgetCallback& aWidgetCallback) ;
-#endif //RD_BROWSER_WIDGETS
 
         /**

S60/trunk/WebKit/BrowserControl/inc/BrCtlDefs.h

@@ -723 +723 @@
         EClientCommandShowContextMenu
         };
-#ifdef  RD_BROWSER_WIDGETS
+
     /**
     * The widget params.
@@ -733 +733 @@
         EWidgetBasePath
         };
-#endif //RD_BROWSER_WIDGETS
     };
 

S60/trunk/WebKit/BrowserControl/inc/BrCtlDialogsProvider.h

@@ -9 +9 @@
 *    Copyright (c) 2006, Nokia Corporation
 *    All rights reserved.
-*  
+*
 *   Redistribution and use in source and binary forms, with or without
 *   modification, are permitted provided that the following conditions
 *   are met:
-*  
+*
 *      * Redistributions of source code must retain the above copyright
 *        notice, this list of conditions and the following disclaimer.
@@ -23 +23 @@
 *        contributors may be used to endorse or promote products derived
 *        from this software without specific prior written permission.
-*  
+*
 *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -36 +36 @@
 *   USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 *   DAMAGE.
-*  
+*
 *    Please see file patentlicense.txt for further grants.
 * ==============================================================================
@@ -58 +58 @@
     ESelectTypeNone,      ///< Single select - Do not display any button
     /**
-    * No buttons (single selection only) 
-    * OK softkey is available 
+    * No buttons (single selection only)
+    * OK softkey is available
     * Cancel button is not available
     */
-    ESelectTypeOkOnly     
+    ESelectTypeOkOnly
     };
 
 /**
-* Defines the type of image if it cannot be recognized by the 
+* Defines the type of image if it cannot be recognized by the
 * Symbian image conversion library.
 */
@@ -84 +84 @@
 
 /**
-* The MBrDialogsProvider class provides functions implemented by 
-* the Browser Control to display dialogs, such as error notifications, 
-* authentication requests, and selection lists. 
+* The MBrDialogsProvider class provides functions implemented by
+* the Browser Control to display dialogs, such as error notifications,
+* authentication requests, and selection lists.
 *
 * Usage:
@@ -93 +93 @@
 *  #include <BrCtlDialogsProvider.h>
 *
-*  
+*
 * @see S60 Platform: Browser Control API Developer's Guide Version 2.0
 * @lib BrowserEngine.lib
@@ -102 +102 @@
     {
     public: // New functions
-        
-        /**
-        * Notifies the user of an error encountered during a download. 
+
+        /**
+        * Notifies the user of an error encountered during a download.
         * Some examples are: insufficient memory, unrecognized URL, and DNS not found.
         * @since 2.8
@@ -113 +113 @@
 
         /**
-        * Notifies the user of an error from the HTTP server 
+        * Notifies the user of an error from the HTTP server
         * during a download. Some examples are: file not found, redirect error.
         * @since 2.8
@@ -123 +123 @@
 
         /**
-        * Navigates through your file system and selects a file; 
+        * Navigates through your file system and selects a file;
         * analogous to the Browse command in Windows.
         * @since 2.8
@@ -144 +144 @@
         * Values: One of the following:
         * Check boxes (multiple selections allowed)
-        * Radio buttons (single selection only). For example, highlight a URL listed 
+        * Radio buttons (single selection only). For example, highlight a URL listed
         *   in the session History.
         *   No buttons (single selection only)
         * No buttons (single selection only), OK softkey available
-        * For example, if you are about to download a plug-in, you can choose 
-        * to display the content in the Web page or in a viewer application. 
+        * For example, if you are about to download a plug-in, you can choose
+        * to display the content in the Web page or in a viewer application.
         * @param aOptions A list of options to display
         * @return EFalse if the user canceled the dialog selection
         * ETrue if the user selected an option.
         */
-        virtual TBool DialogSelectOptionL(const TDesC& aTitle, 
-                                          TBrCtlSelectOptionType aBrCtlSelectOptionType, 
+        virtual TBool DialogSelectOptionL(const TDesC& aTitle,
+                                          TBrCtlSelectOptionType aBrCtlSelectOptionType,
                                           CArrayFix<TBrCtlSelectOptionData>& aOptions) = 0;
 
         /**
-        * User Authentication dialog. 
+        * User Authentication dialog.
         * @since 2.8
         * @param aUrl The url requiring authentication
@@ -167 +167 @@
         * @param aReturnedPasswd The password entered by the user
         * @param aBasicAuthentication ETrue if basic authentication is required.
-        * EFalse if another type of authentication is required; for example, Digest. 
+        * EFalse if another type of authentication is required; for example, Digest.
         * Default: EFalse
         * @return EFalse if the user cancelled the selection
@@ -173 +173 @@
         @ attiontion User name and password are returned on cleanup stack.
         */
-        virtual TBool DialogUserAuthenticationLC(const TDesC& aUrl, 
-                                                 const TDesC& aRealm, 
-                                                 const TDesC& aDefaultUserName, 
-                                                 HBufC*& aReturnedUserName, 
+        virtual TBool DialogUserAuthenticationLC(const TDesC& aUrl,
+                                                 const TDesC& aRealm,
+                                                 const TDesC& aDefaultUserName,
+                                                 HBufC*& aReturnedUserName,
                                                  HBufC*& aReturnedPasswd,
                                                  TBool aBasicAuthentication = EFalse) = 0;
 
         /**
-        * Displays a message to the user. 
-        * For example, the message may inform the user 
+        * Displays a message to the user.
+        * For example, the message may inform the user
         * about an error encountered while processing a request.
         * @since 2.8
@@ -190 +190 @@
         * The message disappears after a time out.
         */
-        virtual void DialogNoteL(const TDesC& aMessage) = 0; 
+        virtual void DialogNoteL(const TDesC& aMessage) = 0;
 
         /**
@@ -201 +201 @@
         * The message displays until the user presses OK.
         */
-        virtual void DialogAlertL(const TDesC& aTitle, const TDesC& aMessage) = 0; 
+        virtual void DialogAlertL(const TDesC& aTitle, const TDesC& aMessage) = 0;
 
         /**
@@ -225 +225 @@
         * @param aMessage The message to display
         * @param aDefaultInput The default input if available
-        * @param aReturnedInput The input entered by the user. 
+        * @param aReturnedInput The input entered by the user.
         * @return EFalse if the user cancelled the selection
         * ETrue if the user selected an option.
@@ -236 +236 @@
 
         /**
-        * Displays information about the Netscape plug-in object and 
+        * Displays information about the Netscape plug-in object and
         * requests confirmation before downloading the object.
         * @since 2.8
@@ -244 +244 @@
         * Size
         * Flag to indicate whether a viewer application exists for this content
-        * Flag to indicate whether a Netscape plug-in exists that supports this content 
+        * Flag to indicate whether a Netscape plug-in exists that supports this content
         * Name of the application or Netscape plug-in with which the content can
-        * be viewed on the mobile phone 
+        * be viewed on the mobile phone
         * @return EFalse if the user cancelled the selection
         * ETrue if the user selected an option.
@@ -255 +255 @@
         * Display the images that appear in the current page
         * @since 2.8
-        * @param aPageImages Array describing the images that appear in the current page. 
+        * @param aPageImages Array describing the images that appear in the current page.
         * The array contains the following elements for each image:
         * Image data
@@ -261 +261 @@
         * Title for the image
         * Image type
-        * If the image type is WBMP or OTA, it must be specified. 
-        * Symbian can detect any other image type. 
+        * If the image type is WBMP or OTA, it must be specified.
+        * Symbian can detect any other image type.
         * @return void
         */
@@ -273 +273 @@
         */
         virtual void CancelAll() = 0;
-        
+
         /**
         * Displays a dialog for searching on the page.
@@ -279 +279 @@
         * @return void
         */
-       virtual void DialogFindL() = 0; 
-       
-        /**
-        * Navigates through your file system and selects a file of specific mime type; 
-        * analogous to the Browse command in Windows.
-        * @since 3.2
-        * @param aSelectedFileName The selected file name.
-        * @param aMimeType The accepted mime type.
-        * @return ETrue if the user selected a file
-        * EFalse if the user cancelled the transaction and did not select a file.
-        * @attiontion Returned on cleanup stack. Browser control will free the buffer.
-        */
-        virtual TBool DialogMimeFileSelectLC(HBufC*& aSelectedFileName,
-                                         const TDesC& aMimeType) = 0;
-       
+       virtual void DialogFindL() = 0;
+
     };
 
 
 /**
-* The TBrCtlSelectOptionData class represents a list of elements 
+* The TBrCtlSelectOptionData class represents a list of elements
 * to display in the list box. This class is used for the List Selection Dialog.
 * @code
@@ -316 +303 @@
         */
         inline TBrCtlSelectOptionData()
-                {   
+                {
                 iText.Set(NULL, 0);
                 iIsSelected = EFalse;
@@ -332 +319 @@
         * @return TbrCtlSelectOptionData object
         */
-        inline TBrCtlSelectOptionData( const TDesC& aText, 
+        inline TBrCtlSelectOptionData( const TDesC& aText,
                                         TBool aIsSelected,
-                                        TBool aIsOptGroup, 
+                                        TBool aIsOptGroup,
                                         TBool aHasOnPick )
                                                             {
@@ -340 +327 @@
                                                             iIsSelected = aIsSelected;
                                                             iIsOptGroup = aIsOptGroup;
-                                                            iHasOnPick = aHasOnPick; 
+                                                            iHasOnPick = aHasOnPick;
                                                             }
         /**
         * Gets the display text associated with a specified option.
         * @since 2.8
-        * @return A reference to a Symbian TDesC object that 
-        * contains the text associated with this option. 
+        * @return A reference to a Symbian TDesC object that
+        * contains the text associated with this option.
         */
         inline const TDesC& Text() const {return iText;}
         /**
-        * Indicates whether or not an option is selected. 
+        * Indicates whether or not an option is selected.
         * @since 2.8
         * @return ETrue if the option is selected
@@ -357 +344 @@
         inline TBool IsSelected() const {return iIsSelected;}
         /**
-        * Indicates whether an option group member 
-        * variable is a group title or a selectable option. 
+        * Indicates whether an option group member
+        * variable is a group title or a selectable option.
         * @since 2.8
         * @return ETrue if the listed item is the title of an option group
-        * EFalse if the listed item is one of the options from which to select 
+        * EFalse if the listed item is one of the options from which to select
         */
         inline TBool IsOptGroup() const {return iIsOptGroup;}
         /**
-        * Indicates whether or not the dialog closes when an option is selected. 
-        * @since 2.8
-        * @return ETrue if the dialog closes when the element is selected. 
+        * Indicates whether or not the dialog closes when an option is selected.
+        * @since 2.8
+        * @return ETrue if the dialog closes when the element is selected.
         * This is known as having OnPick capability.
         * EFalse if the dialog does not close when the element is selected
@@ -373 +360 @@
         inline TBool HasOnPick() const {return iHasOnPick;}
         /**
-        * Sets the text of the option object. 
-        * @since 2.8
-        * @param aText A reference to a TDesC object that contains the 
+        * Sets the text of the option object.
+        * @since 2.8
+        * @param aText A reference to a TDesC object that contains the
         * text to associate with a particular option.
         * @return None
@@ -382 +369 @@
         inline void SetText( TDesC& aText )             { iText.Set( aText ); }
         /**
-        * Sets the selection state of an option. 
+        * Sets the selection state of an option.
         * @since 2.8
         * @param aIsSelected The state of the IsSelected member variable.
@@ -388 +375 @@
         * ETrue if the option is selected
         * EFalse if the option is not selected
-        * @return None 
+        * @return None
         */
         inline void SetIsSelected( TBool aIsSelected )  { iIsSelected = aIsSelected; }
         /**
-        * Sets the state of the option group member variable. 
-        * Indicates whether an option group member variable is a group title 
+        * Sets the state of the option group member variable.
+        * Indicates whether an option group member variable is a group title
         * or a selectable option.
         * @since 2.8
-        * @param aIsOptGroup The state of the option group. 
+        * @param aIsOptGroup The state of the option group.
         * Value:
         * ETrue if the listed item is the title of an option group.
@@ -404 +391 @@
         inline void SetIsOptGroup( TBool aIsOptGroup )  { iIsOptGroup = aIsOptGroup; }
         /**
-        * Sets the state of the hasOnPick member variable. 
+        * Sets the state of the hasOnPick member variable.
         * Indicates whether or not the dialog closes when an option is selected.
         * @since 2.8
-        * @param aHasOnPick 
-        * ETrue if the dialog closes when the element is selected. This 
+        * @param aHasOnPick
+        * ETrue if the dialog closes when the element is selected. This
         * is known as having OnPick capability.
         * EFalse if the dialog does not close when the element is selected
@@ -423 +410 @@
         TBool iIsOptGroup;
         // Flag if the element has onPick
-        TBool iHasOnPick; 
+        TBool iHasOnPick;
     };
 
@@ -444 +431 @@
         */
         CBrCtlObjectInfo();
-    
+
         /**
         * Constructor
@@ -468 +455 @@
         inline void SetAppSupported(TBool aAppSupported) {iAppSupported = aAppSupported;}
         /**
-        * Sets the flag if there is a netscape plugin for this object 
+        * Sets the flag if there is a netscape plugin for this object
         * @since 3.0
         * @param aPluginSupported ETrue if there is a netscape plugin for this object
@@ -485 +472 @@
         * Sets the name of the viewer app or netscape plugin that supports this object
         * @since 3.0
-        * @param aAppName  Symbian descriptor containing the name of 
+        * @param aAppName  Symbian descriptor containing the name of
         * the viewer app or netscape plugin that supports this object.
         * @return None
@@ -491 +478 @@
     inline void SetAppName(const TDesC& aAppName) {iAppName.Set(aAppName);}
         /**
-        * Sets the content type of the object 
-        * @since 3.0
-        * @param aFileType Symbian descriptor holding content type of the object 
+        * Sets the content type of the object
+        * @since 3.0
+        * @param aFileType Symbian descriptor holding content type of the object
         * @return None
         */
@@ -506 +493 @@
         inline TBool AppSupported() {return iAppSupported;}
         /**
-        * Tells if there is a netscape plugin for this object 
+        * Tells if there is a netscape plugin for this object
         * @since 3.0
         * @param None
         * @return ETrue if there is a netscape plugin for this object
-        * EFalse if there is not a netscape plugin for this object.       
+        * EFalse if there is not a netscape plugin for this object.
         */
         inline TBool PluginSupported() {return iPluginSupported;}
@@ -517 +504 @@
         * @since 3.0
         * @param None
-        * @return Symbian descriptor containing the size of the object 
+        * @return Symbian descriptor containing the size of the object
         */
         inline const TDesC& Size() const {return iSize;}
@@ -524 +511 @@
         * @since 3.0
         * @param None
-        * @return Symbian descriptor containing the name of 
+        * @return Symbian descriptor containing the name of
         * the viewer app or netscape plugin that supports this object.
         */
     inline const TDesC& AppName() const {return iAppName;}
         /**
-        * Gets the content type of the object 
-        * @since 3.0
-        * @param None
-        * @return Symbian descriptor holding content type of the object 
+        * Gets the content type of the object
+        * @since 3.0
+        * @param None
+        * @return Symbian descriptor holding content type of the object
         */
     inline const TDesC& FileType() const {return iFileType;}
@@ -568 +555 @@
         * @param aAltText The alt text of the image
         * @param aImageType The type of the image
-        */       
+        */
         TBrCtlImageCarrier(const TDesC8& aRawData, const TDesC& aUrl,
-            const TDesC& aAltText, TBrCtlImageType aImageType, const TDesC& aContentType ) : 
+            const TDesC& aAltText, TBrCtlImageType aImageType, const TDesC& aContentType ) :
             iRawData( aRawData ),
             iUrl( aUrl ),
@@ -589 +576 @@
         * @since 3.0
         * @param None
-        * @return Symbian descriptor containing url of the image 
+        * @return Symbian descriptor containing url of the image
         */
         inline const TDesC& Url() const {return iUrl;}
@@ -596 +583 @@
         * @since 3.0
         * @param None
-        * @return Symbian descriptor containing alt text of the image 
+        * @return Symbian descriptor containing alt text of the image
         */
         inline const TDesC& AltText() const {return iAltText;}
@@ -610 +597 @@
         * @since 3.1
         * @param None
-        * @return Symbian descriptor containing content type of the image 
+        * @return Symbian descriptor containing content type of the image
         */
         inline const TDesC& ContentType() const {return iContentType;}
-    private:     
+    private:
         TPtrC8 iRawData;
         TPtrC iUrl;
@@ -622 +609 @@
 
 
-#endif      // BRCTLDIALOGSPROVIDER_H   
-            
+#endif      // BRCTLDIALOGSPROVIDER_H
+
 // End of File

S60/trunk/WebKit/BrowserControl/inc/BrCtlInterface.h

@@ -72 +72 @@
 class MBrCtlStateChangeObserver;
 class MBrCtlCommandObserver;
-#ifdef  RD_BROWSER_WIDGETS
 class MWidgetCallback;
 class MWidgetExtension;
-#endif //RD_BROWSER_WIDGETS
 class CBrCtlInterface;
 class CPluginInfo;
@@ -600 +598 @@
         IMPORT_C virtual void RemoveCommandObserver(MBrCtlCommandObserver* aBrCtlCommandObserver) = 0;