Skip to content

Commit 5c43fb4

Browse files
authored
browser(webkit): unfork windows bits (#2228)
1 parent 2bca64a commit 5c43fb4

File tree

2 files changed

+1
-37
lines changed

2 files changed

+1
-37
lines changed

browser_patches/webkit/BUILD_NUMBER

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1228
1+
1229

browser_patches/webkit/patches/bootstrap.diff

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -13128,42 +13128,6 @@ index 0000000000000000000000000000000000000000..5cf8a010e9809e6a95741cdb7c2cbeb4
1312813128
+}
1312913129
+
1313013130
+} // namespace WebKit
13131-
diff --git a/Source/WebKit/UIProcess/win/WebProcessPoolWin.cpp b/Source/WebKit/UIProcess/win/WebProcessPoolWin.cpp
13132-
index 18f9e93932793b7c3e44e6346be0f13ed6dbf233..bd056b2ab34f0059d6477c955f51d71136f2a252 100644
13133-
--- a/Source/WebKit/UIProcess/win/WebProcessPoolWin.cpp
13134-
+++ b/Source/WebKit/UIProcess/win/WebProcessPoolWin.cpp
13135-
@@ -26,7 +26,6 @@
13136-
13137-
#include "config.h"
13138-
#include "WebProcessPool.h"
13139-
-
13140-
#include "WebProcessCreationParameters.h"
13141-
#include <WebCore/NotImplemented.h>
13142-
13143-
diff --git a/Source/WebKit/UIProcess/win/WebView.cpp b/Source/WebKit/UIProcess/win/WebView.cpp
13144-
index 4a96b5e998800bb7b1ca104f860e96dcf418d178..d04d3be8e814b6994a3cc390fa1b17a87a3b06b9 100644
13145-
--- a/Source/WebKit/UIProcess/win/WebView.cpp
13146-
+++ b/Source/WebKit/UIProcess/win/WebView.cpp
13147-
@@ -114,6 +114,8 @@ LRESULT WebView::wndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
13148-
m_page->tryClose();
13149-
break;
13150-
case WM_DESTROY:
13151-
+ if (!m_page)
13152-
+ return ::DefWindowProc(hWnd, message, wParam, lParam);
13153-
m_isBeingDestroyed = true;
13154-
close();
13155-
break;
13156-
@@ -275,6 +277,10 @@ WebView::WebView(RECT rect, const API::PageConfiguration& configuration, HWND pa
13157-
13158-
WebView::~WebView()
13159-
{
13160-
+ // We must close the page here since page expects pageClient to outlive it. Even though page
13161-
+ // client is a weak-ref in the page, the expectations are that it is available at least until
13162-
+ // the page.close.
13163-
+ m_page->close();
13164-
// Tooltip window needs to be explicitly destroyed since it isn't a WS_CHILD.
13165-
if (::IsWindow(m_toolTipWindow))
13166-
::DestroyWindow(m_toolTipWindow);
1316713131
diff --git a/Source/WebKit/UIProcess/wpe/InspectorTargetProxyWPE.cpp b/Source/WebKit/UIProcess/wpe/InspectorTargetProxyWPE.cpp
1316813132
new file mode 100644
1316913133
index 0000000000000000000000000000000000000000..7453194ca6f032ba86a4c67f5bf12688ab6ec1be

0 commit comments

Comments
 (0)