Attachment 340680 Details for Bug 185224 – Patch

[patch] Patch

bug-185224-20180518143209.patch (text/plain), 6.99 KB, created by Fujii Hironori on 2018-05-17 22:32:10 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2018-05-17 22:32:10 PDT

Size: 6.99 KB

patch

obsolete

>Subversion Revision: 231940
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 4068cc976f3ac30a1c4ab69beba0a33be62320c0..3a5c87a25502e9b7923f9392c0becb60bdd350cf 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-05-17  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        [Curl] Remove unused SystemProxyWin.cpp
>+        https://bugs.webkit.org/show_bug.cgi?id=185224
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        SystemProxyWin is not used at the moment. Remove it.
>+
>+        * NetworkProcess/win/SystemProxyWin.cpp: Removed.
>+        * NetworkProcess/win/SystemProxyWin.h: Removed.
>+        * PlatformWin.cmake: Removed SystemProxyWin.cpp.
>+
> 2018-05-17  Nan Wang  <n_wang@apple.com>
> 
>         AX: [macOS] Expose the primary screen height through AX API
>diff --git a/Source/WebKit/NetworkProcess/win/SystemProxyWin.cpp b/Source/WebKit/NetworkProcess/win/SystemProxyWin.cpp
>deleted file mode 100644
>index d1732ddb4b5121b83b099da9f9e68499bac5f0a6..0000000000000000000000000000000000000000
>--- a/Source/WebKit/NetworkProcess/win/SystemProxyWin.cpp
>+++ /dev/null
>@@ -1,96 +0,0 @@
>-/*
>- * Copyright (C) 2017 Sony Interactive Entertainment Inc.
>- *
>- * Redistribution and use in source and binary forms, with or without
>- * modification, are permitted provided that the following conditions
>- * are met:
>- * 1. Redistributions of source code must retain the above copyright
>- *    notice, this list of conditions and the following disclaimer.
>- * 2. Redistributions in binary form must reproduce the above copyright
>- *    notice, this list of conditions and the following disclaimer in the
>- *    documentation and/or other materials provided with the distribution.
>- *
>- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>- * THE POSSIBILITY OF SUCH DAMAGE.
>- */
>-
>-#include "config.h"
>-#include "SystemProxyWin.h"
>-
>-#include <WebCore/CurlContext.h>
>-
>-bool WindowsSystemProxy::getSystemHttpProxy(char* buffer, int bufferLen, int* port)
>-{
>-    Vector<TCHAR> tRegBuffer(bufferLen);
>-    Vector<TCHAR> tHost(bufferLen);
>-    DWORD type;
>-    DWORD size;
>-    HKEY key;
>-
>-    LONG ret = RegOpenKeyEx(HKEY_CURRENT_USER,
>-        L"Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings",
>-        0,
>-        KEY_READ,
>-        &key);
>-    if (ret != ERROR_SUCCESS)
>-        return false;
>-
>-    size = bufferLen - 1;
>-    ret = RegQueryValueEx(key,
>-        L"ProxyServer",
>-        nullptr,
>-        &type,
>-        (LPBYTE)tRegBuffer.data(),
>-        &size);
>-
>-    if (ret != ERROR_SUCCESS)
>-        return false;
>-
>-    if (!parseProxyString(tRegBuffer.data(), tHost.data(), bufferLen, port))
>-        return false;
>-
>-    wcstombs(buffer, tHost.data(), bufferLen);
>-    buffer[bufferLen-1] = '\0';
>-    return true;
>-}
>-
>-void WindowsSystemProxy::setCurlHttpProxy(char* proxy, int port)
>-{
>-    WebCore::CurlContext::singleton().setProxyInfo(proxy, port);
>-}
>-
>-void WindowsSystemProxy::setCurlHttpProxy()
>-{
>-    char proxy[ProxyServerNameLength];
>-    int port;
>-    if (getSystemHttpProxy(proxy, ProxyServerNameLength, &port))
>-        setCurlHttpProxy(proxy, port);
>-}
>-
>-bool WindowsSystemProxy::parseProxyString(const TCHAR* regProxyString, TCHAR* hostString, int hostStringLen, int* port)
>-{
>-    const TCHAR* found = wcschr(regProxyString, L':');
>-    if (!found)
>-        return false;
>-
>-    int len = found - regProxyString;
>-    if (len >= hostStringLen)
>-        return false;
>-
>-    wcsncpy(hostString, regProxyString, hostStringLen);
>-    hostString[len] = L'\0';
>-
>-    TCHAR* portStr = const_cast<TCHAR*>(found) + 1;
>-    *port = _wtoi(portStr);
>-
>-    return true;
>-}
>diff --git a/Source/WebKit/NetworkProcess/win/SystemProxyWin.h b/Source/WebKit/NetworkProcess/win/SystemProxyWin.h
>deleted file mode 100644
>index 95609288be6c943bbbe79662eb6f324d65c4d59a..0000000000000000000000000000000000000000
>--- a/Source/WebKit/NetworkProcess/win/SystemProxyWin.h
>+++ /dev/null
>@@ -1,42 +0,0 @@
>-/*
>- * Copyright (C) 2017 Sony Interactive Entertainment Inc.
>- *
>- * Redistribution and use in source and binary forms, with or without
>- * modification, are permitted provided that the following conditions
>- * are met:
>- * 1. Redistributions of source code must retain the above copyright
>- *    notice, this list of conditions and the following disclaimer.
>- * 2. Redistributions in binary form must reproduce the above copyright
>- *    notice, this list of conditions and the following disclaimer in the
>- *    documentation and/or other materials provided with the distribution.
>- *
>- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>- * THE POSSIBILITY OF SUCH DAMAGE.
>- */
>-
>-#pragma once
>-
>-#include <windows.h>
>-
>-class WindowsSystemProxy {
>-    static const int ProxyServerNameLength = 512;
>-public:
>-    static bool getSystemHttpProxy(char* buffer, int bufferLen, int* port);
>-    static bool getSystemHttpsProxy(char* buffer, int bufferLen, int* port);
>-    static bool getSystemFtpProxy(char* buffer, int bufferLen, int* port);
>-
>-    static void setCurlHttpProxy(char* proxy, int port);
>-    static void setCurlHttpProxy();
>-
>-private:
>-    static bool parseProxyString(const TCHAR* regProxyString, TCHAR* hostString, int hostStringLen, int* port);
>-};
>diff --git a/Source/WebKit/PlatformWin.cmake b/Source/WebKit/PlatformWin.cmake
>index c745e7c19f15666a133a6723cd6fa67d2a4f2e53..a03d03f061545bc178216fd4edc58d48097995ce 100644
>--- a/Source/WebKit/PlatformWin.cmake
>+++ b/Source/WebKit/PlatformWin.cmake
>@@ -10,7 +10,6 @@ add_definitions(-DBUILDING_WEBKIT)
> 
> list(APPEND WebKit_SOURCES
>     NetworkProcess/win/NetworkProcessMainWin.cpp
>-    NetworkProcess/win/SystemProxyWin.cpp
> 
>     Platform/IPC/win/AttachmentWin.cpp
>     Platform/IPC/win/ConnectionWin.cpp

Flags:

koivisto: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 185224: 339360 | 339763 | 340680