Changeset 90578 in webkit


Ignore:
Timestamp:
Jul 7, 2011, 10:45:32 AM (14 years ago)
Author:
andreas.kling@nokia.com
Message:

[Qt][WK2] Remove Symbian code.
​https://bugs.webkit.org/show_bug.cgi?id=64101

Reviewed by Benjamin Poulain.

Source/WebKit2:

  • DerivedSources.pro:
  • Platform/CoreIPC/Attachment.h:
  • Platform/CoreIPC/Connection.h:
  • Platform/SharedMemory.h:
  • Platform/qt/SharedMemorySymbian.cpp: Removed.
  • UIProcess/API/qt/tests/tests.pri:
  • UIProcess/Launcher/qt/ProcessLauncherQt.cpp:
  • WebKit2.pri:
  • WebKit2.pro:
  • WebProcess.pro:
  • config.h:

Tools:

  • MiniBrowser/qt/BrowserWindow.cpp:

(BrowserWindow::BrowserWindow):
(BrowserWindow::screenshot):

  • MiniBrowser/qt/MiniBrowser.pro:
  • MiniBrowser/qt/MiniBrowserApplication.h:

(WindowOptions::WindowOptions):

Location:
trunk
Files:
1 deleted
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r90577 r90578  
     12011-07-07  Andreas Kling  <kling@webkit.org>
     2
     3        [Qt][WK2] Remove Symbian code.
     4        https://bugs.webkit.org/show_bug.cgi?id=64101
     5
     6        Reviewed by Benjamin Poulain.
     7
     8        * DerivedSources.pro:
     9        * Platform/CoreIPC/Attachment.h:
     10        * Platform/CoreIPC/Connection.h:
     11        * Platform/SharedMemory.h:
     12        * Platform/qt/SharedMemorySymbian.cpp: Removed.
     13        * UIProcess/API/qt/tests/tests.pri:
     14        * UIProcess/Launcher/qt/ProcessLauncherQt.cpp:
     15        * WebKit2.pri:
     16        * WebKit2.pro:
     17        * WebProcess.pro:
     18        * config.h:
     19
    1202011-07-07  Andreas Kling  <kling@webkit.org>
    221

  • trunk/Source/WebKit2/DerivedSources.pro

    r84613 r90578  
    2424DOUBLE_ESCAPED_QUOTE = ""
    2525ESCAPE = ""
    26 win32-msvc*|symbian {
     26win32-msvc* {
    2727    ESCAPE = "^"
    2828} else:win32-g++*:isEmpty(QMAKE_SH) {

  • trunk/Source/WebKit2/Platform/CoreIPC/Attachment.h

    r86585 r90578  
    4141        MachPortType,
    4242        MachOOLMemoryType,
    43 #elif USE(UNIX_DOMAIN_SOCKETS) || OS(SYMBIAN)
     43#elif USE(UNIX_DOMAIN_SOCKETS)
    4444        MappedMemory
    4545#endif
    … …  
    4949    Attachment(mach_port_name_t port, mach_msg_type_name_t disposition);
    5050    Attachment(void* address, mach_msg_size_t size, mach_msg_copy_options_t copyOptions, bool deallocate);
    51 #elif USE(UNIX_DOMAIN_SOCKETS) || OS(SYMBIAN)
     51#elif USE(UNIX_DOMAIN_SOCKETS)
    5252    Attachment(int fileDescriptor, size_t);
    5353#endif
    … …  
    6767    mach_msg_copy_options_t copyOptions() const { ASSERT(m_type == MachOOLMemoryType); return m_oolMemory.copyOptions; }
    6868    bool deallocate() const { ASSERT(m_type == MachOOLMemoryType); return m_oolMemory.deallocate; }
    69 #elif USE(UNIX_DOMAIN_SOCKETS) || OS(SYMBIAN)
     69#elif USE(UNIX_DOMAIN_SOCKETS)
    7070    size_t size() const { return m_size; }
    7171
    … …  
    9595        } m_oolMemory;
    9696    };
    97 #elif USE(UNIX_DOMAIN_SOCKETS) || OS(SYMBIAN)
     97#elif USE(UNIX_DOMAIN_SOCKETS)
    9898    int m_fileDescriptor;
    9999    size_t m_size;

  • trunk/Source/WebKit2/Platform/CoreIPC/Connection.h

    r89771 r90578  
    109109    typedef HANDLE Identifier;
    110110    static bool createServerAndClientIdentifiers(Identifier& serverIdentifier, Identifier& clientIdentifier);
    111 #elif USE(UNIX_DOMAIN_SOCKETS) || OS(SYMBIAN)
     111#elif USE(UNIX_DOMAIN_SOCKETS)
    112112    typedef int Identifier;
    113113#endif
    … …  
    336336    OVERLAPPED m_writeState;
    337337    HANDLE m_connectionPipe;
    338 #elif USE(UNIX_DOMAIN_SOCKETS) || OS(SYMBIAN)
     338#elif USE(UNIX_DOMAIN_SOCKETS)
    339339    // Called on the connection queue.
    340340    void readyReadHandler();

  • trunk/Source/WebKit2/Platform/SharedMemory.h

    r88978 r90578  
    6161        static bool decode(CoreIPC::ArgumentDecoder*, Handle&);
    6262
    63 #if USE(UNIX_DOMAIN_SOCKETS) || OS(SYMBIAN)
     63#if USE(UNIX_DOMAIN_SOCKETS)
    6464        CoreIPC::Attachment releaseToAttachment() const;
    6565        void adoptFromAttachment(int fileDescriptor, size_t);
    … …  
    7373#elif USE(UNIX_DOMAIN_SOCKETS)
    7474        mutable int m_fileDescriptor;
    75 #elif OS(SYMBIAN)
    76         mutable uint32_t m_chunkID;
    7775#endif
    7876        size_t m_size;
    … …  
    114112#elif USE(UNIX_DOMAIN_SOCKETS)
    115113    int m_fileDescriptor;
    116 #elif OS(SYMBIAN)
    117     int m_handle;
    118114#endif
    119115};

  • trunk/Source/WebKit2/UIProcess/API/qt/tests/tests.pri

    r80552 r90578  
    1414
    1515QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
    16 !symbian: DEFINES += TESTS_SOURCE_DIR=\\\"$$PWD\\\"
     16DEFINES += TESTS_SOURCE_DIR=\\\"$$PWD\\\"

  • trunk/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp

    r83178 r90578  
    8484}
    8585
    86 #if OS(SYMBIAN)
    87 // FIXME: Symbian's POSIX layer doesn't have a socketpair(), so
    88 // the following is just to fix the build until a pure Symbian
    89 // IPC implementation lands on trunk
    90 static int socketpair(int, int, int , int[2])
    91 {
    92     return -1;
    93 }
    94 #endif
    95 
    9686void ProcessLauncher::launchProcess()
    9787{

  • trunk/Source/WebKit2/WebKit2.pri

    r88350 r90578  
    6262    $$SOURCE_DIR/WebKit2/PluginProcess
    6363
    64 # On Symbian PREPEND_INCLUDEPATH is the best way to make sure that WebKit headers
    65 # are included before platform headers.
    66 
    67 symbian {
    68     PREPEND_INCLUDEPATH = $$WEBKIT2_INCLUDEPATH $$WEBKIT2_GENERATED_SOURCES_DIR $$PREPEND_INCLUDEPATH
    69 } else {
    70     INCLUDEPATH = $$WEBKIT2_INCLUDEPATH $$WEBKIT2_GENERATED_SOURCES_DIR $$INCLUDEPATH
    71 }
     64INCLUDEPATH = $$WEBKIT2_INCLUDEPATH $$WEBKIT2_GENERATED_SOURCES_DIR $$INCLUDEPATH
    7265
    7366defineTest(prependWebKit2Lib) {
    … …  
    7770        LIBS = -l$$WEBKIT2_TARGET $$LIBS
    7871        LIBS = -L$$pathToWebKit2Output $$LIBS
    79         POST_TARGETDEPS += $${pathToWebKit2Output}$${QMAKE_DIR_SEP}$${WEBKIT2_TARGET}.lib
    80     } else:symbian {
    81         LIBS = -l$${WEBKIT2_TARGET}.lib $$LIBS
    82         QMAKE_LIBDIR += $$pathToWebKit2Output
    8372        POST_TARGETDEPS += $${pathToWebKit2Output}$${QMAKE_DIR_SEP}$${WEBKIT2_TARGET}.lib
    8473    } else {

  • trunk/Source/WebKit2/WebKit2.pro

    r90550 r90578  
    334334    Platform/qt/RunLoopQt.cpp \
    335335    Platform/qt/WorkQueueQt.cpp \
    336     Platform/qt/SharedMemorySymbian.cpp \
    337336    Platform/unix/SharedMemoryUnix.cpp \
    338337    PluginProcess/PluginControllerProxy.cpp \

  • trunk/Source/WebKit2/WebProcess.pro

    r85803 r90578  
    3434}
    3535
    36 symbian {
    37     TARGET.UID3 = 0xA000E544
    38     MMP_RULES += pageddata
    39     RSS_RULES += "hidden = KAppIsHidden;" # No icon in application grid
    40    
    41     TARGET.CAPABILITY *= ReadUserData
    42     TARGET.CAPABILITY *= WriteUserData
    43     TARGET.CAPABILITY *= NetworkServices  # QtNetwork and Bearer
    44    
    45     # See QtMobility docs on Symbian capabilities:
    46     # http://doc.qt.nokia.com/qtmobility/quickstart.html
    47     TARGET.CAPABILITY *= ReadDeviceData
    48     TARGET.CAPABILITY *= WriteDeviceData
    49     TARGET.CAPABILITY *= LocalServices
    50 }
    51 
    5236contains(QT_CONFIG, opengl) {
    5337    QT += opengl

  • trunk/Source/WebKit2/config.h

    r85887 r90578  
    147147#elif PLATFORM(WIN)
    148148#define PLUGIN_ARCHITECTURE_WIN 1
    149 #elif (PLATFORM(QT) || (PLATFORM(GTK))) && (OS(UNIX) && !OS(MAC_OS_X) && !OS(SYMBIAN))
     149#elif (PLATFORM(QT) || (PLATFORM(GTK))) && (OS(UNIX) && !OS(MAC_OS_X))
    150150#define PLUGIN_ARCHITECTURE_X11 1
    151151#else

  • trunk/Tools/ChangeLog

    r90577 r90578  
     12011-07-07  Andreas Kling  <kling@webkit.org>
     2
     3        [Qt][WK2] Remove Symbian code.
     4        https://bugs.webkit.org/show_bug.cgi?id=64101
     5
     6        Reviewed by Benjamin Poulain.
     7
     8        * MiniBrowser/qt/BrowserWindow.cpp:
     9        (BrowserWindow::BrowserWindow):
     10        (BrowserWindow::screenshot):
     11        * MiniBrowser/qt/MiniBrowser.pro:
     12        * MiniBrowser/qt/MiniBrowserApplication.h:
     13        (WindowOptions::WindowOptions):
     14
    1152011-07-07  Andreas Kling  <kling@webkit.org>
    216

  • trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp

    r90577 r90578  
    128128
    129129    QToolBar* bar = addToolBar("Navigation");
    130 #if defined(Q_OS_SYMBIAN)
    131     bar->setIconSize(QSize(16, 16));
    132 #endif
    133130#if 0
    134131    bar->addAction(page()->action(QWKPage::Back));
    … …  
    137134    bar->addAction(page()->action(QWKPage::Stop));
    138135#endif
    139 #if defined(Q_OS_SYMBIAN)
    140     addToolBarBreak();
    141     addToolBar("Location")->addWidget(m_addressBar);
    142 #else
    143136    bar->addWidget(m_addressBar);
    144 #endif
    145137
    146138    QShortcut* selectAddressBar = new QShortcut(Qt::CTRL | Qt::Key_L, this);
    … …  
    235227    QPixmap pixmap = QPixmap::grabWidget(m_browser);
    236228    QLabel* label = 0;
    237 #if !defined(Q_OS_SYMBIAN)
    238229    label = new QLabel;
    239230    label->setAttribute(Qt::WA_DeleteOnClose);
    … …  
    241232    label->setPixmap(pixmap);
    242233    label->show();
    243 #endif
    244234
    245235    QString fileName = QFileDialog::getSaveFileName(label, "Screenshot", QString(), QString("PNG File (.png)"));

  • trunk/Tools/MiniBrowser/qt/MiniBrowser.pro

    r85803 r90578  
    4747}
    4848
    49 symbian {
    50     TARGET.UID3 = 0xA000E545
    51     MMP_RULES += pageddata
    52    
    53     TARGET.CAPABILITY *= ReadUserData
    54     TARGET.CAPABILITY *= WriteUserData
    55     TARGET.CAPABILITY *= NetworkServices  # QtNetwork and Bearer
    56     TARGET.CAPABILITY *= PowerMgmt        # killing web process from UI process
    57    
    58     # See QtMobility docs on Symbian capabilities:
    59     # http://doc.qt.nokia.com/qtmobility/quickstart.html
    60     TARGET.CAPABILITY *= Location         # geolocation
    61     TARGET.CAPABILITY *= ReadDeviceData   # geolocation, sensors
    62     TARGET.CAPABILITY *= WriteDeviceData  # geolocation
    63     TARGET.CAPABILITY *= LocalServices    # geolocation, sysinfo
    64 }
    65 
    6649contains(QT_CONFIG, opengl) {
    6750    QT += opengl

  • trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h

    r90475 r90578  
    3737        : printLoadedUrls(false)
    3838        , useTouchWebView(false)
    39 #if defined(Q_OS_SYMBIAN)
    40         , startMaximized(true)
    41 #else
    4239        , startMaximized(false)
    43 #endif
    4440#if defined(QT_CONFIGURED_WITH_OPENGL)
    4541        , useQGLWidgetViewport(false)
Note: See TracChangeset for help on using the changeset viewer.