Changeset 224192 in webkit


Ignore:
Timestamp:
Oct 30, 2017 11:21:02 AM (7 years ago)
Author:
Michael Catanzaro
Message:

[WPE] Fix build warnings
​https://bugs.webkit.org/show_bug.cgi?id=178899

Reviewed by Carlos Alberto Lopez Perez.

Source/JavaScriptCore:

  • PlatformWPE.cmake:

Source/WebCore:

These are actually mostly cross-platform issues.

  • html/canvas/WebGL2RenderingContext.cpp:

(WebCore::arrayBufferViewElementSize):

  • platform/Cairo.cmake:
  • platform/Curl.cmake:
  • platform/FreeType.cmake:
  • platform/GCrypt.cmake:
  • platform/graphics/texmap/TextureMapperShaderProgram.cpp:

(WebCore::TextureMapperShaderProgram::create):

  • platform/network/soup/SoupNetworkSession.cpp:

(WebCore::SoupNetworkSession::SoupNetworkSession):

Source/WebKit:

  • PlatformWPE.cmake:

Source/WTF:

  • wtf/PlatformWPE.cmake:

Tools:

  • TestWebKitAPI/Tests/WebKitGLib/TestDownloads.cpp:

(testContextMenuDownloadActions):
(testBlobDownload):
(beforeAll):

  • TestWebKitAPI/Tests/WebKitGLib/TestResources.cpp:
  • TestWebKitAPI/Tests/WebKitGLib/TestUIClient.cpp:

(testWebViewJavaScriptDialogs):

  • TestWebKitAPI/Tests/WebKitGLib/TestWebExtensions.cpp:
  • TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp:
  • WebKitTestRunner/PlatformWPE.cmake:
  • WebKitTestRunner/wpe/HeadlessViewBackend.cpp:
  • WebKitTestRunner/wpe/TestControllerWPE.cpp:

(WTR::threadDefaultContext): Deleted.

Location:
trunk
Files:
23 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r224172 r224192  
     12017-10-30  Michael Catanzaro  <mcatanzaro@igalia.com>
     2
     3        [WPE] Fix build warnings
     4        https://bugs.webkit.org/show_bug.cgi?id=178899
     5
     6        Reviewed by Carlos Alberto Lopez Perez.
     7
     8        * PlatformWPE.cmake:
     9
    1102017-10-30  Zan Dobersek  <zdobersek@igalia.com>
    211

  • trunk/Source/JavaScriptCore/PlatformWPE.cmake

    r217832 r224192  
    22    ${GLIB_LIBRARIES}
    33)
     4
     5list(APPEND JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES
     6    ${GLIB_INCLUDE_DIRS}
     7)
     8
    49list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
    5     ${GLIB_INCLUDE_DIRS}
    610    ${WTF_DIR}
    711)

  • trunk/Source/WTF/ChangeLog

    r224137 r224192  
     12017-10-30  Michael Catanzaro  <mcatanzaro@igalia.com>
     2
     3        [WPE] Fix build warnings
     4        https://bugs.webkit.org/show_bug.cgi?id=178899
     5
     6        Reviewed by Carlos Alberto Lopez Perez.
     7
     8        * wtf/PlatformWPE.cmake:
     9
    1102017-10-27  Yousuke Kimoto  <yousuke.kimoto@sony.com>
    211

  • trunk/Source/WTF/wtf/PlatformWPE.cmake

    r221768 r224192  
    2727)
    2828
    29 list(APPEND WTF_INCLUDE_DIRECTORIES
     29list(APPEND WTF_SYSTEM_INCLUDE_DIRECTORIES
    3030    ${GLIB_INCLUDE_DIRS}
    3131)

  • trunk/Source/WebCore/ChangeLog

    r224189 r224192  
     12017-10-30  Michael Catanzaro  <mcatanzaro@igalia.com>
     2
     3        [WPE] Fix build warnings
     4        https://bugs.webkit.org/show_bug.cgi?id=178899
     5
     6        Reviewed by Carlos Alberto Lopez Perez.
     7
     8        These are actually mostly cross-platform issues.
     9
     10        * html/canvas/WebGL2RenderingContext.cpp:
     11        (WebCore::arrayBufferViewElementSize):
     12        * platform/Cairo.cmake:
     13        * platform/Curl.cmake:
     14        * platform/FreeType.cmake:
     15        * platform/GCrypt.cmake:
     16        * platform/graphics/texmap/TextureMapperShaderProgram.cpp:
     17        (WebCore::TextureMapperShaderProgram::create):
     18        * platform/network/soup/SoupNetworkSession.cpp:
     19        (WebCore::SoupNetworkSession::SoupNetworkSession):
     20
    1212017-10-30  Michael Catanzaro  <mcatanzaro@igalia.com>
    222

  • trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp

    r223683 r224192  
    106106        return elementSize(data.getType());
    107107    }
     108    RELEASE_ASSERT_NOT_REACHED();
    108109}
    109110

  • trunk/Source/WebCore/platform/Cairo.cmake

    r224189 r224192  
    11list(APPEND WebCore_INCLUDE_DIRECTORIES
    2     ${CAIRO_INCLUDE_DIRS}
    32    "${WEBCORE_DIR}/platform/graphics/cairo"
    43)
    … …  
    87)
    98
     9list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
     10    ${CAIRO_INCLUDE_DIRS}
     11)
     12
    1013list(APPEND WebCore_LIBRARIES
    1114    ${CAIRO_LIBRARIES}

  • trunk/Source/WebCore/platform/Curl.cmake

    r224037 r224192  
    2727)
    2828
    29 list(APPEND WebCore_INCLUDE_DIRECTORIES
     29list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
    3030    ${CURL_INCLUDE_DIRS}
    3131    ${OPENSSL_INCLUDE_DIR}

  • trunk/Source/WebCore/platform/FreeType.cmake

    r222844 r224192  
    11list(APPEND WebCore_INCLUDE_DIRECTORIES
    2     ${FONTCONFIG_INCLUDE_DIRS}
    3     ${FREETYPE2_INCLUDE_DIRS}
    4     ${HARFBUZZ_INCLUDE_DIRS}
    52    "${WEBCORE_DIR}/platform/graphics/freetype"
    63    "${WEBCORE_DIR}/platform/graphics/harfbuzz"
    … …  
    3532endif ()
    3633
     34list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
     35    ${FONTCONFIG_INCLUDE_DIRS}
     36    ${FREETYPE2_INCLUDE_DIRS}
     37    ${HARFBUZZ_INCLUDE_DIRS}
     38)
     39
    3740list(APPEND WebCore_LIBRARIES
    3841    ${FONTCONFIG_LIBRARIES}

  • trunk/Source/WebCore/platform/GCrypt.cmake

    r224189 r224192  
    88    ${LIBGCRYPT_LIBRARIES}
    99)
    10 list(APPEND WebCore_INCLUDE_DIRECTORIES
     10list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
    1111    ${LIBGCRYPT_INCLUDE_DIRS}
    1212)

  • trunk/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp

    r223833 r224192  
    6969    );
    7070
     71#if !USE(OPENGL_ES_2)
    7172// Input/output variables definition for OpenGL >= 3.2.
    7273static const char* vertexTemplateGE320Vars =
    … …  
    7778        out float v_antialias;
    7879    );
     80#endif
    7981
    8082static const char* vertexTemplateCommon =
    … …  
    186188    );
    187189
     190#if !USE(OPENGL_ES_2)
    188191// Input/output variables definition for OpenGL >= 3.2.
    189192static const char* fragmentTemplateGE320Vars =
    … …  
    193196        in vec2 v_transformedTexCoord;
    194197    );
     198#endif
    195199
    196200static const char* fragmentTemplateCommon =
    … …  
    377381    SET_APPLIER_FROM_OPTIONS(ManualRepeat);
    378382
    379     unsigned glVersion = GLContext::current()->version();
    380383    StringBuilder vertexShaderBuilder;
    381384
    382385    // OpenGL >= 3.2 requires a #version directive at the beginning of the code.
    383386#if !USE(OPENGL_ES_2)
     387    unsigned glVersion = GLContext::current()->version();
    384388    if (glVersion >= 320)
    385389        vertexShaderBuilder.append(GLSL_DIRECTIVE(version 150));

  • trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp

    r223728 r224192  
    153153            nullptr);
    154154    }
     155#else
     156    UNUSED_PARAM(sessionID);
    155157#endif
    156158

  • trunk/Source/WebKit/ChangeLog

    r224191 r224192  
     12017-10-30  Michael Catanzaro  <mcatanzaro@igalia.com>
     2
     3        [WPE] Fix build warnings
     4        https://bugs.webkit.org/show_bug.cgi?id=178899
     5
     6        Reviewed by Carlos Alberto Lopez Perez.
     7
     8        * PlatformWPE.cmake:
     9
    1102017-10-30  Sam Weinig  <sam@webkit.org>
    211

  • trunk/Source/WebKit/PlatformWPE.cmake

    r224189 r224192  
    506506)
    507507
    508 list(APPEND WPEWebInspectorResources_INCLUDE_DIRECTORIES
     508list(APPEND WPEWebInspectorResources_SYSTEM_INCLUDE_DIRECTORIES
    509509    ${GLIB_INCLUDE_DIRS}
    510510)
    … …  
    513513add_dependencies(WPEWebInspectorResources WebKit)
    514514target_link_libraries(WPEWebInspectorResources ${WPEWebInspectorResources_LIBRARIES})
    515 target_include_directories(WPEWebInspectorResources PUBLIC ${WPEWebInspectorResources_INCLUDE_DIRECTORIES})
     515target_include_directories(WPEWebInspectorResources SYSTEM PUBLIC ${WPEWebInspectorResources_SYSTEM_INCLUDE_DIRECTORIES})
    516516install(TARGETS WPEWebInspectorResources DESTINATION "${LIB_INSTALL_DIR}")
    517517

  • trunk/Tools/ChangeLog

    r224190 r224192  
     12017-10-30  Michael Catanzaro  <mcatanzaro@igalia.com>
     2
     3        [WPE] Fix build warnings
     4        https://bugs.webkit.org/show_bug.cgi?id=178899
     5
     6        Reviewed by Carlos Alberto Lopez Perez.
     7
     8        * TestWebKitAPI/Tests/WebKitGLib/TestDownloads.cpp:
     9        (testContextMenuDownloadActions):
     10        (testBlobDownload):
     11        (beforeAll):
     12        * TestWebKitAPI/Tests/WebKitGLib/TestResources.cpp:
     13        * TestWebKitAPI/Tests/WebKitGLib/TestUIClient.cpp:
     14        (testWebViewJavaScriptDialogs):
     15        * TestWebKitAPI/Tests/WebKitGLib/TestWebExtensions.cpp:
     16        * TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp:
     17        * WebKitTestRunner/PlatformWPE.cmake:
     18        * WebKitTestRunner/wpe/HeadlessViewBackend.cpp:
     19        * WebKitTestRunner/wpe/TestControllerWPE.cpp:
     20        (WTR::threadDefaultContext): Deleted.
     21
    1222017-10-30  Michael Catanzaro  <mcatanzaro@igalia.com>
    223

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestDownloads.cpp

    r218686 r224192  
    726726    g_file_delete(downloadFile.get(), nullptr, nullptr);
    727727}
    728 #endif // PLATFORM(GTK)
    729728
    730729static void testBlobDownload(WebViewDownloadTest* test, gconstpointer)
    731730{
    732 #if PLATFORM(GTK)
    733731    test->showInWindowAndWaitUntilMapped();
    734 #endif
    735732
    736733    static const char* linkBlobHTML =
    … …  
    765762    g_file_delete(downloadFile.get(), nullptr, nullptr);
    766763}
     764#endif // PLATFORM(GTK)
    767765
    768766void beforeAll()
    … …  
    784782#if PLATFORM(GTK)
    785783    WebViewDownloadTest::add("Downloads", "contex-menu-download-actions", testContextMenuDownloadActions);
    786 #endif
    787784    // FIXME: Implement mouse click in WPE.
    788 #if PLATFORM(GTK)
    789785    WebViewDownloadTest::add("Downloads", "blob-download", testBlobDownload);
    790786#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestResources.cpp

    r222735 r224192  
    729729};
    730730
     731#if SOUP_CHECK_VERSION(2, 49, 91)
    731732static void testWebViewSyncRequestOnMaxConns(SyncRequestOnMaxConnsTest* test, gconstpointer)
    732733{
    … …  
    763764        g_source_remove(context.unlockServerSourceID);
    764765}
     766#endif
    765767
    766768static void addCacheHTTPHeadersToResponse(SoupMessage* message)

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestUIClient.cpp

    r218738 r224192  
    554554    static const char* jsConfirmFormat = "do { confirmed = confirm('%s'); } while (!confirmed); alert('confirmed');";
    555555    static const char* jsPromptFormat = "alert(prompt('%s', 'default'));";
     556#if PLATFORM(GTK)
    556557    static const char* htmlOnBeforeUnloadFormat =
    557558        "<html><body onbeforeunload=\"return beforeUnloadHandler();\"><input id=\"testInput\" type=\"text\"></input><script>function beforeUnloadHandler() { return \"%s\"; }</script></body></html>";
     559#endif
    558560
    559561    test->m_scriptDialogType = WEBKIT_SCRIPT_DIALOG_ALERT;

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebExtensions.cpp

    r221240 r224192  
    3131#define FORM2_ID "form2-id"
    3232
     33#if PLATFORM(GTK)
    3334static void testWebExtensionGetTitle(WebViewTest* test, gconstpointer)
    3435{
    … …  
    5152    g_assert_cmpstr(title, ==, "WebKitGTK+ Web Extensions Test");
    5253}
     54#endif
    5355
    5456static void documentLoadedCallback(GDBusConnection*, const char*, const char*, const char*, const char*, GVariant*, WebViewTest* test)

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp

    r218686 r224192  
    311311}
    312312
     313#if PLATFORM(GTK)
    313314static CString convertWebViewMainResourceDataToCString(WebViewTest* test)
    314315{
    … …  
    318319}
    319320
    320 #if PLATFORM(GTK)
    321321static void assertThatUserAgentIsSentInHeaders(WebViewTest* test, const CString& userAgent)
    322322{

  • trunk/Tools/WebKitTestRunner/PlatformWPE.cmake

    r222194 r224192  
    2222    ${WEBKIT_TESTRUNNER_DIR}/InjectedBundle/wpe
    2323    ${FORWARDING_HEADERS_DIR}
     24)
     25
     26list(APPEND WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES
    2427    ${CAIRO_INCLUDE_DIRS}
    2528    ${GLIB_INCLUDE_DIRS}

  • trunk/Tools/WebKitTestRunner/wpe/HeadlessViewBackend.cpp

    r219819 r224192  
    238238
    239239        assert(it != backend.m_exportMap.end());
    240         uint32_t handle = it->first;
    241240        int32_t fd = it->second;
    242241

  • trunk/Tools/WebKitTestRunner/wpe/TestControllerWPE.cpp

    r222968 r224192  
    5757void TestController::platformInitializeContext()
    5858{
    59 }
    60 
    61 static GMainContext* threadDefaultContext()
    62 {
    63     if (GMainContext* context = g_main_context_get_thread_default())
    64         return context;
    65     return g_main_context_default();
    6659}
    6760
Note: See TracChangeset for help on using the changeset viewer.