Attachment 372946 Details for Bug 199233 – Patch

[patch] Patch

bug-199233-20190626134544.patch (text/plain), 3.58 KB, created by Ross Kirsling on 2019-06-26 13:45:47 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ross Kirsling

Created: 2019-06-26 13:45:47 PDT

Size: 3.58 KB

patch

obsolete

>Subversion Revision: 246846
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 09ee37039a62009873e10641fd6bc5667fb26374..e35ce26395564306a3363e83426743aaa31f4be2 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-06-26  Ross Kirsling  <ross.kirsling@sony.com>
>+
>+        [Win][MiniBrowser] Remove obsolete code after r246814.
>+        https://bugs.webkit.org/show_bug.cgi?id=199233
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * MiniBrowser/win/MiniBrowserWebHost.cpp:
>+        (MiniBrowserWebHost::didFinishLoadForFrame):
>+        (SimpleEventListener::SimpleEventListener): Deleted.
>+        (SimpleEventListener::handleEvent): Deleted.
>+
> 2019-06-25  Jiewen Tan  <jiewen_tan@apple.com>
> 
>         Implement a new SPI to inform clients about AppSSO
>diff --git a/Tools/MiniBrowser/win/MiniBrowserWebHost.cpp b/Tools/MiniBrowser/win/MiniBrowserWebHost.cpp
>index a604b8ce12f9a791d8efa609ee7a48c6ba3d2e26..cfc54d536c7057e029e9754ee5725f4b0034fb52 100644
>--- a/Tools/MiniBrowser/win/MiniBrowserWebHost.cpp
>+++ b/Tools/MiniBrowser/win/MiniBrowserWebHost.cpp
>@@ -29,32 +29,10 @@
> #include "stdafx.h"
> #include "MiniBrowserWebHost.h"
> 
>-#include "DOMDefaultImpl.h"
> #include "PageLoadTestClient.h"
> #include "WebKitLegacyBrowserWindow.h"
> #include <WebKitLegacy/WebKit.h>
> 
>-class SimpleEventListener : public DOMEventListener {
>-public:
>-    SimpleEventListener(LPWSTR type)
>-    {
>-        wcsncpy_s(m_eventType, 100, type, 100);
>-        m_eventType[99] = 0;
>-    }
>-
>-    virtual HRESULT STDMETHODCALLTYPE handleEvent(IDOMEvent* evt)
>-    {
>-        wchar_t message[255];
>-        wcscpy_s(message, 255, m_eventType);
>-        wcscat_s(message, 255, L" event fired!");
>-        ::MessageBox(0, message, L"Event Handler", MB_OK);
>-        return S_OK;
>-    }
>-
>-private:
>-    wchar_t m_eventType[100];
>-};
>-
> typedef _com_ptr_t<_com_IIID<IWebDataSource, &__uuidof(IWebDataSource)>> IWebDataSourcePtr;
> typedef _com_ptr_t<_com_IIID<IWebMutableURLRequest, &__uuidof(IWebMutableURLRequest)>> IWebMutableURLRequestPtr;
> 
>@@ -138,9 +116,6 @@ ULONG MiniBrowserWebHost::Release()
>     return m_client->Release();
> }
> 
>-typedef _com_ptr_t<_com_IIID<IDOMDocument, &__uuidof(IDOMDocument)>> IDOMDocumentPtr;
>-typedef _com_ptr_t<_com_IIID<IDOMElement, &__uuidof(IDOMElement)>> IDOMElementPtr;
>-typedef _com_ptr_t<_com_IIID<IDOMEventTarget, &__uuidof(IDOMEventTarget)>> IDOMEventTargetPtr;
> typedef _com_ptr_t<_com_IIID<IWebFrame2, &__uuidof(IWebFrame2)>> IWebFrame2Ptr;
> 
> HRESULT MiniBrowserWebHost::didFinishLoadForFrame(_In_opt_ IWebView* webView, _In_opt_ IWebFrame* frame)
>@@ -157,32 +132,10 @@ HRESULT MiniBrowserWebHost::didFinishLoadForFrame(_In_opt_ IWebView* webView, _I
>         }
>     }
> 
>-    IDOMDocumentPtr doc;
>-    frame->DOMDocument(&doc.GetInterfacePtr());
>-
>-    IDOMElementPtr element;
>-    IDOMEventTargetPtr target;
>-
>     if (m_client)
>         m_client->showLastVisitedSites(*webView);
> 
>-    // The following is for the test page:
>-    static _bstr_t id = L"webkit logo";
>-    HRESULT hr = doc->getElementById(id, &element.GetInterfacePtr());
>-    if (!SUCCEEDED(hr))
>-        return hr;
>-
>-    hr = element->QueryInterface(IID_IDOMEventTarget, reinterpret_cast<void**>(&target.GetInterfacePtr()));
>-    if (!SUCCEEDED(hr))
>-        return hr;
>-
>-    static _bstr_t eventName = L"click";
>-    static _bstr_t eventType = L"webkit logo click";
>-    hr = target->addEventListener(eventName, new SimpleEventListener(eventType), FALSE);
>-    if (!SUCCEEDED(hr))
>-        return hr;
>-
>-    return hr;
>+    return S_OK;
> }
> 
> HRESULT MiniBrowserWebHost::didStartProvisionalLoadForFrame(_In_opt_ IWebView*, _In_opt_ IWebFrame* frame)

Actions: View | Formatted Diff | Diff

Attachments on bug 199233: 372946