Changeset 55981 in webkit

Timestamp:

Mar 14, 2010 6:28:02 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-14 Chang Shu <​chang.shu@nokia.com>

Reviewed by Simon Hausmann.

[Qt] [Symbian] Added block for ENABLE_SYMBIAN_DIALOG_PROVIDERS
on Symbian platform.
​https://bugs.webkit.org/show_bug.cgi?id=35919

• WebCore.pro:

2010-03-14 Chang Shu <​chang.shu@nokia.com>

Reviewed by Simon Hausmann.

[Qt] [Symbian] Use Symbian native dialog providers for combo pupups.
​https://bugs.webkit.org/show_bug.cgi?id=35919

• WebCoreSupport/QtFallbackWebPopup.cpp: (WebCore::QtFallbackWebPopup::show): (WebCore::ResetAndDestroy): (WebCore::QtFallbackWebPopup::showS60BrowserDialog):
• WebCoreSupport/QtFallbackWebPopup.h:

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.pro (modified) (1 diff)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp (modified) (4 diffs)
• WebKit/qt/WebCoreSupport/QtFallbackWebPopup.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-14  Chang Shu  <chang.shu@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] [Symbian] Added block for ENABLE_SYMBIAN_DIALOG_PROVIDERS
+        on Symbian platform.
+        https://bugs.webkit.org/show_bug.cgi?id=35919
+
+        * WebCore.pro:
+
 2010-03-14  Yael Aharon  <yael.aharon@nokia.com>
 

trunk/WebCore/WebCore.pro

@@ -2808 +2808 @@
 }
 
+contains(DEFINES, ENABLE_SYMBIAN_DIALOG_PROVIDERS) {
+    # this feature requires the S60 platform private BrowserDialogsProvider.h header file
+    # and is therefore not enabled by default but only meant for platform builds.
+    symbian {
+        LIBS += -lbrowserdialogsprovider
+    }
+}
 
 include($$PWD/../WebKit/qt/Api/headers.pri)

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-03-14  Chang Shu  <chang.shu@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] [Symbian] Use Symbian native dialog providers for combo pupups.
+        https://bugs.webkit.org/show_bug.cgi?id=35919
+
+        * WebCoreSupport/QtFallbackWebPopup.cpp:
+        (WebCore::QtFallbackWebPopup::show):
+        (WebCore::ResetAndDestroy):
+        (WebCore::QtFallbackWebPopup::showS60BrowserDialog):
+        * WebCoreSupport/QtFallbackWebPopup.h:
+
 2010-03-14  Antti Koivisto  <koivisto@iki.fi>
 

trunk/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp

@@ -24 +24 @@
 #include "HostWindow.h"
 #include "PopupMenuClient.h"
+#include "QWebPageClient.h"
 #include "qgraphicswebview.h"
-#include "QWebPageClient.h"
 #include <QAbstractItemView>
 #include <QApplication>
@@ -35 +35 @@
 #include <QStandardItemModel>
 
+#if ENABLE(SYMBIAN_DIALOG_PROVIDERS)
+#include <BrCtlDialogsProvider.h>
+#include <BrowserDialogsProvider.h> // S60 platform private header file
+#include <e32base.h>
+#endif
+
 namespace WebCore {
 
@@ -94 +100 @@
 void QtFallbackWebPopup::show()
 {
+#if ENABLE(SYMBIAN_DIALOG_PROVIDERS)
+    TRAP_IGNORE(showS60BrowserDialog());
+#else
     populate();
     m_combo->setCurrentIndex(currentIndex());
@@ -125 +134 @@
                       Qt::LeftButton, Qt::NoModifier);
     QCoreApplication::sendEvent(m_combo, &event);
-}
+#endif
+}
+
+#if ENABLE(SYMBIAN_DIALOG_PROVIDERS)
+
+static void ResetAndDestroy(TAny* aPtr)
+{
+    RPointerArray<HBufC>* items = reinterpret_cast<RPointerArray<HBufC>* >(aPtr);
+    items->ResetAndDestroy();
+}
+
+void QtFallbackWebPopup::showS60BrowserDialog()
+{
+    static MBrCtlDialogsProvider* dialogs = CBrowserDialogsProvider::NewL(0);
+    if (!dialogs)
+        return;
+
+    int size = itemCount();
+    CArrayFix<TBrCtlSelectOptionData>* options = new CArrayFixFlat<TBrCtlSelectOptionData>(qMax(1, size));
+    RPointerArray<HBufC> items(qMax(1, size));
+    CleanupStack::PushL(TCleanupItem(&ResetAndDestroy, &items));
+
+    for (int i = 0; i < size; i++) {
+        if (itemType(i) == Separator) {
+            TBrCtlSelectOptionData data(_L("----------"), false, false, false);
+            options->AppendL(data);
+        } else {
+            HBufC16* itemStr = HBufC16::NewL(itemText(i).length());
+            itemStr->Des().Copy((const TUint16*)itemText(i).utf16(), itemText(i).length());
+            CleanupStack::PushL(itemStr);
+            TBrCtlSelectOptionData data(*itemStr, i == currentIndex(), false, itemIsEnabled(i));
+            options->AppendL(data);
+            items.AppendL(itemStr);
+            CleanupStack::Pop();
+        }
+    }
+
+    dialogs->DialogSelectOptionL(KNullDesC(), (TBrCtlSelectOptionType)(ESelectTypeSingle | ESelectTypeWithFindPane), *options);
+
+    CleanupStack::PopAndDestroy(&items);
+
+    int newIndex;
+    for (newIndex = 0; newIndex < options->Count() && !options->At(newIndex).IsSelected(); newIndex++) {}
+    if (newIndex == options->Count())
+        newIndex = currentIndex();
+    
+    m_popupVisible = false;
+    popupDidHide();
+
+    if (currentIndex() != newIndex && newIndex >= 0)
+        valueChanged(newIndex);
+
+    delete options;
+}
+#endif
 
 void QtFallbackWebPopup::hide()

trunk/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.h

@@ -49 +49 @@
 
     void populate();
+#if ENABLE(SYMBIAN_DIALOG_PROVIDERS)
+    void showS60BrowserDialog();
+#endif
 };