Diff
Modified: trunk/Source/WebCore/ChangeLog (242841 => 242842)
--- trunk/Source/WebCore/ChangeLog 2019-03-13 02:34:28 UTC (rev 242841)
+++ trunk/Source/WebCore/ChangeLog 2019-03-13 04:24:47 UTC (rev 242842)
@@ -1,3 +1,28 @@
+2019-03-12 Ross Kirsling <[email protected]>
+
+ [Win] Fix a slew of simple clang-cl warnings.
+ https://bugs.webkit.org/show_bug.cgi?id=195652
+
+ Reviewed by Don Olmstead.
+
+ * page/AutoscrollController.cpp:
+ (WebCore::AutoscrollController::handleMouseReleaseEvent): -Wswitch
+ * platform/network/curl/CurlContext.cpp:
+ (WebCore::CurlHandle::willSetupSslCtx):
+ (WebCore::CurlHandle::appendRequestHeaders): -Wunused-variable
+ * platform/network/curl/CurlFormDataStream.cpp:
+ (WebCore::CurlFormDataStream::computeContentLength): -Wunused-variable
+ * platform/network/curl/CurlRequest.cpp:
+ (WebCore::CurlRequest::CurlRequest): -Wreorder
+ (WebCore::CurlRequest::setupTransfer): -Wunused-variable
+ * platform/network/curl/CurlSSLVerifier.cpp:
+ (WebCore::CurlSSLVerifier::CurlSSLVerifier):
+ * platform/network/curl/CurlSSLVerifier.h: -Wunused-private-field
+ * platform/win/LoggingWin.cpp:
+ (WebCore::logLevelString): -Wwritable-strings
+ * rendering/RenderThemeWin.cpp: -Wunused-const-variable (x2)
+ (WebCore::RenderThemeWin::getThemeData): -Wswitch
+
2019-03-12 Ryosuke Niwa <[email protected]>
Move the code for determining the need for touch bar quirks to Quirks class
Modified: trunk/Source/WebCore/PAL/ChangeLog (242841 => 242842)
--- trunk/Source/WebCore/PAL/ChangeLog 2019-03-13 02:34:28 UTC (rev 242841)
+++ trunk/Source/WebCore/PAL/ChangeLog 2019-03-13 04:24:47 UTC (rev 242842)
@@ -1,3 +1,13 @@
+2019-03-12 Ross Kirsling <[email protected]>
+
+ [Win] Fix a slew of simple clang-cl warnings.
+ https://bugs.webkit.org/show_bug.cgi?id=195652
+
+ Reviewed by Don Olmstead.
+
+ * pal/win/LoggingWin.cpp:
+ (PAL::logLevelString): -Wwritable-strings
+
2019-03-12 Timothy Hatcher <[email protected]>
Expose document attributes and body background color through HTMLConverter.
Modified: trunk/Source/WebCore/PAL/pal/win/LoggingWin.cpp (242841 => 242842)
--- trunk/Source/WebCore/PAL/pal/win/LoggingWin.cpp 2019-03-13 02:34:28 UTC (rev 242841)
+++ trunk/Source/WebCore/PAL/pal/win/LoggingWin.cpp 2019-03-13 04:24:47 UTC (rev 242842)
@@ -37,7 +37,7 @@
String logLevelString()
{
#if !LOG_DISABLED
- static char* const loggingEnvironmentVariable = "WebCoreLogging";
+ static const char* loggingEnvironmentVariable = "WebCoreLogging";
DWORD length = GetEnvironmentVariableA(loggingEnvironmentVariable, 0, 0);
if (!length)
return emptyString();
Modified: trunk/Source/WebCore/page/AutoscrollController.cpp (242841 => 242842)
--- trunk/Source/WebCore/page/AutoscrollController.cpp 2019-03-13 02:34:28 UTC (rev 242841)
+++ trunk/Source/WebCore/page/AutoscrollController.cpp 2019-03-13 04:24:47 UTC (rev 242842)
@@ -199,6 +199,8 @@
case AutoscrollForPanCanStop:
stopAutoscrollTimer();
break;
+ default:
+ break;
}
}
Modified: trunk/Source/WebCore/platform/network/curl/CurlContext.cpp (242841 => 242842)
--- trunk/Source/WebCore/platform/network/curl/CurlContext.cpp 2019-03-13 02:34:28 UTC (rev 242841)
+++ trunk/Source/WebCore/platform/network/curl/CurlContext.cpp 2019-03-13 04:24:47 UTC (rev 242842)
@@ -330,7 +330,7 @@
return CURLE_ABORTED_BY_CALLBACK;
if (!m_sslVerifier)
- m_sslVerifier = std::make_unique<CurlSSLVerifier>(*this, sslCtx);
+ m_sslVerifier = std::make_unique<CurlSSLVerifier>(sslCtx);
return CURLE_OK;
}
@@ -386,10 +386,8 @@
void CurlHandle::appendRequestHeaders(const HTTPHeaderMap& headers)
{
if (headers.size()) {
- for (auto& entry : headers) {
- auto& value = entry.value;
+ for (auto& entry : headers)
appendRequestHeader(entry.key, entry.value);
- }
}
}
Modified: trunk/Source/WebCore/platform/network/curl/CurlFormDataStream.cpp (242841 => 242842)
--- trunk/Source/WebCore/platform/network/curl/CurlFormDataStream.cpp 2019-03-13 02:34:28 UTC (rev 242841)
+++ trunk/Source/WebCore/platform/network/curl/CurlFormDataStream.cpp 2019-03-13 04:24:47 UTC (rev 242842)
@@ -97,8 +97,6 @@
void CurlFormDataStream::computeContentLength()
{
- static auto maxCurlOffT = CurlHandle::maxCurlOffT();
-
if (!m_formData || m_isContentLengthUpdated)
return;
Modified: trunk/Source/WebCore/platform/network/curl/CurlRequest.cpp (242841 => 242842)
--- trunk/Source/WebCore/platform/network/curl/CurlRequest.cpp 2019-03-13 02:34:28 UTC (rev 242841)
+++ trunk/Source/WebCore/platform/network/curl/CurlRequest.cpp 2019-03-13 04:24:47 UTC (rev 242842)
@@ -39,12 +39,12 @@
namespace WebCore {
CurlRequest::CurlRequest(const ResourceRequest&request, CurlRequestClient* client, ShouldSuspend shouldSuspend, EnableMultipart enableMultipart, CaptureNetworkLoadMetrics captureExtraMetrics, MessageQueue<Function<void()>>* messageQueue)
- : m_request(request.isolatedCopy())
- , m_client(client)
+ : m_client(client)
+ , m_messageQueue(messageQueue)
+ , m_request(request.isolatedCopy())
, m_shouldSuspend(shouldSuspend == ShouldSuspend::Yes)
, m_enableMultipart(enableMultipart == EnableMultipart::Yes)
, m_formDataStream(m_request.httpBody())
- , m_messageQueue(messageQueue)
, m_captureExtraMetrics(captureExtraMetrics == CaptureNetworkLoadMetrics::Extended)
{
ASSERT(isMainThread());
@@ -186,8 +186,6 @@
CURL* CurlRequest::setupTransfer()
{
- auto& sslHandle = CurlContext::singleton().sslHandle();
-
auto httpHeaderFields = m_request.httpHeaderFields();
appendAcceptLanguageHeader(httpHeaderFields);
Modified: trunk/Source/WebCore/platform/network/curl/CurlSSLVerifier.cpp (242841 => 242842)
--- trunk/Source/WebCore/platform/network/curl/CurlSSLVerifier.cpp 2019-03-13 02:34:28 UTC (rev 242841)
+++ trunk/Source/WebCore/platform/network/curl/CurlSSLVerifier.cpp 2019-03-13 04:24:47 UTC (rev 242842)
@@ -37,8 +37,7 @@
static Vector<CertificateInfo::Certificate> pemDataFromCtx(X509StoreCTX*);
static CurlSSLVerifier::SSLCertificateFlags convertToSSLCertificateFlags(unsigned);
-CurlSSLVerifier::CurlSSLVerifier(CurlHandle& curlHandle, void* sslCtx)
- : m_curlHandle(curlHandle)
+CurlSSLVerifier::CurlSSLVerifier(void* sslCtx)
{
auto* ctx = static_cast<SSL_CTX*>(sslCtx);
const auto& sslHandle = CurlContext::singleton().sslHandle();
Modified: trunk/Source/WebCore/platform/network/curl/CurlSSLVerifier.h (242841 => 242842)
--- trunk/Source/WebCore/platform/network/curl/CurlSSLVerifier.h 2019-03-13 02:34:28 UTC (rev 242841)
+++ trunk/Source/WebCore/platform/network/curl/CurlSSLVerifier.h 2019-03-13 04:24:47 UTC (rev 242842)
@@ -50,7 +50,7 @@
SSL_CERTIFICATE_GENERIC_ERROR = (1 << 6) // Some other error occurred validating the certificate
};
- CurlSSLVerifier(CurlHandle&, void* sslCtx);
+ CurlSSLVerifier(void* sslCtx);
int sslErrors() { return m_sslErrors; }
const CertificateInfo& certificateInfo() const { return m_certificateInfo; }
@@ -58,8 +58,6 @@
private:
static int verifyCallback(int, X509StoreCTX*);
- CurlHandle& m_curlHandle;
-
int m_sslErrors { 0 };
CertificateInfo m_certificateInfo;
Modified: trunk/Source/WebCore/platform/win/LoggingWin.cpp (242841 => 242842)
--- trunk/Source/WebCore/platform/win/LoggingWin.cpp 2019-03-13 02:34:28 UTC (rev 242841)
+++ trunk/Source/WebCore/platform/win/LoggingWin.cpp 2019-03-13 04:24:47 UTC (rev 242842)
@@ -37,7 +37,7 @@
String logLevelString()
{
#if !LOG_DISABLED
- static char* const loggingEnvironmentVariable = "WebCoreLogging";
+ static const char* loggingEnvironmentVariable = "WebCoreLogging";
DWORD length = GetEnvironmentVariableA(loggingEnvironmentVariable, 0, 0);
if (!length)
return emptyString();
Modified: trunk/Source/WebCore/rendering/RenderThemeWin.cpp (242841 => 242842)
--- trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2019-03-13 02:34:28 UTC (rev 242841)
+++ trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2019-03-13 04:24:47 UTC (rev 242842)
@@ -163,8 +163,6 @@
// This is the fixed width IE and Firefox use for buttons on dropdown menus
static const int dropDownButtonWidth = 17;
-static const int shell32MagnifierIconIndex = 22;
-
// Default font size to match Firefox.
static const float defaultControlFontPixelSize = 13;
@@ -612,6 +610,8 @@
result.m_part = subPart == SpinButtonUp ? SPNP_UP : SPNP_DOWN;
result.m_state = determineSpinButtonState(o, subPart);
break;
+ default:
+ break;
}
return result;
@@ -1021,8 +1021,6 @@
}
#if ENABLE(VIDEO)
-static const size_t maximumReasonableBufferSize = 32768;
-
static void fillBufferWithContentsOfFile(FileSystem::PlatformFileHandle file, long long filesize, Vector<char>& buffer)
{
// Load the file content into buffer
Modified: trunk/Source/WebKit/ChangeLog (242841 => 242842)
--- trunk/Source/WebKit/ChangeLog 2019-03-13 02:34:28 UTC (rev 242841)
+++ trunk/Source/WebKit/ChangeLog 2019-03-13 04:24:47 UTC (rev 242842)
@@ -1,3 +1,19 @@
+2019-03-12 Ross Kirsling <[email protected]>
+
+ [Win] Fix a slew of simple clang-cl warnings.
+ https://bugs.webkit.org/show_bug.cgi?id=195652
+
+ Reviewed by Don Olmstead.
+
+ * NetworkProcess/curl/NetworkDataTaskCurl.cpp:
+ (WebKit::NetworkDataTaskCurl::invokeDidReceiveResponse): -Wswitch
+ * Platform/IPC/win/ConnectionWin.cpp:
+ (IPC::Connection::readEventHandler): -Wunused-variable
+ * Platform/win/LoggingWin.cpp:
+ (WebKit::logLevelString): -Wwritable-strings
+ * UIProcess/Launcher/win/ProcessLauncherWin.cpp:
+ (WebKit::ProcessLauncher::launchProcess): -Wunused-variable
+
2019-03-12 Ryosuke Niwa <[email protected]>
Move the code for determining the need for touch bar quirks to Quirks class
Modified: trunk/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp (242841 => 242842)
--- trunk/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp 2019-03-13 02:34:28 UTC (rev 242841)
+++ trunk/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp 2019-03-13 04:24:47 UTC (rev 242842)
@@ -230,7 +230,7 @@
break;
case PolicyAction::Ignore:
break;
- case PolicyAction::Download:
+ default:
notImplemented();
break;
}
Modified: trunk/Source/WebKit/Platform/IPC/win/ConnectionWin.cpp (242841 => 242842)
--- trunk/Source/WebKit/Platform/IPC/win/ConnectionWin.cpp 2019-03-13 02:34:28 UTC (rev 242841)
+++ trunk/Source/WebKit/Platform/IPC/win/ConnectionWin.cpp 2019-03-13 04:24:47 UTC (rev 242842)
@@ -123,7 +123,6 @@
m_readBuffer.grow(m_readBuffer.size() + bytesToRead);
if (!::ReadFile(m_connectionPipe, m_readBuffer.data() + numberOfBytesRead, bytesToRead, 0, &m_readListener.state())) {
- DWORD error = ::GetLastError();
ASSERT_NOT_REACHED();
return;
}
Modified: trunk/Source/WebKit/Platform/win/LoggingWin.cpp (242841 => 242842)
--- trunk/Source/WebKit/Platform/win/LoggingWin.cpp 2019-03-13 02:34:28 UTC (rev 242841)
+++ trunk/Source/WebKit/Platform/win/LoggingWin.cpp 2019-03-13 04:24:47 UTC (rev 242842)
@@ -38,8 +38,7 @@
String logLevelString()
{
#if !LOG_DISABLED
- static char* const loggingEnvironmentVariable = "WebKitLogging";
-
+ static const char* loggingEnvironmentVariable = "WebKitLogging";
DWORD length = GetEnvironmentVariableA(loggingEnvironmentVariable, 0, 0);
if (!length)
return emptyString();
Modified: trunk/Source/WebKit/UIProcess/Launcher/win/ProcessLauncherWin.cpp (242841 => 242842)
--- trunk/Source/WebKit/UIProcess/Launcher/win/ProcessLauncherWin.cpp 2019-03-13 02:34:28 UTC (rev 242841)
+++ trunk/Source/WebKit/UIProcess/Launcher/win/ProcessLauncherWin.cpp 2019-03-13 04:24:47 UTC (rev 242842)
@@ -98,7 +98,6 @@
if (!result) {
// FIXME: What should we do here?
- DWORD error = ::GetLastError();
ASSERT_NOT_REACHED();
}
Modified: trunk/Source/WebKitLegacy/win/ChangeLog (242841 => 242842)
--- trunk/Source/WebKitLegacy/win/ChangeLog 2019-03-13 02:34:28 UTC (rev 242841)
+++ trunk/Source/WebKitLegacy/win/ChangeLog 2019-03-13 04:24:47 UTC (rev 242842)
@@ -1,3 +1,39 @@
+2019-03-12 Ross Kirsling <[email protected]>
+
+ [Win] Fix a slew of simple clang-cl warnings.
+ https://bugs.webkit.org/show_bug.cgi?id=195652
+
+ Reviewed by Don Olmstead.
+
+ * Interfaces/AccessibleComparable.idl: -Wmissing-braces
+ * Plugins/PluginDatabaseWin.cpp: -Wunused-function
+ (WebCore::addJavaPluginDirectory): Deleted.
+ * WebCoreSupport/AcceleratedCompositingContext.cpp:
+ (AcceleratedCompositingContext::AcceleratedCompositingContext): -Wreorder
+ * WebCoreSupport/WebEditorClient.cpp:
+ (WebEditorUndoCommand::WebEditorUndoCommand): -Wreorder
+ (undoNameForEditAction): -Wswitch
+ * WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebFrameLoaderClient::WebFrameLoaderClient): -Wswitch
+ (WebFrameLoaderClient::updateGlobalHistoryRedirectLinks): -Wunused-variable
+ * WebCoreSupport/WebInspectorClient.cpp:
+ (WebInspectorFrontendClient::WebInspectorFrontendClient): -Wreorder
+ * WebCoreSupport/WebInspectorClient.h: -Winconsistent-missing-override
+ * WebError.cpp:
+ (WebError::WebError): -Wreorder
+ * WebFrame.cpp:
+ (WebFrame::stringByEvaluatingJavaScriptInScriptWorld): -Wlogical-op-parentheses
+ * WebHistory.cpp: -Wunused-function (x5)
+ (areEqualOrClose): Deleted.
+ (addDayToSystemTime): Deleted.
+ (getDayBoundaries): Deleted.
+ (beginningOfDay): Deleted.
+ (dateKey): Deleted.
+ * WebNotificationCenter.cpp:
+ (WebNotificationCenter::removeObserver): -Wunused-variable
+ * WebView.cpp: -Wunused-function, -Wreorder
+ (WebView::addVisitedLinks): -Wunused-variable
+
2019-03-11 Ryan Haddad <[email protected]>
Unreviewed, rolling out r242688, r242643, r242624.
Modified: trunk/Source/WebKitLegacy/win/Interfaces/AccessibleComparable.idl (242841 => 242842)
--- trunk/Source/WebKitLegacy/win/Interfaces/AccessibleComparable.idl 2019-03-13 02:34:28 UTC (rev 242841)
+++ trunk/Source/WebKitLegacy/win/Interfaces/AccessibleComparable.idl 2019-03-13 04:24:47 UTC (rev 242842)
@@ -31,7 +31,7 @@
import "oleacc.idl";
import "Accessible2_2.idl";
-cpp_quote("extern const GUID __declspec(selectany) SID_AccessibleComparable = { 0x62b8cb5f, 0xfb7a, 0x4faf, 0x81, 0xe8, 0x52, 0xb6, 0x5f, 0x12, 0x8b, 0x31 };")
+cpp_quote("extern const GUID __declspec(selectany) SID_AccessibleComparable = { 0x62b8cb5f, 0xfb7a, 0x4faf, { 0x81, 0xe8, 0x52, 0xb6, 0x5f, 0x12, 0x8b, 0x31 } };")
[
object,
Modified: trunk/Source/WebKitLegacy/win/Plugins/PluginDatabaseWin.cpp (242841 => 242842)
--- trunk/Source/WebKitLegacy/win/Plugins/PluginDatabaseWin.cpp 2019-03-13 02:34:28 UTC (rev 242841)
+++ trunk/Source/WebKitLegacy/win/Plugins/PluginDatabaseWin.cpp 2019-03-13 04:24:47 UTC (rev 242842)
@@ -268,56 +268,6 @@
RegCloseKey(key);
}
-static inline void addJavaPluginDirectory(Vector<String>& directories)
-{
- HKEY key;
- HRESULT result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT("Software\\JavaSoft\\Java Plug-in"), 0, KEY_READ, &key);
- if (result != ERROR_SUCCESS)
- return;
-
- WCHAR name[128];
- FILETIME lastModified;
-
- Vector<int> latestJavaVersion;
- String latestJavaVersionString;
-
- // Enumerate subkeys
- for (int i = 0;; i++) {
- DWORD nameLen = sizeof(name) / sizeof(WCHAR);
- result = RegEnumKeyExW(key, i, name, &nameLen, 0, 0, 0, &lastModified);
-
- if (result != ERROR_SUCCESS)
- break;
-
- Vector<int> javaVersion = parseVersionString(String(name, nameLen));
- if (compareVersions(javaVersion, latestJavaVersion)) {
- latestJavaVersion = javaVersion;
- latestJavaVersionString = String(name, nameLen);
- }
- }
-
- if (!latestJavaVersionString.isEmpty()) {
- DWORD type;
- WCHAR javaInstallPathStr[_MAX_PATH];
- DWORD javaInstallPathSize = sizeof(javaInstallPathStr);
- DWORD useNewPluginValue;
- DWORD useNewPluginSize;
-
- String javaPluginKeyPath = "Software\\JavaSoft\\Java Plug-in\\" + latestJavaVersionString;
- result = getRegistryValue(HKEY_LOCAL_MACHINE, javaPluginKeyPath.wideCharacters().data(), L"UseNewJavaPlugin", &type, &useNewPluginValue, &useNewPluginSize);
-
- if (result == ERROR_SUCCESS && useNewPluginValue == 1) {
- result = getRegistryValue(HKEY_LOCAL_MACHINE, javaPluginKeyPath.wideCharacters().data(), L"JavaHome", &type, javaInstallPathStr, &javaInstallPathSize);
- if (result == ERROR_SUCCESS) {
- String javaPluginDirectory = String(javaInstallPathStr, javaInstallPathSize / sizeof(WCHAR) - 1) + "\\bin\\new_plugin";
- directories.append(javaPluginDirectory);
- }
- }
- }
-
- RegCloseKey(key);
-}
-
static inline String safariPluginsDirectory()
{
WCHAR moduleFileNameStr[_MAX_PATH];
Modified: trunk/Source/WebKitLegacy/win/WebCoreSupport/AcceleratedCompositingContext.cpp (242841 => 242842)
--- trunk/Source/WebKitLegacy/win/WebCoreSupport/AcceleratedCompositingContext.cpp 2019-03-13 02:34:28 UTC (rev 242841)
+++ trunk/Source/WebKitLegacy/win/WebCoreSupport/AcceleratedCompositingContext.cpp 2019-03-13 04:24:47 UTC (rev 242842)
@@ -53,9 +53,9 @@
AcceleratedCompositingContext::AcceleratedCompositingContext(WebView& webView)
: m_webView(webView)
- , m_layerFlushTimer(*this)
, m_context(nullptr)
, m_window(0)
+ , m_layerFlushTimer(*this)
{
}
Modified: trunk/Source/WebKitLegacy/win/WebCoreSupport/WebEditorClient.cpp (242841 => 242842)
--- trunk/Source/WebKitLegacy/win/WebCoreSupport/WebEditorClient.cpp 2019-03-13 02:34:28 UTC (rev 242841)
+++ trunk/Source/WebKitLegacy/win/WebCoreSupport/WebEditorClient.cpp 2019-03-13 04:24:47 UTC (rev 242842)
@@ -521,9 +521,9 @@
};
WebEditorUndoCommand::WebEditorUndoCommand(UndoStep& step, bool isUndo)
- : m_step(step)
- , m_isUndo(isUndo)
- , m_refCount(1)
+ : m_refCount(1)
+ , m_step(step)
+ , m_isUndo(isUndo)
{
}
@@ -623,8 +623,8 @@
case EditAction::FormatBlock: return WEB_UI_STRING_KEY("Formatting", "Format Block (Undo action name)", "Undo action name");
case EditAction::Indent: return WEB_UI_STRING_KEY("Indent", "Indent (Undo action name)", "Undo action name");
case EditAction::Outdent: return WEB_UI_STRING_KEY("Outdent", "Outdent (Undo action name)", "Undo action name");
+ default: return String();
}
- return String();
}
void WebEditorClient::registerUndoStep(UndoStep& step)
Modified: trunk/Source/WebKitLegacy/win/WebCoreSupport/WebFrameLoaderClient.cpp (242841 => 242842)
--- trunk/Source/WebKitLegacy/win/WebCoreSupport/WebFrameLoaderClient.cpp 2019-03-13 02:34:28 UTC (rev 242841)
+++ trunk/Source/WebKitLegacy/win/WebCoreSupport/WebFrameLoaderClient.cpp 2019-03-13 04:24:47 UTC (rev 242842)
@@ -107,9 +107,9 @@
};
WebFrameLoaderClient::WebFrameLoaderClient(WebFrame* webFrame)
- : m_webFrame(webFrame)
+ : m_policyListenerPrivate(std::make_unique<WebFramePolicyListenerPrivate>())
+ , m_webFrame(webFrame)
, m_manualLoader(0)
- , m_policyListenerPrivate(std::make_unique<WebFramePolicyListenerPrivate>())
, m_hasSentResponseToPlugin(false)
{
}
@@ -745,8 +745,6 @@
COMPtr<IWebHistoryDelegate> historyDelegate;
webView->historyDelegate(&historyDelegate);
- WebHistory* history = WebHistory::sharedHistory();
-
DocumentLoader* loader = core(m_webFrame)->loader().documentLoader();
ASSERT(loader->unreachableURL().isEmpty());
Modified: trunk/Source/WebKitLegacy/win/WebCoreSupport/WebInspectorClient.cpp (242841 => 242842)
--- trunk/Source/WebKitLegacy/win/WebCoreSupport/WebInspectorClient.cpp 2019-03-13 02:34:28 UTC (rev 242841)
+++ trunk/Source/WebKitLegacy/win/WebCoreSupport/WebInspectorClient.cpp 2019-03-13 04:24:47 UTC (rev 242842)
@@ -219,8 +219,8 @@
: InspectorFrontendClientLocal(&inspectedWebView->page()->inspectorController(), core(frontendWebView.get()), WTFMove(settings))
, m_inspectedWebView(inspectedWebView)
, m_inspectedWebViewHwnd(inspectedWebViewHwnd)
+ , m_frontendHwnd(frontendHwnd)
, m_inspectorClient(inspectorClient)
- , m_frontendHwnd(frontendHwnd)
, m_frontendWebView(frontendWebView)
, m_frontendWebViewHwnd(frontendWebViewHwnd)
, m_attached(false)
Modified: trunk/Source/WebKitLegacy/win/WebCoreSupport/WebInspectorClient.h (242841 => 242842)
--- trunk/Source/WebKitLegacy/win/WebCoreSupport/WebInspectorClient.h 2019-03-13 02:34:28 UTC (rev 242841)
+++ trunk/Source/WebKitLegacy/win/WebCoreSupport/WebInspectorClient.h 2019-03-13 04:24:47 UTC (rev 242842)
@@ -128,7 +128,7 @@
LRESULT onClose(WPARAM, LPARAM);
LRESULT onSetFocus();
- virtual void windowReceivedMessage(HWND, UINT message, WPARAM, LPARAM);
+ void windowReceivedMessage(HWND, UINT message, WPARAM, LPARAM) override;
void onWebViewWindowPosChanging(WPARAM, LPARAM);
Modified: trunk/Source/WebKitLegacy/win/WebError.cpp (242841 => 242842)
--- trunk/Source/WebKitLegacy/win/WebError.cpp 2019-03-13 02:34:28 UTC (rev 242841)
+++ trunk/Source/WebKitLegacy/win/WebError.cpp 2019-03-13 04:24:47 UTC (rev 242842)
@@ -42,8 +42,8 @@
// WebError ---------------------------------------------------------------------
WebError::WebError(const ResourceError& error, IPropertyBag* userInfo)
- : m_error(error)
- , m_userInfo(userInfo)
+ : m_userInfo(userInfo)
+ , m_error(error)
{
gClassCount++;
gClassNameCount().add("WebError");
Modified: trunk/Source/WebKitLegacy/win/WebFrame.cpp (242841 => 242842)
--- trunk/Source/WebKitLegacy/win/WebFrame.cpp 2019-03-13 02:34:28 UTC (rev 242841)
+++ trunk/Source/WebKitLegacy/win/WebFrame.cpp 2019-03-13 04:24:47 UTC (rev 242842)
@@ -2019,7 +2019,7 @@
// This bizarre set of rules matches behavior from WebKit for Safari 2.0.
// If you don't like it, use -[WebScriptObject evaluateWebScript:] or
// JSEvaluateScript instead, since they have less surprising semantics.
- if (!result || !result.isBoolean() && !result.isString() && !result.isNumber())
+ if (!result || (!result.isBoolean() && !result.isString() && !result.isNumber()))
return S_OK;
JSC::ExecState* exec = anyWorldGlobalObject->globalExec();
Modified: trunk/Source/WebKitLegacy/win/WebHistory.cpp (242841 => 242842)
--- trunk/Source/WebKitLegacy/win/WebHistory.cpp 2019-03-13 02:34:28 UTC (rev 242841)
+++ trunk/Source/WebKitLegacy/win/WebHistory.cpp 2019-03-13 04:24:47 UTC (rev 242842)
@@ -53,12 +53,6 @@
using namespace WebCore;
-static bool areEqualOrClose(double d1, double d2)
-{
- double diff = d1-d2;
- return (diff < .000001 && diff > -.000001);
-}
-
static COMPtr<IPropertyBag> createUserInfoFromArray(BSTR notificationStr, IWebHistoryItem** data, size_t size)
{
#if USE(CF)
@@ -91,65 +85,6 @@
return createUserInfoFromArray(notificationStr, &item, 1);
}
-static inline void addDayToSystemTime(SYSTEMTIME& systemTime)
-{
- systemTime.wDay += 1;
- if (systemTime.wDay > 31) {
- systemTime.wDay = 1;
- systemTime.wMonth += 1;
- }
- if (systemTime.wMonth > 12) {
- systemTime.wMonth = 1;
- systemTime.wYear += 1;
- }
-
- // Convert to and from VariantTime to fix invalid dates like 2001-04-31.
- DATE date = 0.0;
- ::SystemTimeToVariantTime(&systemTime, &date);
- ::VariantTimeToSystemTime(date, &systemTime);
-}
-
-static void getDayBoundaries(DATE day, DATE& beginningOfDay, DATE& beginningOfNextDay)
-{
- SYSTEMTIME systemTime;
- ::VariantTimeToSystemTime(day, &systemTime);
-
- SYSTEMTIME beginningLocalTime;
- ::SystemTimeToTzSpecificLocalTime(0, &systemTime, &beginningLocalTime);
- beginningLocalTime.wHour = 0;
- beginningLocalTime.wMinute = 0;
- beginningLocalTime.wSecond = 0;
- beginningLocalTime.wMilliseconds = 0;
-
- SYSTEMTIME beginningOfNextDayLocalTime = beginningLocalTime;
- addDayToSystemTime(beginningOfNextDayLocalTime);
-
- SYSTEMTIME beginningSystemTime;
- if (::TzSpecificLocalTimeToSystemTime(0, &beginningLocalTime, &beginningSystemTime))
- ::SystemTimeToVariantTime(&beginningSystemTime, &beginningOfDay);
-
- SYSTEMTIME beginningOfNextDaySystemTime;
- if (::TzSpecificLocalTimeToSystemTime(0, &beginningOfNextDayLocalTime, &beginningOfNextDaySystemTime))
- ::SystemTimeToVariantTime(&beginningOfNextDaySystemTime, &beginningOfNextDay);
-}
-
-static inline DATE beginningOfDay(DATE date)
-{
- static DATE cachedBeginningOfDay = std::numeric_limits<DATE>::quiet_NaN();
- static DATE cachedBeginningOfNextDay;
- if (!(date >= cachedBeginningOfDay && date < cachedBeginningOfNextDay))
- getDayBoundaries(date, cachedBeginningOfDay, cachedBeginningOfNextDay);
- return cachedBeginningOfDay;
-}
-
-static inline WebHistory::DateKey dateKey(DATE date)
-{
- // Converting from double (DATE) to int64_t (WebHistoryDateKey) is safe
- // here because all sensible dates are in the range -2**48 .. 2**47 which
- // safely fits in an int64_t.
- return beginningOfDay(date) * secondsPerDay;
-}
-
// WebHistory -----------------------------------------------------------------
WebHistory::WebHistory()
Modified: trunk/Source/WebKitLegacy/win/WebNotificationCenter.cpp (242841 => 242842)
--- trunk/Source/WebKitLegacy/win/WebNotificationCenter.cpp 2019-03-13 02:34:28 UTC (rev 242841)
+++ trunk/Source/WebKitLegacy/win/WebNotificationCenter.cpp 2019-03-13 04:24:47 UTC (rev 242842)
@@ -189,8 +189,6 @@
return E_FAIL;
ObjectObserverList& observerList = it->value;
- ObserverListIterator end = observerList.end();
-
observerList.removeFirstMatching([anObject, anObserver] (const ObjectObserverPair& pair) {
IUnknown* observedObject = pair.first.get();
IWebNotificationObserver* observer = pair.second.get();
Modified: trunk/Source/WebKitLegacy/win/WebView.cpp (242841 => 242842)
--- trunk/Source/WebKitLegacy/win/WebView.cpp 2019-03-13 02:34:28 UTC (rev 242841)
+++ trunk/Source/WebKitLegacy/win/WebView.cpp 2019-03-13 04:24:47 UTC (rev 242842)
@@ -389,8 +389,6 @@
static const int delayBeforeDeletingBackingStoreMsec = 5000;
-static ATOM registerWebView();
-
static void initializeStaticObservers();
static HRESULT updateSharedSettingsFromPreferencesIfNeeded(IWebPreferences*);
@@ -7107,8 +7105,6 @@
HRESULT WebView::addVisitedLinks(__inout_ecount_full(visitedURLCount) BSTR* visitedURLs, unsigned visitedURLCount)
{
auto& visitedLinkStore = m_webViewGroup->visitedLinkStore();
- PageGroup& group = core(this)->group();
-
for (unsigned i = 0; i < visitedURLCount; ++i) {
BSTR url = ""
unsigned length = SysStringLen(url);
@@ -7404,7 +7400,9 @@
UINT m_index;
Vector<IntRect> m_rects;
public:
- EnumTextMatches(Vector<IntRect>* rects) : m_index(0), m_ref(1)
+ EnumTextMatches(Vector<IntRect>* rects)
+ : m_ref(1)
+ , m_index(0)
{
m_rects = *rects;
}
Modified: trunk/Tools/ChangeLog (242841 => 242842)
--- trunk/Tools/ChangeLog 2019-03-13 02:34:28 UTC (rev 242841)
+++ trunk/Tools/ChangeLog 2019-03-13 04:24:47 UTC (rev 242842)
@@ -1,3 +1,13 @@
+2019-03-12 Ross Kirsling <[email protected]>
+
+ [Win] Fix a slew of simple clang-cl warnings.
+ https://bugs.webkit.org/show_bug.cgi?id=195652
+
+ Reviewed by Don Olmstead.
+
+ * WebKitTestRunner/win/PlatformWebViewWin.cpp:
+ (WTR::PlatformWebView::windowSnapshotImage): -Wunused-variable
+
2019-03-12 Justin Fan <[email protected]>
[Web GPU] Update GPURenderPipelineDescriptor and add GPUColorStateDescriptor.format
Modified: trunk/Tools/WebKitTestRunner/win/PlatformWebViewWin.cpp (242841 => 242842)
--- trunk/Tools/WebKitTestRunner/win/PlatformWebViewWin.cpp 2019-03-13 02:34:28 UTC (rev 242841)
+++ trunk/Tools/WebKitTestRunner/win/PlatformWebViewWin.cpp 2019-03-13 04:24:47 UTC (rev 242842)
@@ -212,7 +212,6 @@
auto memoryDC = adoptGDIObject(::CreateCompatibleDC(windowDC));
BITMAPINFO bitmapInfo { };
- WKRect wkFrame = windowFrame();
bitmapInfo.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
bitmapInfo.bmiHeader.biWidth = width;
bitmapInfo.bmiHeader.biHeight = -height;
