Changeset 85206 in webkit

Timestamp:

Apr 28, 2011 10:40:10 AM (13 years ago)

Author:

yael.aharon@nokia.com

Message:

2011-04-28 Yael Aharon <​yael.aharon@nokia.com>

Reviewed by Andreas Kling.

Remove flag ENABLE_SYMBIAN_DIALOG_PROVIDER
​https://bugs.webkit.org/show_bug.cgi?id=59704

No new tests, just code cleanup.

• WebCore.pri:

2011-04-28 Yael Aharon <​yael.aharon@nokia.com>

Reviewed by Andreas Kling.

Remove flag ENABLE_SYMBIAN_DIALOG_PROVIDER
​https://bugs.webkit.org/show_bug.cgi?id=59704

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

Location:

trunk/Source

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-28  Yael Aharon  <yael.aharon@nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        Remove flag ENABLE_SYMBIAN_DIALOG_PROVIDER
+        https://bugs.webkit.org/show_bug.cgi?id=59704
+
+        No new tests, just code cleanup.
+
+        * WebCore.pri:
+
 2011-04-28  Pavel Podivilov  <podivilov@chromium.org>
 

trunk/Source/WebCore/WebCore.pri

@@ -277 +277 @@
 }
 
-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
-    }
-}
-
 !CONFIG(webkit-debug):CONFIG(QTDIR_build) {
     # Remove the following 2 lines if you want debug information in WebCore

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2011-04-28  Yael Aharon  <yael.aharon@nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        Remove flag ENABLE_SYMBIAN_DIALOG_PROVIDER
+        https://bugs.webkit.org/show_bug.cgi?id=59704
+
+        * WebCoreSupport/QtFallbackWebPopup.cpp:
+        (WebCore::QtFallbackWebPopup::show):
+        * WebCoreSupport/QtFallbackWebPopup.h:
+
 2011-04-27  Yi Shen  <yi.4.shen@nokia.com>
 

trunk/Source/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp

@@ -36 +36 @@
 #include <QStandardItemModel>
 
-#if ENABLE(SYMBIAN_DIALOG_PROVIDERS)
-#include <BrCtlDialogsProvider.h>
-#include <BrowserDialogsProvider.h> // S60 platform private header file
-#include <e32base.h>
-#endif
-
 namespace WebCore {
 
@@ -114 +108 @@
         return;
 
-#if ENABLE(SYMBIAN_DIALOG_PROVIDERS)
-    TRAP_IGNORE(showS60BrowserDialog());
-#else
-
     destroyPopup();
     m_combo = new QtFallbackWebPopupCombo(*this);
@@ -151 +141 @@
                       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/Source/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.h

@@ -70 +70 @@
 
     void populate(const QWebSelectData&);
-#if ENABLE(SYMBIAN_DIALOG_PROVIDERS)
-    void showS60BrowserDialog();
-#endif
 };