diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2017-10-26 22:16:56 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-10-26 19:57:12 +0000 |
| commit | aa80d42eb3696071da31827ff27b3963eda59ac0 (patch) | |
| tree | 9b8460aa5aa4b06eb22ff6a8881d0a1fce9e2c0f /Source/WebKit2 | |
| parent | f5345badaeefac7c03c8a26dea6b89706871c3fe (diff) | |
| download | qtwebkit-aa80d42eb3696071da31827ff27b3963eda59ac0.tar.gz | |
Import WebKit commit 3d58c4e1c3d584799c4aa9a14d14e266695ee335
Change-Id: I1069f65fada85860f5c3da6c37a5ab5a8daecd51
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/WebKit2')
3 files changed, 5 insertions, 3 deletions
diff --git a/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h b/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h index 35d4e8096..c787c35f7 100644 --- a/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h +++ b/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h @@ -95,7 +95,7 @@ private: virtual IPC::Connection* messageSenderConnection() override final; - uint64_t m_identifier; + uint64_t m_identifier { 0 }; bool m_isOpenInServer { false }; RefPtr<WebCore::IDBClient::IDBConnectionToServer> m_connectionToServer; }; diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h b/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h index 1d8562b15..734ab3408 100644 --- a/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h +++ b/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h @@ -344,8 +344,8 @@ private: TimerMap m_timers; unsigned m_nextTimerID; - bool m_privateBrowsingState; - bool m_storageBlockingState; + bool m_privateBrowsingState { false }; + bool m_storageBlockingState { false }; #if PLUGIN_ARCHITECTURE(MAC) NPDrawingModel m_drawingModel; diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp index c612f0a30..e5e9a8dcf 100644 --- a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp +++ b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp @@ -213,6 +213,7 @@ NetscapePluginX11::NetscapePluginX11(NetscapePlugin& plugin, Display* display) Visual* visual = visualInfo.get()[0].visual; ASSERT(visual); + m_setWindowCallbackStruct.type = NP_SETWINDOW; m_setWindowCallbackStruct.visual = visual; m_setWindowCallbackStruct.colormap = XCreateColormap(hostDisplay, rootWindowID(), visual, AllocNone); } @@ -242,6 +243,7 @@ NetscapePluginX11::NetscapePluginX11(NetscapePlugin& plugin, Display* display, u Display* hostDisplay = x11HostDisplay(); m_npWindowID = gtk_socket_get_id(GTK_SOCKET(socket)); GdkWindow* window = gtk_widget_get_window(socket); + m_setWindowCallbackStruct.type = NP_SETWINDOW; m_setWindowCallbackStruct.display = GDK_WINDOW_XDISPLAY(window); m_setWindowCallbackStruct.visual = GDK_VISUAL_XVISUAL(gdk_window_get_visual(window)); m_setWindowCallbackStruct.depth = gdk_visual_get_depth(gdk_window_get_visual(window)); |