diff options
| author | Artem Bochkarev <artem.bochkarev@jetbrains.com> | 2024-03-01 15:18:41 +0400 |
|---|---|---|
| committer | Artem Bochkarev <artem.bochkarev@jetbrains.com> | 2024-03-05 01:08:51 +0400 |
| commit | 466a5768d81de6dcf4d9211372b2686b7ec1928e (patch) | |
| tree | de0c6f65754b3b23b8e0ca44305b1961e50919dc | |
| parent | 8b02d55eb4c37b9c9244e8b4924dc7313876790d (diff) | |
| download | jcef-466a5768d81de6dcf4d9211372b2686b7ec1928e.tar.gz | |
JBR-4430 Implementation of RemoteFrame
25 files changed, 5144 insertions, 1098 deletions
diff --git a/java/com/jetbrains/cef/remote/ClientHandlersDummy.java b/java/com/jetbrains/cef/remote/ClientHandlersDummy.java index 5e0a700..280c137 100644 --- a/java/com/jetbrains/cef/remote/ClientHandlersDummy.java +++ b/java/com/jetbrains/cef/remote/ClientHandlersDummy.java @@ -44,7 +44,7 @@ public class ClientHandlersDummy implements ClientHandlers.Iface{ } @Override - public boolean LifeSpanHandler_OnBeforePopup(int bid, String url, String frameName, boolean gesture) throws TException { + public boolean LifeSpanHandler_OnBeforePopup(int bid, RObject frame, String url, String frameName, boolean gesture) throws TException { return false; } @@ -69,22 +69,22 @@ public class ClientHandlersDummy implements ClientHandlers.Iface{ } @Override - public void LoadHandler_OnLoadStart(int bid, int transition_type) throws TException { + public void LoadHandler_OnLoadStart(int bid, RObject frame, int transition_type) throws TException { } @Override - public void LoadHandler_OnLoadEnd(int bid, int httpStatusCode) throws TException { + public void LoadHandler_OnLoadEnd(int bid, RObject frame, int httpStatusCode) throws TException { } @Override - public void LoadHandler_OnLoadError(int bid, int errorCode, String errorText, String failedUrl) throws TException { + public void LoadHandler_OnLoadError(int bid, RObject frame, int errorCode, String errorText, String failedUrl) throws TException { } @Override - public void DisplayHandler_OnAddressChange(int bid, String url) throws TException { + public void DisplayHandler_OnAddressChange(int bid, RObject frame, String url) throws TException { } @@ -134,12 +134,12 @@ public class ClientHandlersDummy implements ClientHandlers.Iface{ } @Override - public boolean RequestHandler_OnBeforeBrowse(int bid, RObject request, boolean user_gesture, boolean is_redirect) throws TException { + public boolean RequestHandler_OnBeforeBrowse(int bid, RObject frame, RObject request, boolean user_gesture, boolean is_redirect) throws TException { return false; } @Override - public boolean RequestHandler_OnOpenURLFromTab(int bid, String target_url, boolean user_gesture) throws TException { + public boolean RequestHandler_OnOpenURLFromTab(int bid, RObject frame, String target_url, boolean user_gesture) throws TException { return false; } @@ -159,7 +159,7 @@ public class ClientHandlersDummy implements ClientHandlers.Iface{ } @Override - public RObject RequestHandler_GetResourceRequestHandler(int bid, RObject request, boolean isNavigation, boolean isDownload, String requestInitiator) throws TException { + public RObject RequestHandler_GetResourceRequestHandler(int bid, RObject frame, RObject request, boolean isNavigation, boolean isDownload, String requestInitiator) throws TException { return null; } @@ -169,7 +169,7 @@ public class ClientHandlersDummy implements ClientHandlers.Iface{ } @Override - public RObject ResourceRequestHandler_GetCookieAccessFilter(int rrHandler, int bid, RObject request) throws TException { + public RObject ResourceRequestHandler_GetCookieAccessFilter(int rrHandler, int bid, RObject frame, RObject request) throws TException { return null; } @@ -179,22 +179,22 @@ public class ClientHandlersDummy implements ClientHandlers.Iface{ } @Override - public boolean CookieAccessFilter_CanSendCookie(int filter, int bid, RObject request, List<String> cookie) throws TException { + public boolean CookieAccessFilter_CanSendCookie(int filter, int bid, RObject frame, RObject request, List<String> cookie) throws TException { return false; } @Override - public boolean CookieAccessFilter_CanSaveCookie(int filter, int bid, RObject request, RObject response, List<String> cookie) throws TException { + public boolean CookieAccessFilter_CanSaveCookie(int filter, int bid, RObject frame, RObject request, RObject response, List<String> cookie) throws TException { return false; } @Override - public boolean ResourceRequestHandler_OnBeforeResourceLoad(int rrHandler, int bid, RObject request) throws TException { + public boolean ResourceRequestHandler_OnBeforeResourceLoad(int rrHandler, int bid, RObject frame, RObject request) throws TException { return false; } @Override - public RObject ResourceRequestHandler_GetResourceHandler(int rrHandler, int bid, RObject request) throws TException { + public RObject ResourceRequestHandler_GetResourceHandler(int rrHandler, int bid, RObject frame, RObject request) throws TException { return null; } @@ -224,32 +224,32 @@ public class ClientHandlersDummy implements ClientHandlers.Iface{ } @Override - public String ResourceRequestHandler_OnResourceRedirect(int rrHandler, int bid, RObject request, RObject response, String new_url) throws TException { + public String ResourceRequestHandler_OnResourceRedirect(int rrHandler, int bid, RObject frame, RObject request, RObject response, String new_url) throws TException { return null; } @Override - public boolean ResourceRequestHandler_OnResourceResponse(int rrHandler, int bid, RObject request, RObject response) throws TException { + public boolean ResourceRequestHandler_OnResourceResponse(int rrHandler, int bid, RObject frame, RObject request, RObject response) throws TException { return false; } @Override - public void ResourceRequestHandler_OnResourceLoadComplete(int rrHandler, int bid, RObject request, RObject response, String status, long receivedContentLength) throws TException { + public void ResourceRequestHandler_OnResourceLoadComplete(int rrHandler, int bid, RObject frame, RObject request, RObject response, String status, long receivedContentLength) throws TException { } @Override - public boolean ResourceRequestHandler_OnProtocolExecution(int rrHandler, int bid, RObject request, boolean allowOsExecution) throws TException { + public boolean ResourceRequestHandler_OnProtocolExecution(int rrHandler, int bid, RObject frame, RObject request, boolean allowOsExecution) throws TException { return false; } @Override - public boolean MessageRouterHandler_onQuery(RObject handler, int bid, long queryId, String request, boolean persistent, RObject queryCallback) throws TException { + public boolean MessageRouterHandler_onQuery(RObject handler, int bid, RObject frame, long queryId, String request, boolean persistent, RObject queryCallback) throws TException { return false; } @Override - public void MessageRouterHandler_onQueryCanceled(RObject handler, int bid, long queryId) throws TException { + public void MessageRouterHandler_onQueryCanceled(RObject handler, int bid, RObject frame, long queryId) throws TException { } @@ -259,7 +259,7 @@ public class ClientHandlersDummy implements ClientHandlers.Iface{ } @Override - public RObject SchemeHandlerFactory_CreateHandler(int schemeHandlerFactory, int bid, String scheme_name, RObject request) throws TException { + public RObject SchemeHandlerFactory_CreateHandler(int schemeHandlerFactory, int bid, RObject frame, String scheme_name, RObject request) throws TException { return null; } @@ -267,4 +267,14 @@ public class ClientHandlersDummy implements ClientHandlers.Iface{ public void SchemeHandlerFactory_Dispose(int schemeHandlerFactory) throws TException { } + + @Override + public void CompletionCallback_OnComplete(int completionCallback) throws TException { + + } + + @Override + public RObject RequestContextHandler_GetResourceRequestHandler(int handler, int bid, RObject frame, RObject request, boolean isNavigation, boolean isDownload, String requestInitiator) throws TException { + return null; + } } diff --git a/java/com/jetbrains/cef/remote/ClientHandlersImpl.java b/java/com/jetbrains/cef/remote/ClientHandlersImpl.java index c22f743..799c221 100644 --- a/java/com/jetbrains/cef/remote/ClientHandlersImpl.java +++ b/java/com/jetbrains/cef/remote/ClientHandlersImpl.java @@ -38,8 +38,6 @@ public class ClientHandlersImpl implements ClientHandlers.Iface { private Runnable myOnContextInitialized; private final RpcExecutor myService; - private static final CefFrame NULL_FRAME = new RemoteFrame(); - public ClientHandlersImpl(RpcExecutor service, Map<Integer, RemoteBrowser> bid2RemoteBrowser) { myService = service; myBid2RemoteBrowser = bid2RemoteBrowser; @@ -144,11 +142,12 @@ public class ClientHandlersImpl implements ClientHandlers.Iface { // @Override - public boolean LifeSpanHandler_OnBeforePopup(int bid, String url, String frameName, boolean gesture) { + public boolean LifeSpanHandler_OnBeforePopup(int bid, RObject frame, String url, String frameName, boolean gesture) { RemoteBrowser browser = getRemoteBrowser(bid); if (browser == null) return false; - return browser.getOwner().hLifeSpan.handleBool(lsh-> lsh.onBeforePopup(browser, NULL_FRAME, url, frameName)); + RemoteFrame rframe = new RemoteFrame(myService, frame); + return browser.getOwner().hLifeSpan.handleBool(lsh-> lsh.onBeforePopup(browser, rframe, url, frameName)); } @Override @@ -200,34 +199,37 @@ public class ClientHandlersImpl implements ClientHandlers.Iface { } @Override - public void LoadHandler_OnLoadStart(int bid, int transition_type) { + public void LoadHandler_OnLoadStart(int bid, RObject frame, int transition_type) { RemoteBrowser browser = getRemoteBrowser(bid); if (browser == null) return; CefLoadHandler loadHandler = browser.getOwner().getLoadHandler(); if (loadHandler == null) return; // TODO: use correct transition_type instead of TT_LINK - loadHandler.onLoadStart(browser, NULL_FRAME, CefRequest.TransitionType.TT_LINK); + RemoteFrame rframe = new RemoteFrame(myService, frame); + loadHandler.onLoadStart(browser, rframe, CefRequest.TransitionType.TT_LINK); } @Override - public void LoadHandler_OnLoadEnd(int bid, int httpStatusCode) { + public void LoadHandler_OnLoadEnd(int bid, RObject frame, int httpStatusCode) { RemoteBrowser browser = getRemoteBrowser(bid); if (browser == null) return; CefLoadHandler loadHandler = browser.getOwner().getLoadHandler(); if (loadHandler == null) return; - loadHandler.onLoadEnd(browser, NULL_FRAME, httpStatusCode); + RemoteFrame rframe = new RemoteFrame(myService, frame); + loadHandler.onLoadEnd(browser, rframe, httpStatusCode); } @Override - public void LoadHandler_OnLoadError(int bid, int errorCode, String errorText, String failedUrl) { + public void LoadHandler_OnLoadError(int bid, RObject frame, int errorCode, String errorText, String failedUrl) { RemoteBrowser browser = getRemoteBrowser(bid); if (browser == null) return; CefLoadHandler loadHandler = browser.getOwner().getLoadHandler(); if (loadHandler == null) return; - loadHandler.onLoadError(browser, NULL_FRAME, CefLoadHandler.ErrorCode.findByCode(errorCode), errorText, failedUrl); + RemoteFrame rframe = new RemoteFrame(myService, frame); + loadHandler.onLoadError(browser, rframe, CefLoadHandler.ErrorCode.findByCode(errorCode), errorText, failedUrl); } // @@ -235,13 +237,14 @@ public class ClientHandlersImpl implements ClientHandlers.Iface { // @Override - public void DisplayHandler_OnAddressChange(int bid, String url) { + public void DisplayHandler_OnAddressChange(int bid, RObject frame, String url) { RemoteBrowser browser = getRemoteBrowser(bid); if (browser == null) return; CefDisplayHandler dh = browser.getOwner().getDisplayHandler(); if (dh == null) return; - dh.onAddressChange(browser, NULL_FRAME, url); + RemoteFrame rframe = new RemoteFrame(myService, frame); + dh.onAddressChange(browser, rframe, url); } @Override @@ -390,14 +393,15 @@ public class ClientHandlersImpl implements ClientHandlers.Iface { /// /*--cef()--*/ @Override - public boolean RequestHandler_OnBeforeBrowse(int bid, RObject request, boolean user_gesture, boolean is_redirect) { + public boolean RequestHandler_OnBeforeBrowse(int bid, RObject frame, RObject request, boolean user_gesture, boolean is_redirect) { RemoteBrowser browser = getRemoteBrowser(bid); if (browser == null) return false; CefRequestHandler rh = browser.getOwner().getRequestHandler(); if (rh == null) return false; RemoteRequestImpl rr = new RemoteRequestImpl(myService, request); - return rh.onBeforeBrowse(browser, NULL_FRAME, new RemoteRequest(rr), user_gesture, is_redirect); + RemoteFrame rframe = new RemoteFrame(myService, frame); + return rh.onBeforeBrowse(browser, rframe, new RemoteRequest(rr), user_gesture, is_redirect); } private static final RObject INVALID = new RObject(-1); @@ -418,15 +422,16 @@ public class ClientHandlersImpl implements ClientHandlers.Iface { /// method will be called on the associated CefRequestContextHandler, if any. /// @Override - public RObject RequestHandler_GetResourceRequestHandler(int bid, RObject request, boolean isNavigation, boolean isDownload, String requestInitiator) { + public RObject RequestHandler_GetResourceRequestHandler(int bid, RObject frame, RObject request, boolean isNavigation, boolean isDownload, String requestInitiator) { RemoteBrowser browser = getRemoteBrowser(bid); if (browser == null) return INVALID; CefRequestHandler rh = browser.getOwner().getRequestHandler(); if (rh == null) return INVALID; RemoteRequestImpl rr = new RemoteRequestImpl(myService, request); + RemoteFrame rframe = new RemoteFrame(myService, frame); BoolRef disableDefaultHandling = new BoolRef(false); - CefResourceRequestHandler handler = rh.getResourceRequestHandler(browser, NULL_FRAME, new RemoteRequest(rr), isNavigation, isDownload, requestInitiator, disableDefaultHandling); + CefResourceRequestHandler handler = rh.getResourceRequestHandler(browser, rframe, new RemoteRequest(rr), isNavigation, isDownload, requestInitiator, disableDefaultHandling); if (handler == null) return INVALID; RemoteResourceRequestHandler resultHandler = RemoteResourceRequestHandler.create(handler); @@ -442,12 +447,13 @@ public class ClientHandlersImpl implements ClientHandlers.Iface { /// /*--cef(optional_param=browser,optional_param=frame)--*/ @Override - public RObject ResourceRequestHandler_GetCookieAccessFilter(int rrHandler, int bid, RObject request) { + public RObject ResourceRequestHandler_GetCookieAccessFilter(int rrHandler, int bid, RObject frame, RObject request) { RemoteResourceRequestHandler rrrh = RemoteResourceRequestHandler.FACTORY.get(rrHandler); if (rrrh == null) return INVALID; RemoteRequestImpl rr = new RemoteRequestImpl(myService, request); - CefCookieAccessFilter filter = rrrh.getDelegate().getCookieAccessFilter(getRemoteBrowser(bid), NULL_FRAME, new RemoteRequest(rr)); + RemoteFrame rframe = new RemoteFrame(myService, frame); + CefCookieAccessFilter filter = rrrh.getDelegate().getCookieAccessFilter(getRemoteBrowser(bid), rframe, new RemoteRequest(rr)); RemoteCookieAccessFilter resultHandler = RemoteCookieAccessFilter.create(filter); return resultHandler.thriftId(); } @@ -491,12 +497,13 @@ public class ClientHandlersImpl implements ClientHandlers.Iface { /// /*--cef(optional_param=browser,optional_param=frame)--*/ @Override - public boolean CookieAccessFilter_CanSendCookie(int filter, int bid, RObject request, List<String> cookie) { + public boolean CookieAccessFilter_CanSendCookie(int filter, int bid, RObject frame, RObject request, List<String> cookie) { RemoteCookieAccessFilter f = RemoteCookieAccessFilter.FACTORY.get(filter); if (f == null) return false; RemoteRequestImpl rr = new RemoteRequestImpl(myService, request); - boolean result = f.getDelegate().canSendCookie(getRemoteBrowser(bid), NULL_FRAME, new RemoteRequest(rr), cookieFromList(cookie)); + RemoteFrame rframe = new RemoteFrame(myService, frame); + boolean result = f.getDelegate().canSendCookie(getRemoteBrowser(bid), rframe, new RemoteRequest(rr), cookieFromList(cookie)); return result; } @@ -509,26 +516,28 @@ public class ClientHandlersImpl implements ClientHandlers.Iface { /// otherwise. /// @Override - public boolean CookieAccessFilter_CanSaveCookie(int filter, int bid, RObject request, RObject response, List<String> cookie) { + public boolean CookieAccessFilter_CanSaveCookie(int filter, int bid, RObject frame, RObject request, RObject response, List<String> cookie) { RemoteCookieAccessFilter f = RemoteCookieAccessFilter.FACTORY.get(filter); if (f == null) return false; RemoteRequestImpl rreq = new RemoteRequestImpl(myService, request); RemoteResponseImpl rresp = new RemoteResponseImpl(myService, response); - boolean result = f.getDelegate().canSaveCookie(getRemoteBrowser(bid), NULL_FRAME, new RemoteRequest(rreq), new RemoteResponse(rresp), cookieFromList(cookie)); + RemoteFrame rframe = new RemoteFrame(myService, frame); + boolean result = f.getDelegate().canSaveCookie(getRemoteBrowser(bid), rframe, new RemoteRequest(rreq), new RemoteResponse(rresp), cookieFromList(cookie)); // NOTE: doc doesn't say that response can't be modifed, but call rresp.flush() triggers cooresponding // error on server (i.e. resp is immutable) so don't do that. return result; } @Override - public boolean RequestHandler_OnOpenURLFromTab(int bid, String target_url, boolean user_gesture) { + public boolean RequestHandler_OnOpenURLFromTab(int bid, RObject frame, String target_url, boolean user_gesture) { RemoteBrowser browser = getRemoteBrowser(bid); if (browser == null) return false; CefRequestHandler rh = browser.getOwner().getRequestHandler(); if (rh == null) return false; - return rh.onOpenURLFromTab(browser, NULL_FRAME, target_url, user_gesture); + RemoteFrame rframe = new RemoteFrame(myService, frame); + return rh.onOpenURLFromTab(browser, rframe, target_url, user_gesture); } @Override @@ -593,12 +602,13 @@ public class ClientHandlersImpl implements ClientHandlers.Iface { /// /*--cef(optional_param=browser,optional_param=frame, default_retval=RV_CONTINUE)--*/ @Override - public boolean ResourceRequestHandler_OnBeforeResourceLoad(int rrHandler, int bid, RObject request) { + public boolean ResourceRequestHandler_OnBeforeResourceLoad(int rrHandler, int bid, RObject frame, RObject request) { RemoteResourceRequestHandler rrrh = RemoteResourceRequestHandler.FACTORY.get(rrHandler); if (rrrh == null) return false; RemoteRequestImpl rr = new RemoteRequestImpl(myService, request); - boolean result = rrrh.getDelegate().onBeforeResourceLoad(getRemoteBrowser(bid), NULL_FRAME, new RemoteRequest(rr)); + RemoteFrame rframe = new RemoteFrame(myService, frame); + boolean result = rrrh.getDelegate().onBeforeResourceLoad(getRemoteBrowser(bid), rframe, new RemoteRequest(rr)); rr.flush(); return result; } @@ -613,12 +623,13 @@ public class ClientHandlersImpl implements ClientHandlers.Iface { /// /*--cef(optional_param=browser,optional_param=frame)--*/ @Override - public RObject ResourceRequestHandler_GetResourceHandler(int rrHandler, int bid, RObject request) { + public RObject ResourceRequestHandler_GetResourceHandler(int rrHandler, int bid, RObject frame, RObject request) { RemoteResourceRequestHandler rrrh = RemoteResourceRequestHandler.FACTORY.get(rrHandler); if (rrrh == null) return INVALID; RemoteRequestImpl rr = new RemoteRequestImpl(myService, request); - CefResourceHandler handler = rrrh.getDelegate().getResourceHandler(getRemoteBrowser(bid), NULL_FRAME, new RemoteRequest(rr)); + RemoteFrame rframe = new RemoteFrame(myService, frame); + CefResourceHandler handler = rrrh.getDelegate().getResourceHandler(getRemoteBrowser(bid), rframe, new RemoteRequest(rr)); if (handler == null) return INVALID; RemoteResourceHandler result = RemoteResourceHandler.create(handler); @@ -727,14 +738,15 @@ public class ClientHandlersImpl implements ClientHandlers.Iface { /// /*--cef(optional_param=browser,optional_param=frame)--*/ @Override - public String ResourceRequestHandler_OnResourceRedirect(int rrHandler, int bid, RObject request, RObject response, String new_url) { + public String ResourceRequestHandler_OnResourceRedirect(int rrHandler, int bid, RObject frame, RObject request, RObject response, String new_url) { RemoteResourceRequestHandler rrrh = RemoteResourceRequestHandler.FACTORY.get(rrHandler); if (rrrh == null) return ""; RemoteRequestImpl rreq = new RemoteRequestImpl(myService, request); RemoteResponseImpl rresp = new RemoteResponseImpl(myService, response); StringRef sref = new StringRef(new_url); - rrrh.getDelegate().onResourceRedirect(getRemoteBrowser(bid), NULL_FRAME, new RemoteRequest(rreq), new RemoteResponse(rresp), sref); + RemoteFrame rframe = new RemoteFrame(myService, frame); + rrrh.getDelegate().onResourceRedirect(getRemoteBrowser(bid), rframe, new RemoteRequest(rreq), new RemoteResponse(rresp), sref); return sref.get(); } @@ -753,13 +765,14 @@ public class ClientHandlersImpl implements ClientHandlers.Iface { /// /*--cef(optional_param=browser,optional_param=frame)--*/ @Override - public boolean ResourceRequestHandler_OnResourceResponse(int rrHandler, int bid, RObject request, RObject response) { + public boolean ResourceRequestHandler_OnResourceResponse(int rrHandler, int bid, RObject frame, RObject request, RObject response) { RemoteResourceRequestHandler rrrh = RemoteResourceRequestHandler.FACTORY.get(rrHandler); if (rrrh == null) return false; RemoteRequestImpl rreq = new RemoteRequestImpl(myService, request); RemoteResponseImpl rresp = new RemoteResponseImpl(myService, response); - boolean result = rrrh.getDelegate().onResourceResponse(getRemoteBrowser(bid), NULL_FRAME, new RemoteRequest(rreq), new RemoteResponse(rresp)); + RemoteFrame rframe = new RemoteFrame(myService, frame); + boolean result = rrrh.getDelegate().onResourceResponse(getRemoteBrowser(bid), rframe, new RemoteRequest(rreq), new RemoteResponse(rresp)); rreq.flush(); // |response| object cannot be modified in this callback. return result; } @@ -782,7 +795,7 @@ public class ClientHandlersImpl implements ClientHandlers.Iface { /// /*--cef(optional_param=browser,optional_param=frame)--*/ @Override - public void ResourceRequestHandler_OnResourceLoadComplete(int rrHandler, int bid, RObject request, RObject response, String status, long receivedContentLength) { + public void ResourceRequestHandler_OnResourceLoadComplete(int rrHandler, int bid, RObject frame, RObject request, RObject response, String status, long receivedContentLength) { RemoteResourceRequestHandler rrrh = RemoteResourceRequestHandler.FACTORY.get(rrHandler); if (rrrh == null) return; @@ -796,7 +809,8 @@ public class ClientHandlersImpl implements ClientHandlers.Iface { CefLog.Error("OnResourceLoadComplete: ", e.getMessage()); } } - rrrh.getDelegate().onResourceLoadComplete(getRemoteBrowser(bid), NULL_FRAME, new RemoteRequest(rreq), new RemoteResponse(rresp), s, receivedContentLength); + RemoteFrame rframe = new RemoteFrame(myService, frame); + rrrh.getDelegate().onResourceLoadComplete(getRemoteBrowser(bid), rframe, new RemoteRequest(rreq), new RemoteResponse(rresp), s, receivedContentLength); } /// @@ -811,13 +825,14 @@ public class ClientHandlersImpl implements ClientHandlers.Iface { /// /*--cef(optional_param=browser,optional_param=frame)--*/ @Override - public boolean ResourceRequestHandler_OnProtocolExecution(int rrHandler, int bid, RObject request, boolean allowOsExecution) { + public boolean ResourceRequestHandler_OnProtocolExecution(int rrHandler, int bid, RObject frame, RObject request, boolean allowOsExecution) { RemoteResourceRequestHandler rrrh = RemoteResourceRequestHandler.FACTORY.get(rrHandler); if (rrrh == null) return false; RemoteRequestImpl rreq = new RemoteRequestImpl(myService, request); + RemoteFrame rframe = new RemoteFrame(myService, frame); BoolRef br = new BoolRef(allowOsExecution); - rrrh.getDelegate().onProtocolExecution(getRemoteBrowser(bid), NULL_FRAME, new RemoteRequest(rreq), br); + rrrh.getDelegate().onProtocolExecution(getRemoteBrowser(bid), rframe, new RemoteRequest(rreq), br); return br.get(); } @@ -827,20 +842,22 @@ public class ClientHandlersImpl implements ClientHandlers.Iface { } @Override - public boolean MessageRouterHandler_onQuery(RObject handler, int bid, long queryId, String request, boolean persistent, RObject queryCallback) throws TException { + public boolean MessageRouterHandler_onQuery(RObject handler, int bid, RObject frame, long queryId, String request, boolean persistent, RObject queryCallback) throws TException { RemoteMessageRouterHandler rmrh = RemoteMessageRouterHandler.FACTORY.get(handler.objId); if (rmrh == null) return false; RemoteQueryCallback rcb = new RemoteQueryCallback(myService, queryCallback); - return rmrh.getDelegate().onQuery(getRemoteBrowser(bid), NULL_FRAME, queryId, request, persistent, rcb); + RemoteFrame rframe = new RemoteFrame(myService, frame); + return rmrh.getDelegate().onQuery(getRemoteBrowser(bid), rframe, queryId, request, persistent, rcb); } @Override - public void MessageRouterHandler_onQueryCanceled(RObject handler, int bid, long queryId) throws TException { + public void MessageRouterHandler_onQueryCanceled(RObject handler, int bid, RObject frame, long queryId) throws TException { RemoteMessageRouterHandler rmrh = RemoteMessageRouterHandler.FACTORY.get(handler.objId); if (rmrh == null) return; - rmrh.getDelegate().onQueryCanceled(getRemoteBrowser(bid), NULL_FRAME, queryId); + RemoteFrame rframe = new RemoteFrame(myService, frame); + rmrh.getDelegate().onQueryCanceled(getRemoteBrowser(bid), rframe, queryId); } @Override @@ -849,12 +866,13 @@ public class ClientHandlersImpl implements ClientHandlers.Iface { } @Override - public RObject SchemeHandlerFactory_CreateHandler(int schemeHandlerFactory, int bid, String scheme_name, RObject request) throws TException { + public RObject SchemeHandlerFactory_CreateHandler(int schemeHandlerFactory, int bid, RObject frame, String scheme_name, RObject request) throws TException { RemoteSchemeHandlerFactory sf = RemoteSchemeHandlerFactory.FACTORY.get(schemeHandlerFactory); if (sf == null) return INVALID; RemoteRequestImpl rreq = new RemoteRequestImpl(myService, request); - CefResourceHandler handler = sf.getDelegate().create(getRemoteBrowser(bid), NULL_FRAME, scheme_name, new RemoteRequest(rreq)); + RemoteFrame rframe = new RemoteFrame(myService, frame); + CefResourceHandler handler = sf.getDelegate().create(getRemoteBrowser(bid), rframe, scheme_name, new RemoteRequest(rreq)); if (handler == null) return INVALID; RemoteResourceHandler result = RemoteResourceHandler.create(handler); diff --git a/java/com/jetbrains/cef/remote/RemoteFrame.java b/java/com/jetbrains/cef/remote/RemoteFrame.java index 25f4348..6b22b3d 100644 --- a/java/com/jetbrains/cef/remote/RemoteFrame.java +++ b/java/com/jetbrains/cef/remote/RemoteFrame.java @@ -1,84 +1,107 @@ package com.jetbrains.cef.remote; +import com.jetbrains.cef.remote.thrift_codegen.RObject; +import org.cef.CefClient; import org.cef.browser.CefFrame; +import org.cef.misc.CefLog; +import org.cef.network.CefRequest; + +// 1. Represents remote java peer for native server object (CefFrame). +// 2. Created on java side when processing some server request +// 3. Lifetime of remote native peer if managed by server: native object +// peer (CefFrame) is destroyed immediately after rpc finished. After that +// moment all requests from java to native will return errors (or default values). +// Java object will be destroyed via usual gc. +public class RemoteFrame extends RemoteServerObjectLocal implements CefFrame { + public RemoteFrame(RpcExecutor server, RObject frame) { + super(server, frame); + } + + @Override + public void flush() { + // Nothing to do (CefFrame is read-only object). + } -public class RemoteFrame implements CefFrame { @Override public void dispose() { + // Nothing to do (lifetime of remote native peer if managed by server). Java object will be destroyed via usual gc. } @Override public String getIdentifier() { - return "RemoteFrame_"; + return myCache.get("Identifier"); } @Override public String getURL() { - return null; + return myCache.get("URL"); } @Override public String getName() { - return null; + return myCache.get("Name"); } @Override public boolean isMain() { - return false; + return getBoolVal("IsMain"); } @Override public boolean isValid() { - return false; + return getBoolVal("IsValid"); } @Override public boolean isFocused() { - return false; + return getBoolVal("IsFocused"); } @Override public CefFrame getParent() { + CefLog.Error("TODO: implement getParent()."); return null; } @Override public void executeJavaScript(String code, String url, int line) { - + myServer.exec((s)->{ + s.Frame_ExecuteJavaScript(myId, code, url, line); + }); } @Override public void undo() { - + CefLog.Error("TODO: implement undo()."); } @Override public void redo() { - + CefLog.Error("TODO: implement redo()."); } @Override public void cut() { - + CefLog.Error("TODO: implement cut()."); } @Override public void copy() { - + CefLog.Error("TODO: implement copy()."); } @Override public void paste() { - + CefLog.Error("TODO: implement undo()."); } @Override public void delete() { - + CefLog.Error("TODO: implement delete()."); } @Override public void selectAll() { - + CefLog.Error("TODO: implement selectAll()."); } } diff --git a/java/com/jetbrains/cef/remote/thrift_codegen/ClientHandlers.java b/java/com/jetbrains/cef/remote/thrift_codegen/ClientHandlers.java index f7a72ca..5c92d3c 100644 --- a/java/com/jetbrains/cef/remote/thrift_codegen/ClientHandlers.java +++ b/java/com/jetbrains/cef/remote/thrift_codegen/ClientHandlers.java @@ -25,7 +25,7 @@ public class ClientHandlers { public void RenderHandler_OnPaint(int bid, boolean popup, int dirtyRectsCount, java.lang.String sharedMemName, long sharedMemHandle, int width, int height) throws org.apache.thrift.TException; - public boolean LifeSpanHandler_OnBeforePopup(int bid, java.lang.String url, java.lang.String frameName, boolean gesture) throws org.apache.thrift.TException; + public boolean LifeSpanHandler_OnBeforePopup(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, java.lang.String url, java.lang.String frameName, boolean gesture) throws org.apache.thrift.TException; public void LifeSpanHandler_OnAfterCreated(int bid, int nativeBrowserIdentifier) throws org.apache.thrift.TException; @@ -35,13 +35,13 @@ public class ClientHandlers { public void LoadHandler_OnLoadingStateChange(int bid, boolean isLoading, boolean canGoBack, boolean canGoForward) throws org.apache.thrift.TException; - public void LoadHandler_OnLoadStart(int bid, int transition_type) throws org.apache.thrift.TException; + public void LoadHandler_OnLoadStart(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, int transition_type) throws org.apache.thrift.TException; - public void LoadHandler_OnLoadEnd(int bid, int httpStatusCode) throws org.apache.thrift.TException; + public void LoadHandler_OnLoadEnd(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, int httpStatusCode) throws org.apache.thrift.TException; - public void LoadHandler_OnLoadError(int bid, int errorCode, java.lang.String errorText, java.lang.String failedUrl) throws org.apache.thrift.TException; + public void LoadHandler_OnLoadError(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, int errorCode, java.lang.String errorText, java.lang.String failedUrl) throws org.apache.thrift.TException; - public void DisplayHandler_OnAddressChange(int bid, java.lang.String url) throws org.apache.thrift.TException; + public void DisplayHandler_OnAddressChange(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, java.lang.String url) throws org.apache.thrift.TException; public void DisplayHandler_OnTitleChange(int bid, java.lang.String title) throws org.apache.thrift.TException; @@ -61,9 +61,9 @@ public class ClientHandlers { public void FocusHandler_OnGotFocus(int bid) throws org.apache.thrift.TException; - public boolean RequestHandler_OnBeforeBrowse(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, boolean user_gesture, boolean is_redirect) throws org.apache.thrift.TException; + public boolean RequestHandler_OnBeforeBrowse(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, boolean user_gesture, boolean is_redirect) throws org.apache.thrift.TException; - public boolean RequestHandler_OnOpenURLFromTab(int bid, java.lang.String target_url, boolean user_gesture) throws org.apache.thrift.TException; + public boolean RequestHandler_OnOpenURLFromTab(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, java.lang.String target_url, boolean user_gesture) throws org.apache.thrift.TException; public boolean RequestHandler_GetAuthCredentials(int bid, java.lang.String origin_url, boolean isProxy, java.lang.String host, int port, java.lang.String realm, java.lang.String scheme, com.jetbrains.cef.remote.thrift_codegen.RObject authCallback) throws org.apache.thrift.TException; @@ -71,21 +71,21 @@ public class ClientHandlers { public void RequestHandler_OnRenderProcessTerminated(int bid, java.lang.String status) throws org.apache.thrift.TException; - public com.jetbrains.cef.remote.thrift_codegen.RObject RequestHandler_GetResourceRequestHandler(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, boolean isNavigation, boolean isDownload, java.lang.String requestInitiator) throws org.apache.thrift.TException; + public com.jetbrains.cef.remote.thrift_codegen.RObject RequestHandler_GetResourceRequestHandler(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, boolean isNavigation, boolean isDownload, java.lang.String requestInitiator) throws org.apache.thrift.TException; public void ResourceRequestHandler_Dispose(int rrHandler) throws org.apache.thrift.TException; - public com.jetbrains.cef.remote.thrift_codegen.RObject ResourceRequestHandler_GetCookieAccessFilter(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request) throws org.apache.thrift.TException; + public com.jetbrains.cef.remote.thrift_codegen.RObject ResourceRequestHandler_GetCookieAccessFilter(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request) throws org.apache.thrift.TException; public void CookieAccessFilter_Dispose(int filter) throws org.apache.thrift.TException; - public boolean CookieAccessFilter_CanSendCookie(int filter, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, java.util.List<java.lang.String> cookie) throws org.apache.thrift.TException; + public boolean CookieAccessFilter_CanSendCookie(int filter, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, java.util.List<java.lang.String> cookie) throws org.apache.thrift.TException; - public boolean CookieAccessFilter_CanSaveCookie(int filter, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, java.util.List<java.lang.String> cookie) throws org.apache.thrift.TException; + public boolean CookieAccessFilter_CanSaveCookie(int filter, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, java.util.List<java.lang.String> cookie) throws org.apache.thrift.TException; - public boolean ResourceRequestHandler_OnBeforeResourceLoad(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request) throws org.apache.thrift.TException; + public boolean ResourceRequestHandler_OnBeforeResourceLoad(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request) throws org.apache.thrift.TException; - public com.jetbrains.cef.remote.thrift_codegen.RObject ResourceRequestHandler_GetResourceHandler(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request) throws org.apache.thrift.TException; + public com.jetbrains.cef.remote.thrift_codegen.RObject ResourceRequestHandler_GetResourceHandler(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request) throws org.apache.thrift.TException; public void ResourceHandler_Dispose(int resourceHandler) throws org.apache.thrift.TException; @@ -97,21 +97,21 @@ public class ClientHandlers { public void ResourceHandler_Cancel(int resourceHandler) throws org.apache.thrift.TException; - public java.lang.String ResourceRequestHandler_OnResourceRedirect(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, java.lang.String new_url) throws org.apache.thrift.TException; + public java.lang.String ResourceRequestHandler_OnResourceRedirect(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, java.lang.String new_url) throws org.apache.thrift.TException; - public boolean ResourceRequestHandler_OnResourceResponse(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response) throws org.apache.thrift.TException; + public boolean ResourceRequestHandler_OnResourceResponse(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response) throws org.apache.thrift.TException; - public void ResourceRequestHandler_OnResourceLoadComplete(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, java.lang.String status, long receivedContentLength) throws org.apache.thrift.TException; + public void ResourceRequestHandler_OnResourceLoadComplete(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, java.lang.String status, long receivedContentLength) throws org.apache.thrift.TException; - public boolean ResourceRequestHandler_OnProtocolExecution(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, boolean allowOsExecution) throws org.apache.thrift.TException; + public boolean ResourceRequestHandler_OnProtocolExecution(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, boolean allowOsExecution) throws org.apache.thrift.TException; - public boolean MessageRouterHandler_onQuery(com.jetbrains.cef.remote.thrift_codegen.RObject handler, int bid, long queryId, java.lang.String request, boolean persistent, com.jetbrains.cef.remote.thrift_codegen.RObject queryCallback) throws org.apache.thrift.TException; + public boolean MessageRouterHandler_onQuery(com.jetbrains.cef.remote.thrift_codegen.RObject handler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, long queryId, java.lang.String request, boolean persistent, com.jetbrains.cef.remote.thrift_codegen.RObject queryCallback) throws org.apache.thrift.TException; - public void MessageRouterHandler_onQueryCanceled(com.jetbrains.cef.remote.thrift_codegen.RObject handler, int bid, long queryId) throws org.apache.thrift.TException; + public void MessageRouterHandler_onQueryCanceled(com.jetbrains.cef.remote.thrift_codegen.RObject handler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, long queryId) throws org.apache.thrift.TException; public void MessageRouterHandler_Dispose(int handler) throws org.apache.thrift.TException; - public com.jetbrains.cef.remote.thrift_codegen.RObject SchemeHandlerFactory_CreateHandler(int schemeHandlerFactory, int bid, java.lang.String scheme_name, com.jetbrains.cef.remote.thrift_codegen.RObject request) throws org.apache.thrift.TException; + public com.jetbrains.cef.remote.thrift_codegen.RObject SchemeHandlerFactory_CreateHandler(int schemeHandlerFactory, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, java.lang.String scheme_name, com.jetbrains.cef.remote.thrift_codegen.RObject request) throws org.apache.thrift.TException; public void SchemeHandlerFactory_Dispose(int schemeHandlerFactory) throws org.apache.thrift.TException; @@ -133,7 +133,7 @@ public class ClientHandlers { public void RenderHandler_OnPaint(int bid, boolean popup, int dirtyRectsCount, java.lang.String sharedMemName, long sharedMemHandle, int width, int height, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException; - public void LifeSpanHandler_OnBeforePopup(int bid, java.lang.String url, java.lang.String frameName, boolean gesture, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException; + public void LifeSpanHandler_OnBeforePopup(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, java.lang.String url, java.lang.String frameName, boolean gesture, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException; public void LifeSpanHandler_OnAfterCreated(int bid, int nativeBrowserIdentifier, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException; @@ -143,13 +143,13 @@ public class ClientHandlers { public void LoadHandler_OnLoadingStateChange(int bid, boolean isLoading, boolean canGoBack, boolean canGoForward, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException; - public void LoadHandler_OnLoadStart(int bid, int transition_type, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException; + public void LoadHandler_OnLoadStart(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, int transition_type, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException; - public void LoadHandler_OnLoadEnd(int bid, int httpStatusCode, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException; + public void LoadHandler_OnLoadEnd(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, int httpStatusCode, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException; - public void LoadHandler_OnLoadError(int bid, int errorCode, java.lang.String errorText, java.lang.String failedUrl, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException; + public void LoadHandler_OnLoadError(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, int errorCode, java.lang.String errorText, java.lang.String failedUrl, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException; - public void DisplayHandler_OnAddressChange(int bid, java.lang.String url, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException; + public void DisplayHandler_OnAddressChange(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, java.lang.String url, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException; public void DisplayHandler_OnTitleChange(int bid, java.lang.String title, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException; @@ -169,9 +169,9 @@ public class ClientHandlers { public void FocusHandler_OnGotFocus(int bid, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException; - public void RequestHandler_OnBeforeBrowse(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, boolean user_gesture, boolean is_redirect, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException; + public void RequestHandler_OnBeforeBrowse(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, boolean user_gesture, boolean is_redirect, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException; - public void RequestHandler_OnOpenURLFromTab(int bid, java.lang.String target_url, boolean user_gesture, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException; + public void RequestHandler_OnOpenURLFromTab(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, java.lang.String target_url, boolean user_gesture, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException; public void RequestHandler_GetAuthCredentials(int bid, java.lang.String origin_url, boolean isProxy, java.lang.String host, int port, java.lang.String realm, java.lang.String scheme, com.jetbrains.cef.remote.thrift_codegen.RObject authCallback, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException; @@ -179,21 +179,21 @@ public class ClientHandlers { public void RequestHandler_OnRenderProcessTerminated(int bid, java.lang.String status, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException; - public void RequestHandler_GetResourceRequestHandler(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, boolean isNavigation, boolean isDownload, java.lang.String requestInitiator, org.apache.thrift.async.AsyncMethodCallback<com.jetbrains.cef.remote.thrift_codegen.RObject> resultHandler) throws org.apache.thrift.TException; + public void RequestHandler_GetResourceRequestHandler(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, boolean isNavigation, boolean isDownload, java.lang.String requestInitiator, org.apache.thrift.async.AsyncMethodCallback<com.jetbrains.cef.remote.thrift_codegen.RObject> resultHandler) throws org.apache.thrift.TException; public void ResourceRequestHandler_Dispose(int rrHandler, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException; - public void ResourceRequestHandler_GetCookieAccessFilter(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, org.apache.thrift.async.AsyncMethodCallback<com.jetbrains.cef.remote.thrift_codegen.RObject> resultHandler) throws org.apache.thrift.TException; + public void ResourceRequestHandler_GetCookieAccessFilter(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, org.apache.thrift.async.AsyncMethodCallback<com.jetbrains.cef.remote.thrift_codegen.RObject> resultHandler) throws org.apache.thrift.TException; public void CookieAccessFilter_Dispose(int filter, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException; - public void CookieAccessFilter_CanSendCookie(int filter, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, java.util.List<java.lang.String> cookie, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException; + public void CookieAccessFilter_CanSendCookie(int filter, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, java.util.List<java.lang.String> cookie, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException; - public void CookieAccessFilter_CanSaveCookie(int filter, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, java.util.List<java.lang.String> cookie, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException; + public void CookieAccessFilter_CanSaveCookie(int filter, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, java.util.List<java.lang.String> cookie, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException; - public void ResourceRequestHandler_OnBeforeResourceLoad(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException; + public void ResourceRequestHandler_OnBeforeResourceLoad(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException; - public void ResourceRequestHandler_GetResourceHandler(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, org.apache.thrift.async.AsyncMethodCallback<com.jetbrains.cef.remote.thrift_codegen.RObject> resultHandler) throws org.apache.thrift.TException; + public void ResourceRequestHandler_GetResourceHandler(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, org.apache.thrift.async.AsyncMethodCallback<com.jetbrains.cef.remote.thrift_codegen.RObject> resultHandler) throws org.apache.thrift.TException; public void ResourceHandler_Dispose(int resourceHandler, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException; @@ -205,21 +205,21 @@ public class ClientHandlers { public void ResourceHandler_Cancel(int resourceHandler, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException; - public void ResourceRequestHandler_OnResourceRedirect(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, java.lang.String new_url, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException; + public void ResourceRequestHandler_OnResourceRedirect(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, java.lang.String new_url, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException; - public void ResourceRequestHandler_OnResourceResponse(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException; + public void ResourceRequestHandler_OnResourceResponse(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException; - public void ResourceRequestHandler_OnResourceLoadComplete(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, java.lang.String status, long receivedContentLength, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException; + public void ResourceRequestHandler_OnResourceLoadComplete(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, java.lang.String status, long receivedContentLength, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException; - public void ResourceRequestHandler_OnProtocolExecution(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, boolean allowOsExecution, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException; + public void ResourceRequestHandler_OnProtocolExecution(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, boolean allowOsExecution, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException; - public void MessageRouterHandler_onQuery(com.jetbrains.cef.remote.thrift_codegen.RObject handler, int bid, long queryId, java.lang.String request, boolean persistent, com.jetbrains.cef.remote.thrift_codegen.RObject queryCallback, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException; + public void MessageRouterHandler_onQuery(com.jetbrains.cef.remote.thrift_codegen.RObject handler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, long queryId, java.lang.String request, boolean persistent, com.jetbrains.cef.remote.thrift_codegen.RObject queryCallback, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException; - public void MessageRouterHandler_onQueryCanceled(com.jetbrains.cef.remote.thrift_codegen.RObject handler, int bid, long queryId, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException; + public void MessageRouterHandler_onQueryCanceled(com.jetbrains.cef.remote.thrift_codegen.RObject handler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, long queryId, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException; public void MessageRouterHandler_Dispose(int handler, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException; - public void SchemeHandlerFactory_CreateHandler(int schemeHandlerFactory, int bid, java.lang.String scheme_name, com.jetbrains.cef.remote.thrift_codegen.RObject request, org.apache.thrift.async.AsyncMethodCallback<com.jetbrains.cef.remote.thrift_codegen.RObject> resultHandler) throws org.apache.thrift.TException; + public void SchemeHandlerFactory_CreateHandler(int schemeHandlerFactory, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, java.lang.String scheme_name, com.jetbrains.cef.remote.thrift_codegen.RObject request, org.apache.thrift.async.AsyncMethodCallback<com.jetbrains.cef.remote.thrift_codegen.RObject> resultHandler) throws org.apache.thrift.TException; public void SchemeHandlerFactory_Dispose(int schemeHandlerFactory, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException; @@ -397,16 +397,17 @@ public class ClientHandlers { } @Override - public boolean LifeSpanHandler_OnBeforePopup(int bid, java.lang.String url, java.lang.String frameName, boolean gesture) throws org.apache.thrift.TException + public boolean LifeSpanHandler_OnBeforePopup(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, java.lang.String url, java.lang.String frameName, boolean gesture) throws org.apache.thrift.TException { - send_LifeSpanHandler_OnBeforePopup(bid, url, frameName, gesture); + send_LifeSpanHandler_OnBeforePopup(bid, frame, url, frameName, gesture); return recv_LifeSpanHandler_OnBeforePopup(); } - public void send_LifeSpanHandler_OnBeforePopup(int bid, java.lang.String url, java.lang.String frameName, boolean gesture) throws org.apache.thrift.TException + public void send_LifeSpanHandler_OnBeforePopup(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, java.lang.String url, java.lang.String frameName, boolean gesture) throws org.apache.thrift.TException { LifeSpanHandler_OnBeforePopup_args args = new LifeSpanHandler_OnBeforePopup_args(); args.setBid(bid); + args.setFrame(frame); args.setUrl(url); args.setFrameName(frameName); args.setGesture(gesture); @@ -491,43 +492,46 @@ public class ClientHandlers { } @Override - public void LoadHandler_OnLoadStart(int bid, int transition_type) throws org.apache.thrift.TException + public void LoadHandler_OnLoadStart(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, int transition_type) throws org.apache.thrift.TException { - send_LoadHandler_OnLoadStart(bid, transition_type); + send_LoadHandler_OnLoadStart(bid, frame, transition_type); } - public void send_LoadHandler_OnLoadStart(int bid, int transition_type) throws org.apache.thrift.TException + public void send_LoadHandler_OnLoadStart(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, int transition_type) throws org.apache.thrift.TException { LoadHandler_OnLoadStart_args args = new LoadHandler_OnLoadStart_args(); args.setBid(bid); + args.setFrame(frame); args.setTransition_type(transition_type); sendBaseOneway("LoadHandler_OnLoadStart", args); } @Override - public void LoadHandler_OnLoadEnd(int bid, int httpStatusCode) throws org.apache.thrift.TException + public void LoadHandler_OnLoadEnd(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, int httpStatusCode) throws org.apache.thrift.TException { - send_LoadHandler_OnLoadEnd(bid, httpStatusCode); + send_LoadHandler_OnLoadEnd(bid, frame, httpStatusCode); } - public void send_LoadHandler_OnLoadEnd(int bid, int httpStatusCode) throws org.apache.thrift.TException + public void send_LoadHandler_OnLoadEnd(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, int httpStatusCode) throws org.apache.thrift.TException { LoadHandler_OnLoadEnd_args args = new LoadHandler_OnLoadEnd_args(); args.setBid(bid); + args.setFrame(frame); args.setHttpStatusCode(httpStatusCode); sendBaseOneway("LoadHandler_OnLoadEnd", args); } @Override - public void LoadHandler_OnLoadError(int bid, int errorCode, java.lang.String errorText, java.lang.String failedUrl) throws org.apache.thrift.TException + public void LoadHandler_OnLoadError(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, int errorCode, java.lang.String errorText, java.lang.String failedUrl) throws org.apache.thrift.TException { - send_LoadHandler_OnLoadError(bid, errorCode, errorText, failedUrl); + send_LoadHandler_OnLoadError(bid, frame, errorCode, errorText, failedUrl); } - public void send_LoadHandler_OnLoadError(int bid, int errorCode, java.lang.String errorText, java.lang.String failedUrl) throws org.apache.thrift.TException + public void send_LoadHandler_OnLoadError(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, int errorCode, java.lang.String errorText, java.lang.String failedUrl) throws org.apache.thrift.TException { LoadHandler_OnLoadError_args args = new LoadHandler_OnLoadError_args(); args.setBid(bid); + args.setFrame(frame); args.setErrorCode(errorCode); args.setErrorText(errorText); args.setFailedUrl(failedUrl); @@ -535,15 +539,16 @@ public class ClientHandlers { } @Override - public void DisplayHandler_OnAddressChange(int bid, java.lang.String url) throws org.apache.thrift.TException + public void DisplayHandler_OnAddressChange(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, java.lang.String url) throws org.apache.thrift.TException { - send_DisplayHandler_OnAddressChange(bid, url); + send_DisplayHandler_OnAddressChange(bid, frame, url); } - public void send_DisplayHandler_OnAddressChange(int bid, java.lang.String url) throws org.apache.thrift.TException + public void send_DisplayHandler_OnAddressChange(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, java.lang.String url) throws org.apache.thrift.TException { DisplayHandler_OnAddressChange_args args = new DisplayHandler_OnAddressChange_args(); args.setBid(bid); + args.setFrame(frame); args.setUrl(url); sendBaseOneway("DisplayHandler_OnAddressChange", args); } @@ -732,16 +737,17 @@ public class ClientHandlers { } @Override - public boolean RequestHandler_OnBeforeBrowse(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, boolean user_gesture, boolean is_redirect) throws org.apache.thrift.TException + public boolean RequestHandler_OnBeforeBrowse(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, boolean user_gesture, boolean is_redirect) throws org.apache.thrift.TException { - send_RequestHandler_OnBeforeBrowse(bid, request, user_gesture, is_redirect); + send_RequestHandler_OnBeforeBrowse(bid, frame, request, user_gesture, is_redirect); return recv_RequestHandler_OnBeforeBrowse(); } - public void send_RequestHandler_OnBeforeBrowse(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, boolean user_gesture, boolean is_redirect) throws org.apache.thrift.TException + public void send_RequestHandler_OnBeforeBrowse(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, boolean user_gesture, boolean is_redirect) throws org.apache.thrift.TException { RequestHandler_OnBeforeBrowse_args args = new RequestHandler_OnBeforeBrowse_args(); args.setBid(bid); + args.setFrame(frame); args.setRequest(request); args.setUser_gesture(user_gesture); args.setIs_redirect(is_redirect); @@ -759,16 +765,17 @@ public class ClientHandlers { } @Override - public boolean RequestHandler_OnOpenURLFromTab(int bid, java.lang.String target_url, boolean user_gesture) throws org.apache.thrift.TException + public boolean RequestHandler_OnOpenURLFromTab(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, java.lang.String target_url, boolean user_gesture) throws org.apache.thrift.TException { - send_RequestHandler_OnOpenURLFromTab(bid, target_url, user_gesture); + send_RequestHandler_OnOpenURLFromTab(bid, frame, target_url, user_gesture); return recv_RequestHandler_OnOpenURLFromTab(); } - public void send_RequestHandler_OnOpenURLFromTab(int bid, java.lang.String target_url, boolean user_gesture) throws org.apache.thrift.TException + public void send_RequestHandler_OnOpenURLFromTab(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, java.lang.String target_url, boolean user_gesture) throws org.apache.thrift.TException { RequestHandler_OnOpenURLFromTab_args args = new RequestHandler_OnOpenURLFromTab_args(); args.setBid(bid); + args.setFrame(frame); args.setTarget_url(target_url); args.setUser_gesture(user_gesture); sendBase("RequestHandler_OnOpenURLFromTab", args); @@ -858,16 +865,17 @@ public class ClientHandlers { } @Override - public com.jetbrains.cef.remote.thrift_codegen.RObject RequestHandler_GetResourceRequestHandler(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, boolean isNavigation, boolean isDownload, java.lang.String requestInitiator) throws org.apache.thrift.TException + public com.jetbrains.cef.remote.thrift_codegen.RObject RequestHandler_GetResourceRequestHandler(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, boolean isNavigation, boolean isDownload, java.lang.String requestInitiator) throws org.apache.thrift.TException { - send_RequestHandler_GetResourceRequestHandler(bid, request, isNavigation, isDownload, requestInitiator); + send_RequestHandler_GetResourceRequestHandler(bid, frame, request, isNavigation, isDownload, requestInitiator); return recv_RequestHandler_GetResourceRequestHandler(); } - public void send_RequestHandler_GetResourceRequestHandler(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, boolean isNavigation, boolean isDownload, java.lang.String requestInitiator) throws org.apache.thrift.TException + public void send_RequestHandler_GetResourceRequestHandler(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, boolean isNavigation, boolean isDownload, java.lang.String requestInitiator) throws org.apache.thrift.TException { RequestHandler_GetResourceRequestHandler_args args = new RequestHandler_GetResourceRequestHandler_args(); args.setBid(bid); + args.setFrame(frame); args.setRequest(request); args.setIsNavigation(isNavigation); args.setIsDownload(isDownload); @@ -899,17 +907,18 @@ public class ClientHandlers { } @Override - public com.jetbrains.cef.remote.thrift_codegen.RObject ResourceRequestHandler_GetCookieAccessFilter(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request) throws org.apache.thrift.TException + public com.jetbrains.cef.remote.thrift_codegen.RObject ResourceRequestHandler_GetCookieAccessFilter(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request) throws org.apache.thrift.TException { - send_ResourceRequestHandler_GetCookieAccessFilter(rrHandler, bid, request); + send_ResourceRequestHandler_GetCookieAccessFilter(rrHandler, bid, frame, request); return recv_ResourceRequestHandler_GetCookieAccessFilter(); } - public void send_ResourceRequestHandler_GetCookieAccessFilter(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request) throws org.apache.thrift.TException + public void send_ResourceRequestHandler_GetCookieAccessFilter(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request) throws org.apache.thrift.TException { ResourceRequestHandler_GetCookieAccessFilter_args args = new ResourceRequestHandler_GetCookieAccessFilter_args(); args.setRrHandler(rrHandler); args.setBid(bid); + args.setFrame(frame); args.setRequest(request); sendBase("ResourceRequestHandler_GetCookieAccessFilter", args); } @@ -938,17 +947,18 @@ public class ClientHandlers { } @Override - public boolean CookieAccessFilter_CanSendCookie(int filter, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, java.util.List<java.lang.String> cookie) throws org.apache.thrift.TException + public boolean CookieAccessFilter_CanSendCookie(int filter, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, java.util.List<java.lang.String> cookie) throws org.apache.thrift.TException { - send_CookieAccessFilter_CanSendCookie(filter, bid, request, cookie); + send_CookieAccessFilter_CanSendCookie(filter, bid, frame, request, cookie); return recv_CookieAccessFilter_CanSendCookie(); } - public void send_CookieAccessFilter_CanSendCookie(int filter, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, java.util.List<java.lang.String> cookie) throws org.apache.thrift.TException + public void send_CookieAccessFilter_CanSendCookie(int filter, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, java.util.List<java.lang.String> cookie) throws org.apache.thrift.TException { CookieAccessFilter_CanSendCookie_args args = new CookieAccessFilter_CanSendCookie_args(); args.setFilter(filter); args.setBid(bid); + args.setFrame(frame); args.setRequest(request); args.setCookie(cookie); sendBase("CookieAccessFilter_CanSendCookie", args); @@ -965,17 +975,18 @@ public class ClientHandlers { } @Override - public boolean CookieAccessFilter_CanSaveCookie(int filter, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, java.util.List<java.lang.String> cookie) throws org.apache.thrift.TException + public boolean CookieAccessFilter_CanSaveCookie(int filter, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, java.util.List<java.lang.String> cookie) throws org.apache.thrift.TException { - send_CookieAccessFilter_CanSaveCookie(filter, bid, request, response, cookie); + send_CookieAccessFilter_CanSaveCookie(filter, bid, frame, request, response, cookie); return recv_CookieAccessFilter_CanSaveCookie(); } - public void send_CookieAccessFilter_CanSaveCookie(int filter, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, java.util.List<java.lang.String> cookie) throws org.apache.thrift.TException + public void send_CookieAccessFilter_CanSaveCookie(int filter, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, java.util.List<java.lang.String> cookie) throws org.apache.thrift.TException { CookieAccessFilter_CanSaveCookie_args args = new CookieAccessFilter_CanSaveCookie_args(); args.setFilter(filter); args.setBid(bid); + args.setFrame(frame); args.setRequest(request); args.setResponse(response); args.setCookie(cookie); @@ -993,17 +1004,18 @@ public class ClientHandlers { } @Override - public boolean ResourceRequestHandler_OnBeforeResourceLoad(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request) throws org.apache.thrift.TException + public boolean ResourceRequestHandler_OnBeforeResourceLoad(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request) throws org.apache.thrift.TException { - send_ResourceRequestHandler_OnBeforeResourceLoad(rrHandler, bid, request); + send_ResourceRequestHandler_OnBeforeResourceLoad(rrHandler, bid, frame, request); return recv_ResourceRequestHandler_OnBeforeResourceLoad(); } - public void send_ResourceRequestHandler_OnBeforeResourceLoad(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request) throws org.apache.thrift.TException + public void send_ResourceRequestHandler_OnBeforeResourceLoad(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request) throws org.apache.thrift.TException { ResourceRequestHandler_OnBeforeResourceLoad_args args = new ResourceRequestHandler_OnBeforeResourceLoad_args(); args.setRrHandler(rrHandler); args.setBid(bid); + args.setFrame(frame); args.setRequest(request); sendBase("ResourceRequestHandler_OnBeforeResourceLoad", args); } @@ -1019,17 +1031,18 @@ public class ClientHandlers { } @Override - public com.jetbrains.cef.remote.thrift_codegen.RObject ResourceRequestHandler_GetResourceHandler(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request) throws org.apache.thrift.TException + public com.jetbrains.cef.remote.thrift_codegen.RObject ResourceRequestHandler_GetResourceHandler(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request) throws org.apache.thrift.TException { - send_ResourceRequestHandler_GetResourceHandler(rrHandler, bid, request); + send_ResourceRequestHandler_GetResourceHandler(rrHandler, bid, frame, request); return recv_ResourceRequestHandler_GetResourceHandler(); } - public void send_ResourceRequestHandler_GetResourceHandler(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request) throws org.apache.thrift.TException + public void send_ResourceRequestHandler_GetResourceHandler(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request) throws org.apache.thrift.TException { ResourceRequestHandler_GetResourceHandler_args args = new ResourceRequestHandler_GetResourceHandler_args(); args.setRrHandler(rrHandler); args.setBid(bid); + args.setFrame(frame); args.setRequest(request); sendBase("ResourceRequestHandler_GetResourceHandler", args); } @@ -1148,17 +1161,18 @@ public class ClientHandlers { } @Override - public java.lang.String ResourceRequestHandler_OnResourceRedirect(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, java.lang.String new_url) throws org.apache.thrift.TException + public java.lang.String ResourceRequestHandler_OnResourceRedirect(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, java.lang.String new_url) throws org.apache.thrift.TException { - send_ResourceRequestHandler_OnResourceRedirect(rrHandler, bid, request, response, new_url); + send_ResourceRequestHandler_OnResourceRedirect(rrHandler, bid, frame, request, response, new_url); return recv_ResourceRequestHandler_OnResourceRedirect(); } - public void send_ResourceRequestHandler_OnResourceRedirect(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, java.lang.String new_url) throws org.apache.thrift.TException + public void send_ResourceRequestHandler_OnResourceRedirect(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, java.lang.String new_url) throws org.apache.thrift.TException { ResourceRequestHandler_OnResourceRedirect_args args = new ResourceRequestHandler_OnResourceRedirect_args(); args.setRrHandler(rrHandler); args.setBid(bid); + args.setFrame(frame); args.setRequest(request); args.setResponse(response); args.setNew_url(new_url); @@ -1176,17 +1190,18 @@ public class ClientHandlers { } @Override - public boolean ResourceRequestHandler_OnResourceResponse(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response) throws org.apache.thrift.TException + public boolean ResourceRequestHandler_OnResourceResponse(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response) throws org.apache.thrift.TException { - send_ResourceRequestHandler_OnResourceResponse(rrHandler, bid, request, response); + send_ResourceRequestHandler_OnResourceResponse(rrHandler, bid, frame, request, response); return recv_ResourceRequestHandler_OnResourceResponse(); } - public void send_ResourceRequestHandler_OnResourceResponse(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response) throws org.apache.thrift.TException + public void send_ResourceRequestHandler_OnResourceResponse(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response) throws org.apache.thrift.TException { ResourceRequestHandler_OnResourceResponse_args args = new ResourceRequestHandler_OnResourceResponse_args(); args.setRrHandler(rrHandler); args.setBid(bid); + args.setFrame(frame); args.setRequest(request); args.setResponse(response); sendBase("ResourceRequestHandler_OnResourceResponse", args); @@ -1203,17 +1218,18 @@ public class ClientHandlers { } @Override - public void ResourceRequestHandler_OnResourceLoadComplete(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, java.lang.String status, long receivedContentLength) throws org.apache.thrift.TException + public void ResourceRequestHandler_OnResourceLoadComplete(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, java.lang.String status, long receivedContentLength) throws org.apache.thrift.TException { - send_ResourceRequestHandler_OnResourceLoadComplete(rrHandler, bid, request, response, status, receivedContentLength); + send_ResourceRequestHandler_OnResourceLoadComplete(rrHandler, bid, frame, request, response, status, receivedContentLength); recv_ResourceRequestHandler_OnResourceLoadComplete(); } - public void send_ResourceRequestHandler_OnResourceLoadComplete(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, java.lang.String status, long receivedContentLength) throws org.apache.thrift.TException + public void send_ResourceRequestHandler_OnResourceLoadComplete(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, java.lang.String status, long receivedContentLength) throws org.apache.thrift.TException { ResourceRequestHandler_OnResourceLoadComplete_args args = new ResourceRequestHandler_OnResourceLoadComplete_args(); args.setRrHandler(rrHandler); args.setBid(bid); + args.setFrame(frame); args.setRequest(request); args.setResponse(response); args.setStatus(status); @@ -1229,17 +1245,18 @@ public class ClientHandlers { } @Override - public boolean ResourceRequestHandler_OnProtocolExecution(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, boolean allowOsExecution) throws org.apache.thrift.TException + public boolean ResourceRequestHandler_OnProtocolExecution(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, boolean allowOsExecution) throws org.apache.thrift.TException { - send_ResourceRequestHandler_OnProtocolExecution(rrHandler, bid, request, allowOsExecution); + send_ResourceRequestHandler_OnProtocolExecution(rrHandler, bid, frame, request, allowOsExecution); return recv_ResourceRequestHandler_OnProtocolExecution(); } - public void send_ResourceRequestHandler_OnProtocolExecution(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, boolean allowOsExecution) throws org.apache.thrift.TException + public void send_ResourceRequestHandler_OnProtocolExecution(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, boolean allowOsExecution) throws org.apache.thrift.TException { ResourceRequestHandler_OnProtocolExecution_args args = new ResourceRequestHandler_OnProtocolExecution_args(); args.setRrHandler(rrHandler); args.setBid(bid); + args.setFrame(frame); args.setRequest(request); args.setAllowOsExecution(allowOsExecution); sendBase("ResourceRequestHandler_OnProtocolExecution", args); @@ -1256,17 +1273,18 @@ public class ClientHandlers { } @Override - public boolean MessageRouterHandler_onQuery(com.jetbrains.cef.remote.thrift_codegen.RObject handler, int bid, long queryId, java.lang.String request, boolean persistent, com.jetbrains.cef.remote.thrift_codegen.RObject queryCallback) throws org.apache.thrift.TException + public boolean MessageRouterHandler_onQuery(com.jetbrains.cef.remote.thrift_codegen.RObject handler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, long queryId, java.lang.String request, boolean persistent, com.jetbrains.cef.remote.thrift_codegen.RObject queryCallback) throws org.apache.thrift.TException { - send_MessageRouterHandler_onQuery(handler, bid, queryId, request, persistent, queryCallback); + send_MessageRouterHandler_onQuery(handler, bid, frame, queryId, request, persistent, queryCallback); return recv_MessageRouterHandler_onQuery(); } - public void send_MessageRouterHandler_onQuery(com.jetbrains.cef.remote.thrift_codegen.RObject handler, int bid, long queryId, java.lang.String request, boolean persistent, com.jetbrains.cef.remote.thrift_codegen.RObject queryCallback) throws org.apache.thrift.TException + public void send_MessageRouterHandler_onQuery(com.jetbrains.cef.remote.thrift_codegen.RObject handler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, long queryId, java.lang.String request, boolean persistent, com.jetbrains.cef.remote.thrift_codegen.RObject queryCallback) throws org.apache.thrift.TException { MessageRouterHandler_onQuery_args args = new MessageRouterHandler_onQuery_args(); args.setHandler(handler); args.setBid(bid); + args.setFrame(frame); args.setQueryId(queryId); args.setRequest(request); args.setPersistent(persistent); @@ -1285,16 +1303,17 @@ public class ClientHandlers { } @Override - public void MessageRouterHandler_onQueryCanceled(com.jetbrains.cef.remote.thrift_codegen.RObject handler, int bid, long queryId) throws org.apache.thrift.TException + public void MessageRouterHandler_onQueryCanceled(com.jetbrains.cef.remote.thrift_codegen.RObject handler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, long queryId) throws org.apache.thrift.TException { - send_MessageRouterHandler_onQueryCanceled(handler, bid, queryId); + send_MessageRouterHandler_onQueryCanceled(handler, bid, frame, queryId); } - public void send_MessageRouterHandler_onQueryCanceled(com.jetbrains.cef.remote.thrift_codegen.RObject handler, int bid, long queryId) throws org.apache.thrift.TException + public void send_MessageRouterHandler_onQueryCanceled(com.jetbrains.cef.remote.thrift_codegen.RObject handler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, long queryId) throws org.apache.thrift.TException { MessageRouterHandler_onQueryCanceled_args args = new MessageRouterHandler_onQueryCanceled_args(); args.setHandler(handler); args.setBid(bid); + args.setFrame(frame); args.setQueryId(queryId); sendBaseOneway("MessageRouterHandler_onQueryCanceled", args); } @@ -1313,17 +1332,18 @@ public class ClientHandlers { } @Override - public com.jetbrains.cef.remote.thrift_codegen.RObject SchemeHandlerFactory_CreateHandler(int schemeHandlerFactory, int bid, java.lang.String scheme_name, com.jetbrains.cef.remote.thrift_codegen.RObject request) throws org.apache.thrift.TException + public com.jetbrains.cef.remote.thrift_codegen.RObject SchemeHandlerFactory_CreateHandler(int schemeHandlerFactory, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, java.lang.String scheme_name, com.jetbrains.cef.remote.thrift_codegen.RObject request) throws org.apache.thrift.TException { - send_SchemeHandlerFactory_CreateHandler(schemeHandlerFactory, bid, scheme_name, request); + send_SchemeHandlerFactory_CreateHandler(schemeHandlerFactory, bid, frame, scheme_name, request); return recv_SchemeHandlerFactory_CreateHandler(); } - public void send_SchemeHandlerFactory_CreateHandler(int schemeHandlerFactory, int bid, java.lang.String scheme_name, com.jetbrains.cef.remote.thrift_codegen.RObject request) throws org.apache.thrift.TException + public void send_SchemeHandlerFactory_CreateHandler(int schemeHandlerFactory, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, java.lang.String scheme_name, com.jetbrains.cef.remote.thrift_codegen.RObject request) throws org.apache.thrift.TException { SchemeHandlerFactory_CreateHandler_args args = new SchemeHandlerFactory_CreateHandler_args(); args.setSchemeHandlerFactory(schemeHandlerFactory); args.setBid(bid); + args.setFrame(frame); args.setScheme_name(scheme_name); args.setRequest(request); sendBase("SchemeHandlerFactory_CreateHandler", args); @@ -1636,21 +1656,23 @@ public class ClientHandlers { } @Override - public void LifeSpanHandler_OnBeforePopup(int bid, java.lang.String url, java.lang.String frameName, boolean gesture, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException { + public void LifeSpanHandler_OnBeforePopup(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, java.lang.String url, java.lang.String frameName, boolean gesture, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException { checkReady(); - LifeSpanHandler_OnBeforePopup_call method_call = new LifeSpanHandler_OnBeforePopup_call(bid, url, frameName, gesture, resultHandler, this, ___protocolFactory, ___transport); + LifeSpanHandler_OnBeforePopup_call method_call = new LifeSpanHandler_OnBeforePopup_call(bid, frame, url, frameName, gesture, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class LifeSpanHandler_OnBeforePopup_call extends org.apache.thrift.async.TAsyncMethodCall<java.lang.Boolean> { private int bid; + private com.jetbrains.cef.remote.thrift_codegen.RObject frame; private java.lang.String url; private java.lang.String frameName; private boolean gesture; - public LifeSpanHandler_OnBeforePopup_call(int bid, java.lang.String url, java.lang.String frameName, boolean gesture, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public LifeSpanHandler_OnBeforePopup_call(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, java.lang.String url, java.lang.String frameName, boolean gesture, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.bid = bid; + this.frame = frame; this.url = url; this.frameName = frameName; this.gesture = gesture; @@ -1661,6 +1683,7 @@ public class ClientHandlers { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("LifeSpanHandler_OnBeforePopup", org.apache.thrift.protocol.TMessageType.CALL, 0)); LifeSpanHandler_OnBeforePopup_args args = new LifeSpanHandler_OnBeforePopup_args(); args.setBid(bid); + args.setFrame(frame); args.setUrl(url); args.setFrameName(frameName); args.setGesture(gesture); @@ -1832,19 +1855,21 @@ public class ClientHandlers { } @Override - public void LoadHandler_OnLoadStart(int bid, int transition_type, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException { + public void LoadHandler_OnLoadStart(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, int transition_type, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException { checkReady(); - LoadHandler_OnLoadStart_call method_call = new LoadHandler_OnLoadStart_call(bid, transition_type, resultHandler, this, ___protocolFactory, ___transport); + LoadHandler_OnLoadStart_call method_call = new LoadHandler_OnLoadStart_call(bid, frame, transition_type, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class LoadHandler_OnLoadStart_call extends org.apache.thrift.async.TAsyncMethodCall<Void> { private int bid; + private com.jetbrains.cef.remote.thrift_codegen.RObject frame; private int transition_type; - public LoadHandler_OnLoadStart_call(int bid, int transition_type, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public LoadHandler_OnLoadStart_call(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, int transition_type, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, true); this.bid = bid; + this.frame = frame; this.transition_type = transition_type; } @@ -1853,6 +1878,7 @@ public class ClientHandlers { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("LoadHandler_OnLoadStart", org.apache.thrift.protocol.TMessageType.ONEWAY, 0)); LoadHandler_OnLoadStart_args args = new LoadHandler_OnLoadStart_args(); args.setBid(bid); + args.setFrame(frame); args.setTransition_type(transition_type); args.write(prot); prot.writeMessageEnd(); @@ -1870,19 +1896,21 @@ public class ClientHandlers { } @Override - public void LoadHandler_OnLoadEnd(int bid, int httpStatusCode, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException { + public void LoadHandler_OnLoadEnd(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, int httpStatusCode, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException { checkReady(); - LoadHandler_OnLoadEnd_call method_call = new LoadHandler_OnLoadEnd_call(bid, httpStatusCode, resultHandler, this, ___protocolFactory, ___transport); + LoadHandler_OnLoadEnd_call method_call = new LoadHandler_OnLoadEnd_call(bid, frame, httpStatusCode, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class LoadHandler_OnLoadEnd_call extends org.apache.thrift.async.TAsyncMethodCall<Void> { private int bid; + private com.jetbrains.cef.remote.thrift_codegen.RObject frame; private int httpStatusCode; - public LoadHandler_OnLoadEnd_call(int bid, int httpStatusCode, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public LoadHandler_OnLoadEnd_call(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, int httpStatusCode, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, true); this.bid = bid; + this.frame = frame; this.httpStatusCode = httpStatusCode; } @@ -1891,6 +1919,7 @@ public class ClientHandlers { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("LoadHandler_OnLoadEnd", org.apache.thrift.protocol.TMessageType.ONEWAY, 0)); LoadHandler_OnLoadEnd_args args = new LoadHandler_OnLoadEnd_args(); args.setBid(bid); + args.setFrame(frame); args.setHttpStatusCode(httpStatusCode); args.write(prot); prot.writeMessageEnd(); @@ -1908,21 +1937,23 @@ public class ClientHandlers { } @Override - public void LoadHandler_OnLoadError(int bid, int errorCode, java.lang.String errorText, java.lang.String failedUrl, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException { + public void LoadHandler_OnLoadError(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, int errorCode, java.lang.String errorText, java.lang.String failedUrl, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException { checkReady(); - LoadHandler_OnLoadError_call method_call = new LoadHandler_OnLoadError_call(bid, errorCode, errorText, failedUrl, resultHandler, this, ___protocolFactory, ___transport); + LoadHandler_OnLoadError_call method_call = new LoadHandler_OnLoadError_call(bid, frame, errorCode, errorText, failedUrl, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class LoadHandler_OnLoadError_call extends org.apache.thrift.async.TAsyncMethodCall<Void> { private int bid; + private com.jetbrains.cef.remote.thrift_codegen.RObject frame; private int errorCode; private java.lang.String errorText; private java.lang.String failedUrl; - public LoadHandler_OnLoadError_call(int bid, int errorCode, java.lang.String errorText, java.lang.String failedUrl, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public LoadHandler_OnLoadError_call(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, int errorCode, java.lang.String errorText, java.lang.String failedUrl, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, true); this.bid = bid; + this.frame = frame; this.errorCode = errorCode; this.errorText = errorText; this.failedUrl = failedUrl; @@ -1933,6 +1964,7 @@ public class ClientHandlers { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("LoadHandler_OnLoadError", org.apache.thrift.protocol.TMessageType.ONEWAY, 0)); LoadHandler_OnLoadError_args args = new LoadHandler_OnLoadError_args(); args.setBid(bid); + args.setFrame(frame); args.setErrorCode(errorCode); args.setErrorText(errorText); args.setFailedUrl(failedUrl); @@ -1952,19 +1984,21 @@ public class ClientHandlers { } @Override - public void DisplayHandler_OnAddressChange(int bid, java.lang.String url, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException { + public void DisplayHandler_OnAddressChange(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, java.lang.String url, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException { checkReady(); - DisplayHandler_OnAddressChange_call method_call = new DisplayHandler_OnAddressChange_call(bid, url, resultHandler, this, ___protocolFactory, ___transport); + DisplayHandler_OnAddressChange_call method_call = new DisplayHandler_OnAddressChange_call(bid, frame, url, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class DisplayHandler_OnAddressChange_call extends org.apache.thrift.async.TAsyncMethodCall<Void> { private int bid; + private com.jetbrains.cef.remote.thrift_codegen.RObject frame; private java.lang.String url; - public DisplayHandler_OnAddressChange_call(int bid, java.lang.String url, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public DisplayHandler_OnAddressChange_call(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, java.lang.String url, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, true); this.bid = bid; + this.frame = frame; this.url = url; } @@ -1973,6 +2007,7 @@ public class ClientHandlers { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("DisplayHandler_OnAddressChange", org.apache.thrift.protocol.TMessageType.ONEWAY, 0)); DisplayHandler_OnAddressChange_args args = new DisplayHandler_OnAddressChange_args(); args.setBid(bid); + args.setFrame(frame); args.setUrl(url); args.write(prot); prot.writeMessageEnd(); @@ -2338,21 +2373,23 @@ public class ClientHandlers { } @Override - public void RequestHandler_OnBeforeBrowse(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, boolean user_gesture, boolean is_redirect, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException { + public void RequestHandler_OnBeforeBrowse(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, boolean user_gesture, boolean is_redirect, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException { checkReady(); - RequestHandler_OnBeforeBrowse_call method_call = new RequestHandler_OnBeforeBrowse_call(bid, request, user_gesture, is_redirect, resultHandler, this, ___protocolFactory, ___transport); + RequestHandler_OnBeforeBrowse_call method_call = new RequestHandler_OnBeforeBrowse_call(bid, frame, request, user_gesture, is_redirect, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class RequestHandler_OnBeforeBrowse_call extends org.apache.thrift.async.TAsyncMethodCall<java.lang.Boolean> { private int bid; + private com.jetbrains.cef.remote.thrift_codegen.RObject frame; private com.jetbrains.cef.remote.thrift_codegen.RObject request; private boolean user_gesture; private boolean is_redirect; - public RequestHandler_OnBeforeBrowse_call(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, boolean user_gesture, boolean is_redirect, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public RequestHandler_OnBeforeBrowse_call(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, boolean user_gesture, boolean is_redirect, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.bid = bid; + this.frame = frame; this.request = request; this.user_gesture = user_gesture; this.is_redirect = is_redirect; @@ -2363,6 +2400,7 @@ public class ClientHandlers { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("RequestHandler_OnBeforeBrowse", org.apache.thrift.protocol.TMessageType.CALL, 0)); RequestHandler_OnBeforeBrowse_args args = new RequestHandler_OnBeforeBrowse_args(); args.setBid(bid); + args.setFrame(frame); args.setRequest(request); args.setUser_gesture(user_gesture); args.setIs_redirect(is_redirect); @@ -2382,20 +2420,22 @@ public class ClientHandlers { } @Override - public void RequestHandler_OnOpenURLFromTab(int bid, java.lang.String target_url, boolean user_gesture, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException { + public void RequestHandler_OnOpenURLFromTab(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, java.lang.String target_url, boolean user_gesture, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException { checkReady(); - RequestHandler_OnOpenURLFromTab_call method_call = new RequestHandler_OnOpenURLFromTab_call(bid, target_url, user_gesture, resultHandler, this, ___protocolFactory, ___transport); + RequestHandler_OnOpenURLFromTab_call method_call = new RequestHandler_OnOpenURLFromTab_call(bid, frame, target_url, user_gesture, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class RequestHandler_OnOpenURLFromTab_call extends org.apache.thrift.async.TAsyncMethodCall<java.lang.Boolean> { private int bid; + private com.jetbrains.cef.remote.thrift_codegen.RObject frame; private java.lang.String target_url; private boolean user_gesture; - public RequestHandler_OnOpenURLFromTab_call(int bid, java.lang.String target_url, boolean user_gesture, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public RequestHandler_OnOpenURLFromTab_call(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, java.lang.String target_url, boolean user_gesture, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.bid = bid; + this.frame = frame; this.target_url = target_url; this.user_gesture = user_gesture; } @@ -2405,6 +2445,7 @@ public class ClientHandlers { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("RequestHandler_OnOpenURLFromTab", org.apache.thrift.protocol.TMessageType.CALL, 0)); RequestHandler_OnOpenURLFromTab_args args = new RequestHandler_OnOpenURLFromTab_args(); args.setBid(bid); + args.setFrame(frame); args.setTarget_url(target_url); args.setUser_gesture(user_gesture); args.write(prot); @@ -2564,22 +2605,24 @@ public class ClientHandlers { } @Override - public void RequestHandler_GetResourceRequestHandler(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, boolean isNavigation, boolean isDownload, java.lang.String requestInitiator, org.apache.thrift.async.AsyncMethodCallback<com.jetbrains.cef.remote.thrift_codegen.RObject> resultHandler) throws org.apache.thrift.TException { + public void RequestHandler_GetResourceRequestHandler(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, boolean isNavigation, boolean isDownload, java.lang.String requestInitiator, org.apache.thrift.async.AsyncMethodCallback<com.jetbrains.cef.remote.thrift_codegen.RObject> resultHandler) throws org.apache.thrift.TException { checkReady(); - RequestHandler_GetResourceRequestHandler_call method_call = new RequestHandler_GetResourceRequestHandler_call(bid, request, isNavigation, isDownload, requestInitiator, resultHandler, this, ___protocolFactory, ___transport); + RequestHandler_GetResourceRequestHandler_call method_call = new RequestHandler_GetResourceRequestHandler_call(bid, frame, request, isNavigation, isDownload, requestInitiator, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class RequestHandler_GetResourceRequestHandler_call extends org.apache.thrift.async.TAsyncMethodCall<com.jetbrains.cef.remote.thrift_codegen.RObject> { private int bid; + private com.jetbrains.cef.remote.thrift_codegen.RObject frame; private com.jetbrains.cef.remote.thrift_codegen.RObject request; private boolean isNavigation; private boolean isDownload; private java.lang.String requestInitiator; - public RequestHandler_GetResourceRequestHandler_call(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, boolean isNavigation, boolean isDownload, java.lang.String requestInitiator, org.apache.thrift.async.AsyncMethodCallback<com.jetbrains.cef.remote.thrift_codegen.RObject> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public RequestHandler_GetResourceRequestHandler_call(int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, boolean isNavigation, boolean isDownload, java.lang.String requestInitiator, org.apache.thrift.async.AsyncMethodCallback<com.jetbrains.cef.remote.thrift_codegen.RObject> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.bid = bid; + this.frame = frame; this.request = request; this.isNavigation = isNavigation; this.isDownload = isDownload; @@ -2591,6 +2634,7 @@ public class ClientHandlers { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("RequestHandler_GetResourceRequestHandler", org.apache.thrift.protocol.TMessageType.CALL, 0)); RequestHandler_GetResourceRequestHandler_args args = new RequestHandler_GetResourceRequestHandler_args(); args.setBid(bid); + args.setFrame(frame); args.setRequest(request); args.setIsNavigation(isNavigation); args.setIsDownload(isDownload); @@ -2646,9 +2690,9 @@ public class ClientHandlers { } @Override - public void ResourceRequestHandler_GetCookieAccessFilter(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, org.apache.thrift.async.AsyncMethodCallback<com.jetbrains.cef.remote.thrift_codegen.RObject> resultHandler) throws org.apache.thrift.TException { + public void ResourceRequestHandler_GetCookieAccessFilter(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, org.apache.thrift.async.AsyncMethodCallback<com.jetbrains.cef.remote.thrift_codegen.RObject> resultHandler) throws org.apache.thrift.TException { checkReady(); - ResourceRequestHandler_GetCookieAccessFilter_call method_call = new ResourceRequestHandler_GetCookieAccessFilter_call(rrHandler, bid, request, resultHandler, this, ___protocolFactory, ___transport); + ResourceRequestHandler_GetCookieAccessFilter_call method_call = new ResourceRequestHandler_GetCookieAccessFilter_call(rrHandler, bid, frame, request, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -2656,11 +2700,13 @@ public class ClientHandlers { public static class ResourceRequestHandler_GetCookieAccessFilter_call extends org.apache.thrift.async.TAsyncMethodCall<com.jetbrains.cef.remote.thrift_codegen.RObject> { private int rrHandler; private int bid; + private com.jetbrains.cef.remote.thrift_codegen.RObject frame; private com.jetbrains.cef.remote.thrift_codegen.RObject request; - public ResourceRequestHandler_GetCookieAccessFilter_call(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, org.apache.thrift.async.AsyncMethodCallback<com.jetbrains.cef.remote.thrift_codegen.RObject> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public ResourceRequestHandler_GetCookieAccessFilter_call(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, org.apache.thrift.async.AsyncMethodCallback<com.jetbrains.cef.remote.thrift_codegen.RObject> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.rrHandler = rrHandler; this.bid = bid; + this.frame = frame; this.request = request; } @@ -2670,6 +2716,7 @@ public class ClientHandlers { ResourceRequestHandler_GetCookieAccessFilter_args args = new ResourceRequestHandler_GetCookieAccessFilter_args(); args.setRrHandler(rrHandler); args.setBid(bid); + args.setFrame(frame); args.setRequest(request); args.write(prot); prot.writeMessageEnd(); @@ -2722,9 +2769,9 @@ public class ClientHandlers { } @Override - public void CookieAccessFilter_CanSendCookie(int filter, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, java.util.List<java.lang.String> cookie, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException { + public void CookieAccessFilter_CanSendCookie(int filter, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, java.util.List<java.lang.String> cookie, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException { checkReady(); - CookieAccessFilter_CanSendCookie_call method_call = new CookieAccessFilter_CanSendCookie_call(filter, bid, request, cookie, resultHandler, this, ___protocolFactory, ___transport); + CookieAccessFilter_CanSendCookie_call method_call = new CookieAccessFilter_CanSendCookie_call(filter, bid, frame, request, cookie, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -2732,12 +2779,14 @@ public class ClientHandlers { public static class CookieAccessFilter_CanSendCookie_call extends org.apache.thrift.async.TAsyncMethodCall<java.lang.Boolean> { private int filter; private int bid; + private com.jetbrains.cef.remote.thrift_codegen.RObject frame; private com.jetbrains.cef.remote.thrift_codegen.RObject request; private java.util.List<java.lang.String> cookie; - public CookieAccessFilter_CanSendCookie_call(int filter, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, java.util.List<java.lang.String> cookie, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public CookieAccessFilter_CanSendCookie_call(int filter, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, java.util.List<java.lang.String> cookie, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.filter = filter; this.bid = bid; + this.frame = frame; this.request = request; this.cookie = cookie; } @@ -2748,6 +2797,7 @@ public class ClientHandlers { CookieAccessFilter_CanSendCookie_args args = new CookieAccessFilter_CanSendCookie_args(); args.setFilter(filter); args.setBid(bid); + args.setFrame(frame); args.setRequest(request); args.setCookie(cookie); args.write(prot); @@ -2766,9 +2816,9 @@ public class ClientHandlers { } @Override - public void CookieAccessFilter_CanSaveCookie(int filter, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, java.util.List<java.lang.String> cookie, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException { + public void CookieAccessFilter_CanSaveCookie(int filter, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, java.util.List<java.lang.String> cookie, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException { checkReady(); - CookieAccessFilter_CanSaveCookie_call method_call = new CookieAccessFilter_CanSaveCookie_call(filter, bid, request, response, cookie, resultHandler, this, ___protocolFactory, ___transport); + CookieAccessFilter_CanSaveCookie_call method_call = new CookieAccessFilter_CanSaveCookie_call(filter, bid, frame, request, response, cookie, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -2776,13 +2826,15 @@ public class ClientHandlers { public static class CookieAccessFilter_CanSaveCookie_call extends org.apache.thrift.async.TAsyncMethodCall<java.lang.Boolean> { private int filter; private int bid; + private com.jetbrains.cef.remote.thrift_codegen.RObject frame; private com.jetbrains.cef.remote.thrift_codegen.RObject request; private com.jetbrains.cef.remote.thrift_codegen.RObject response; private java.util.List<java.lang.String> cookie; - public CookieAccessFilter_CanSaveCookie_call(int filter, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, java.util.List<java.lang.String> cookie, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public CookieAccessFilter_CanSaveCookie_call(int filter, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, java.util.List<java.lang.String> cookie, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.filter = filter; this.bid = bid; + this.frame = frame; this.request = request; this.response = response; this.cookie = cookie; @@ -2794,6 +2846,7 @@ public class ClientHandlers { CookieAccessFilter_CanSaveCookie_args args = new CookieAccessFilter_CanSaveCookie_args(); args.setFilter(filter); args.setBid(bid); + args.setFrame(frame); args.setRequest(request); args.setResponse(response); args.setCookie(cookie); @@ -2813,9 +2866,9 @@ public class ClientHandlers { } @Override - public void ResourceRequestHandler_OnBeforeResourceLoad(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException { + public void ResourceRequestHandler_OnBeforeResourceLoad(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException { checkReady(); - ResourceRequestHandler_OnBeforeResourceLoad_call method_call = new ResourceRequestHandler_OnBeforeResourceLoad_call(rrHandler, bid, request, resultHandler, this, ___protocolFactory, ___transport); + ResourceRequestHandler_OnBeforeResourceLoad_call method_call = new ResourceRequestHandler_OnBeforeResourceLoad_call(rrHandler, bid, frame, request, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -2823,11 +2876,13 @@ public class ClientHandlers { public static class ResourceRequestHandler_OnBeforeResourceLoad_call extends org.apache.thrift.async.TAsyncMethodCall<java.lang.Boolean> { private int rrHandler; private int bid; + private com.jetbrains.cef.remote.thrift_codegen.RObject frame; private com.jetbrains.cef.remote.thrift_codegen.RObject request; - public ResourceRequestHandler_OnBeforeResourceLoad_call(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public ResourceRequestHandler_OnBeforeResourceLoad_call(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.rrHandler = rrHandler; this.bid = bid; + this.frame = frame; this.request = request; } @@ -2837,6 +2892,7 @@ public class ClientHandlers { ResourceRequestHandler_OnBeforeResourceLoad_args args = new ResourceRequestHandler_OnBeforeResourceLoad_args(); args.setRrHandler(rrHandler); args.setBid(bid); + args.setFrame(frame); args.setRequest(request); args.write(prot); prot.writeMessageEnd(); @@ -2854,9 +2910,9 @@ public class ClientHandlers { } @Override - public void ResourceRequestHandler_GetResourceHandler(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, org.apache.thrift.async.AsyncMethodCallback<com.jetbrains.cef.remote.thrift_codegen.RObject> resultHandler) throws org.apache.thrift.TException { + public void ResourceRequestHandler_GetResourceHandler(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, org.apache.thrift.async.AsyncMethodCallback<com.jetbrains.cef.remote.thrift_codegen.RObject> resultHandler) throws org.apache.thrift.TException { checkReady(); - ResourceRequestHandler_GetResourceHandler_call method_call = new ResourceRequestHandler_GetResourceHandler_call(rrHandler, bid, request, resultHandler, this, ___protocolFactory, ___transport); + ResourceRequestHandler_GetResourceHandler_call method_call = new ResourceRequestHandler_GetResourceHandler_call(rrHandler, bid, frame, request, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -2864,11 +2920,13 @@ public class ClientHandlers { public static class ResourceRequestHandler_GetResourceHandler_call extends org.apache.thrift.async.TAsyncMethodCall<com.jetbrains.cef.remote.thrift_codegen.RObject> { private int rrHandler; private int bid; + private com.jetbrains.cef.remote.thrift_codegen.RObject frame; private com.jetbrains.cef.remote.thrift_codegen.RObject request; - public ResourceRequestHandler_GetResourceHandler_call(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, org.apache.thrift.async.AsyncMethodCallback<com.jetbrains.cef.remote.thrift_codegen.RObject> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public ResourceRequestHandler_GetResourceHandler_call(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, org.apache.thrift.async.AsyncMethodCallback<com.jetbrains.cef.remote.thrift_codegen.RObject> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.rrHandler = rrHandler; this.bid = bid; + this.frame = frame; this.request = request; } @@ -2878,6 +2936,7 @@ public class ClientHandlers { ResourceRequestHandler_GetResourceHandler_args args = new ResourceRequestHandler_GetResourceHandler_args(); args.setRrHandler(rrHandler); args.setBid(bid); + args.setFrame(frame); args.setRequest(request); args.write(prot); prot.writeMessageEnd(); @@ -3085,9 +3144,9 @@ public class ClientHandlers { } @Override - public void ResourceRequestHandler_OnResourceRedirect(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, java.lang.String new_url, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException { + public void ResourceRequestHandler_OnResourceRedirect(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, java.lang.String new_url, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException { checkReady(); - ResourceRequestHandler_OnResourceRedirect_call method_call = new ResourceRequestHandler_OnResourceRedirect_call(rrHandler, bid, request, response, new_url, resultHandler, this, ___protocolFactory, ___transport); + ResourceRequestHandler_OnResourceRedirect_call method_call = new ResourceRequestHandler_OnResourceRedirect_call(rrHandler, bid, frame, request, response, new_url, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -3095,13 +3154,15 @@ public class ClientHandlers { public static class ResourceRequestHandler_OnResourceRedirect_call extends org.apache.thrift.async.TAsyncMethodCall<java.lang.String> { private int rrHandler; private int bid; + private com.jetbrains.cef.remote.thrift_codegen.RObject frame; private com.jetbrains.cef.remote.thrift_codegen.RObject request; private com.jetbrains.cef.remote.thrift_codegen.RObject response; private java.lang.String new_url; - public ResourceRequestHandler_OnResourceRedirect_call(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, java.lang.String new_url, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public ResourceRequestHandler_OnResourceRedirect_call(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, java.lang.String new_url, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.rrHandler = rrHandler; this.bid = bid; + this.frame = frame; this.request = request; this.response = response; this.new_url = new_url; @@ -3113,6 +3174,7 @@ public class ClientHandlers { ResourceRequestHandler_OnResourceRedirect_args args = new ResourceRequestHandler_OnResourceRedirect_args(); args.setRrHandler(rrHandler); args.setBid(bid); + args.setFrame(frame); args.setRequest(request); args.setResponse(response); args.setNew_url(new_url); @@ -3132,9 +3194,9 @@ public class ClientHandlers { } @Override - public void ResourceRequestHandler_OnResourceResponse(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException { + public void ResourceRequestHandler_OnResourceResponse(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException { checkReady(); - ResourceRequestHandler_OnResourceResponse_call method_call = new ResourceRequestHandler_OnResourceResponse_call(rrHandler, bid, request, response, resultHandler, this, ___protocolFactory, ___transport); + ResourceRequestHandler_OnResourceResponse_call method_call = new ResourceRequestHandler_OnResourceResponse_call(rrHandler, bid, frame, request, response, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -3142,12 +3204,14 @@ public class ClientHandlers { public static class ResourceRequestHandler_OnResourceResponse_call extends org.apache.thrift.async.TAsyncMethodCall<java.lang.Boolean> { private int rrHandler; private int bid; + private com.jetbrains.cef.remote.thrift_codegen.RObject frame; private com.jetbrains.cef.remote.thrift_codegen.RObject request; private com.jetbrains.cef.remote.thrift_codegen.RObject response; - public ResourceRequestHandler_OnResourceResponse_call(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public ResourceRequestHandler_OnResourceResponse_call(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.rrHandler = rrHandler; this.bid = bid; + this.frame = frame; this.request = request; this.response = response; } @@ -3158,6 +3222,7 @@ public class ClientHandlers { ResourceRequestHandler_OnResourceResponse_args args = new ResourceRequestHandler_OnResourceResponse_args(); args.setRrHandler(rrHandler); args.setBid(bid); + args.setFrame(frame); args.setRequest(request); args.setResponse(response); args.write(prot); @@ -3176,9 +3241,9 @@ public class ClientHandlers { } @Override - public void ResourceRequestHandler_OnResourceLoadComplete(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, java.lang.String status, long receivedContentLength, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException { + public void ResourceRequestHandler_OnResourceLoadComplete(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, java.lang.String status, long receivedContentLength, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException { checkReady(); - ResourceRequestHandler_OnResourceLoadComplete_call method_call = new ResourceRequestHandler_OnResourceLoadComplete_call(rrHandler, bid, request, response, status, receivedContentLength, resultHandler, this, ___protocolFactory, ___transport); + ResourceRequestHandler_OnResourceLoadComplete_call method_call = new ResourceRequestHandler_OnResourceLoadComplete_call(rrHandler, bid, frame, request, response, status, receivedContentLength, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -3186,14 +3251,16 @@ public class ClientHandlers { public static class ResourceRequestHandler_OnResourceLoadComplete_call extends org.apache.thrift.async.TAsyncMethodCall<Void> { private int rrHandler; private int bid; + private com.jetbrains.cef.remote.thrift_codegen.RObject frame; private com.jetbrains.cef.remote.thrift_codegen.RObject request; private com.jetbrains.cef.remote.thrift_codegen.RObject response; private java.lang.String status; private long receivedContentLength; - public ResourceRequestHandler_OnResourceLoadComplete_call(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, java.lang.String status, long receivedContentLength, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public ResourceRequestHandler_OnResourceLoadComplete_call(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, java.lang.String status, long receivedContentLength, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.rrHandler = rrHandler; this.bid = bid; + this.frame = frame; this.request = request; this.response = response; this.status = status; @@ -3206,6 +3273,7 @@ public class ClientHandlers { ResourceRequestHandler_OnResourceLoadComplete_args args = new ResourceRequestHandler_OnResourceLoadComplete_args(); args.setRrHandler(rrHandler); args.setBid(bid); + args.setFrame(frame); args.setRequest(request); args.setResponse(response); args.setStatus(status); @@ -3227,9 +3295,9 @@ public class ClientHandlers { } @Override - public void ResourceRequestHandler_OnProtocolExecution(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, boolean allowOsExecution, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException { + public void ResourceRequestHandler_OnProtocolExecution(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, boolean allowOsExecution, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException { checkReady(); - ResourceRequestHandler_OnProtocolExecution_call method_call = new ResourceRequestHandler_OnProtocolExecution_call(rrHandler, bid, request, allowOsExecution, resultHandler, this, ___protocolFactory, ___transport); + ResourceRequestHandler_OnProtocolExecution_call method_call = new ResourceRequestHandler_OnProtocolExecution_call(rrHandler, bid, frame, request, allowOsExecution, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -3237,12 +3305,14 @@ public class ClientHandlers { public static class ResourceRequestHandler_OnProtocolExecution_call extends org.apache.thrift.async.TAsyncMethodCall<java.lang.Boolean> { private int rrHandler; private int bid; + private com.jetbrains.cef.remote.thrift_codegen.RObject frame; private com.jetbrains.cef.remote.thrift_codegen.RObject request; private boolean allowOsExecution; - public ResourceRequestHandler_OnProtocolExecution_call(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject request, boolean allowOsExecution, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public ResourceRequestHandler_OnProtocolExecution_call(int rrHandler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, boolean allowOsExecution, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.rrHandler = rrHandler; this.bid = bid; + this.frame = frame; this.request = request; this.allowOsExecution = allowOsExecution; } @@ -3253,6 +3323,7 @@ public class ClientHandlers { ResourceRequestHandler_OnProtocolExecution_args args = new ResourceRequestHandler_OnProtocolExecution_args(); args.setRrHandler(rrHandler); args.setBid(bid); + args.setFrame(frame); args.setRequest(request); args.setAllowOsExecution(allowOsExecution); args.write(prot); @@ -3271,9 +3342,9 @@ public class ClientHandlers { } @Override - public void MessageRouterHandler_onQuery(com.jetbrains.cef.remote.thrift_codegen.RObject handler, int bid, long queryId, java.lang.String request, boolean persistent, com.jetbrains.cef.remote.thrift_codegen.RObject queryCallback, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException { + public void MessageRouterHandler_onQuery(com.jetbrains.cef.remote.thrift_codegen.RObject handler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, long queryId, java.lang.String request, boolean persistent, com.jetbrains.cef.remote.thrift_codegen.RObject queryCallback, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException { checkReady(); - MessageRouterHandler_onQuery_call method_call = new MessageRouterHandler_onQuery_call(handler, bid, queryId, request, persistent, queryCallback, resultHandler, this, ___protocolFactory, ___transport); + MessageRouterHandler_onQuery_call method_call = new MessageRouterHandler_onQuery_call(handler, bid, frame, queryId, request, persistent, queryCallback, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -3281,14 +3352,16 @@ public class ClientHandlers { public static class MessageRouterHandler_onQuery_call extends org.apache.thrift.async.TAsyncMethodCall<java.lang.Boolean> { private com.jetbrains.cef.remote.thrift_codegen.RObject handler; private int bid; + private com.jetbrains.cef.remote.thrift_codegen.RObject frame; private long queryId; private java.lang.String request; private boolean persistent; private com.jetbrains.cef.remote.thrift_codegen.RObject queryCallback; - public MessageRouterHandler_onQuery_call(com.jetbrains.cef.remote.thrift_codegen.RObject handler, int bid, long queryId, java.lang.String request, boolean persistent, com.jetbrains.cef.remote.thrift_codegen.RObject queryCallback, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public MessageRouterHandler_onQuery_call(com.jetbrains.cef.remote.thrift_codegen.RObject handler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, long queryId, java.lang.String request, boolean persistent, com.jetbrains.cef.remote.thrift_codegen.RObject queryCallback, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.handler = handler; this.bid = bid; + this.frame = frame; this.queryId = queryId; this.request = request; this.persistent = persistent; @@ -3301,6 +3374,7 @@ public class ClientHandlers { MessageRouterHandler_onQuery_args args = new MessageRouterHandler_onQuery_args(); args.setHandler(handler); args.setBid(bid); + args.setFrame(frame); args.setQueryId(queryId); args.setRequest(request); args.setPersistent(persistent); @@ -3321,9 +3395,9 @@ public class ClientHandlers { } @Override - public void MessageRouterHandler_onQueryCanceled(com.jetbrains.cef.remote.thrift_codegen.RObject handler, int bid, long queryId, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException { + public void MessageRouterHandler_onQueryCanceled(com.jetbrains.cef.remote.thrift_codegen.RObject handler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, long queryId, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException { checkReady(); - MessageRouterHandler_onQueryCanceled_call method_call = new MessageRouterHandler_onQueryCanceled_call(handler, bid, queryId, resultHandler, this, ___protocolFactory, ___transport); + MessageRouterHandler_onQueryCanceled_call method_call = new MessageRouterHandler_onQueryCanceled_call(handler, bid, frame, queryId, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -3331,11 +3405,13 @@ public class ClientHandlers { public static class MessageRouterHandler_onQueryCanceled_call extends org.apache.thrift.async.TAsyncMethodCall<Void> { private com.jetbrains.cef.remote.thrift_codegen.RObject handler; private int bid; + private com.jetbrains.cef.remote.thrift_codegen.RObject frame; private long queryId; - public MessageRouterHandler_onQueryCanceled_call(com.jetbrains.cef.remote.thrift_codegen.RObject handler, int bid, long queryId, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public MessageRouterHandler_onQueryCanceled_call(com.jetbrains.cef.remote.thrift_codegen.RObject handler, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, long queryId, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, true); this.handler = handler; this.bid = bid; + this.frame = frame; this.queryId = queryId; } @@ -3345,6 +3421,7 @@ public class ClientHandlers { MessageRouterHandler_onQueryCanceled_args args = new MessageRouterHandler_onQueryCanceled_args(); args.setHandler(handler); args.setBid(bid); + args.setFrame(frame); args.setQueryId(queryId); args.write(prot); prot.writeMessageEnd(); @@ -3397,9 +3474,9 @@ public class ClientHandlers { } @Override - public void SchemeHandlerFactory_CreateHandler(int schemeHandlerFactory, int bid, java.lang.String scheme_name, com.jetbrains.cef.remote.thrift_codegen.RObject request, org.apache.thrift.async.AsyncMethodCallback<com.jetbrains.cef.remote.thrift_codegen.RObject> resultHandler) throws org.apache.thrift.TException { + public void SchemeHandlerFactory_CreateHandler(int schemeHandlerFactory, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, java.lang.String scheme_name, com.jetbrains.cef.remote.thrift_codegen.RObject request, org.apache.thrift.async.AsyncMethodCallback<com.jetbrains.cef.remote.thrift_codegen.RObject> resultHandler) throws org.apache.thrift.TException { checkReady(); - SchemeHandlerFactory_CreateHandler_call method_call = new SchemeHandlerFactory_CreateHandler_call(schemeHandlerFactory, bid, scheme_name, request, resultHandler, this, ___protocolFactory, ___transport); + SchemeHandlerFactory_CreateHandler_call method_call = new SchemeHandlerFactory_CreateHandler_call(schemeHandlerFactory, bid, frame, scheme_name, request, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -3407,12 +3484,14 @@ public class ClientHandlers { public static class SchemeHandlerFactory_CreateHandler_call extends org.apache.thrift.async.TAsyncMethodCall<com.jetbrains.cef.remote.thrift_codegen.RObject> { private int schemeHandlerFactory; private int bid; + private com.jetbrains.cef.remote.thrift_codegen.RObject frame; private java.lang.String scheme_name; private com.jetbrains.cef.remote.thrift_codegen.RObject request; - public SchemeHandlerFactory_CreateHandler_call(int schemeHandlerFactory, int bid, java.lang.String scheme_name, com.jetbrains.cef.remote.thrift_codegen.RObject request, org.apache.thrift.async.AsyncMethodCallback<com.jetbrains.cef.remote.thrift_codegen.RObject> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public SchemeHandlerFactory_CreateHandler_call(int schemeHandlerFactory, int bid, com.jetbrains.cef.remote.thrift_codegen.RObject frame, java.lang.String scheme_name, com.jetbrains.cef.remote.thrift_codegen.RObject request, org.apache.thrift.async.AsyncMethodCallback<com.jetbrains.cef.remote.thrift_codegen.RObject> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.schemeHandlerFactory = schemeHandlerFactory; this.bid = bid; + this.frame = frame; this.scheme_name = scheme_name; this.request = request; } @@ -3423,6 +3502,7 @@ public class ClientHandlers { SchemeHandlerFactory_CreateHandler_args args = new SchemeHandlerFactory_CreateHandler_args(); args.setSchemeHandlerFactory(schemeHandlerFactory); args.setBid(bid); + args.setFrame(frame); args.setScheme_name(scheme_name); args.setRequest(request); args.write(prot); @@ -3761,7 +3841,7 @@ public class ClientHandlers { @Override public LifeSpanHandler_OnBeforePopup_result getResult(I iface, LifeSpanHandler_OnBeforePopup_args args) throws org.apache.thrift.TException { LifeSpanHandler_OnBeforePopup_result result = new LifeSpanHandler_OnBeforePopup_result(); - result.success = iface.LifeSpanHandler_OnBeforePopup(args.bid, args.url, args.frameName, args.gesture); + result.success = iface.LifeSpanHandler_OnBeforePopup(args.bid, args.frame, args.url, args.frameName, args.gesture); result.setSuccessIsSet(true); return result; } @@ -3899,7 +3979,7 @@ public class ClientHandlers { @Override public org.apache.thrift.TBase getResult(I iface, LoadHandler_OnLoadStart_args args) throws org.apache.thrift.TException { - iface.LoadHandler_OnLoadStart(args.bid, args.transition_type); + iface.LoadHandler_OnLoadStart(args.bid, args.frame, args.transition_type); return null; } } @@ -3926,7 +4006,7 @@ public class ClientHandlers { @Override public org.apache.thrift.TBase getResult(I iface, LoadHandler_OnLoadEnd_args args) throws org.apache.thrift.TException { - iface.LoadHandler_OnLoadEnd(args.bid, args.httpStatusCode); + iface.LoadHandler_OnLoadEnd(args.bid, args.frame, args.httpStatusCode); return null; } } @@ -3953,7 +4033,7 @@ public class ClientHandlers { @Override public org.apache.thrift.TBase getResult(I iface, LoadHandler_OnLoadError_args args) throws org.apache.thrift.TException { - iface.LoadHandler_OnLoadError(args.bid, args.errorCode, args.errorText, args.failedUrl); + iface.LoadHandler_OnLoadError(args.bid, args.frame, args.errorCode, args.errorText, args.failedUrl); return null; } } @@ -3980,7 +4060,7 @@ public class ClientHandlers { @Override public org.apache.thrift.TBase getResult(I iface, DisplayHandler_OnAddressChange_args args) throws org.apache.thrift.TException { - iface.DisplayHandler_OnAddressChange(args.bid, args.url); + iface.DisplayHandler_OnAddressChange(args.bid, args.frame, args.url); return null; } } @@ -4261,7 +4341,7 @@ public class ClientHandlers { @Override public RequestHandler_OnBeforeBrowse_result getResult(I iface, RequestHandler_OnBeforeBrowse_args args) throws org.apache.thrift.TException { RequestHandler_OnBeforeBrowse_result result = new RequestHandler_OnBeforeBrowse_result(); - result.success = iface.RequestHandler_OnBeforeBrowse(args.bid, args.request, args.user_gesture, args.is_redirect); + result.success = iface.RequestHandler_OnBeforeBrowse(args.bid, args.frame, args.request, args.user_gesture, args.is_redirect); result.setSuccessIsSet(true); return result; } @@ -4290,7 +4370,7 @@ public class ClientHandlers { @Override public RequestHandler_OnOpenURLFromTab_result getResult(I iface, RequestHandler_OnOpenURLFromTab_args args) throws org.apache.thrift.TException { RequestHandler_OnOpenURLFromTab_result result = new RequestHandler_OnOpenURLFromTab_result(); - result.success = iface.RequestHandler_OnOpenURLFromTab(args.bid, args.target_url, args.user_gesture); + result.success = iface.RequestHandler_OnOpenURLFromTab(args.bid, args.frame, args.target_url, args.user_gesture); result.setSuccessIsSet(true); return result; } @@ -4404,7 +4484,7 @@ public class ClientHandlers { @Override public RequestHandler_GetResourceRequestHandler_result getResult(I iface, RequestHandler_GetResourceRequestHandler_args args) throws org.apache.thrift.TException { RequestHandler_GetResourceRequestHandler_result result = new RequestHandler_GetResourceRequestHandler_result(); - result.success = iface.RequestHandler_GetResourceRequestHandler(args.bid, args.request, args.isNavigation, args.isDownload, args.requestInitiator); + result.success = iface.RequestHandler_GetResourceRequestHandler(args.bid, args.frame, args.request, args.isNavigation, args.isDownload, args.requestInitiator); return result; } } @@ -4459,7 +4539,7 @@ public class ClientHandlers { @Override public ResourceRequestHandler_GetCookieAccessFilter_result getResult(I iface, ResourceRequestHandler_GetCookieAccessFilter_args args) throws org.apache.thrift.TException { ResourceRequestHandler_GetCookieAccessFilter_result result = new ResourceRequestHandler_GetCookieAccessFilter_result(); - result.success = iface.ResourceRequestHandler_GetCookieAccessFilter(args.rrHandler, args.bid, args.request); + result.success = iface.ResourceRequestHandler_GetCookieAccessFilter(args.rrHandler, args.bid, args.frame, args.request); return result; } } @@ -4514,7 +4594,7 @@ public class ClientHandlers { @Override public CookieAccessFilter_CanSendCookie_result getResult(I iface, CookieAccessFilter_CanSendCookie_args args) throws org.apache.thrift.TException { CookieAccessFilter_CanSendCookie_result result = new CookieAccessFilter_CanSendCookie_result(); - result.success = iface.CookieAccessFilter_CanSendCookie(args.filter, args.bid, args.request, args.cookie); + result.success = iface.CookieAccessFilter_CanSendCookie(args.filter, args.bid, args.frame, args.request, args.cookie); result.setSuccessIsSet(true); return result; } @@ -4543,7 +4623,7 @@ public class ClientHandlers { @Override public CookieAccessFilter_CanSaveCookie_result getResult(I iface, CookieAccessFilter_CanSaveCookie_args args) throws org.apache.thrift.TException { CookieAccessFilter_CanSaveCookie_result result = new CookieAccessFilter_CanSaveCookie_result(); - result.success = iface.CookieAccessFilter_CanSaveCookie(args.filter, args.bid, args.request, args.response, args.cookie); + result.success = iface.CookieAccessFilter_CanSaveCookie(args.filter, args.bid, args.frame, args.request, args.response, args.cookie); result.setSuccessIsSet(true); return result; } @@ -4572,7 +4652,7 @@ public class ClientHandlers { @Override public ResourceRequestHandler_OnBeforeResourceLoad_result getResult(I iface, ResourceRequestHandler_OnBeforeResourceLoad_args args) throws org.apache.thrift.TException { ResourceRequestHandler_OnBeforeResourceLoad_result result = new ResourceRequestHandler_OnBeforeResourceLoad_result(); - result.success = iface.ResourceRequestHandler_OnBeforeResourceLoad(args.rrHandler, args.bid, args.request); + result.success = iface.ResourceRequestHandler_OnBeforeResourceLoad(args.rrHandler, args.bid, args.frame, args.request); result.setSuccessIsSet(true); return result; } @@ -4601,7 +4681,7 @@ public class ClientHandlers { @Override public ResourceRequestHandler_GetResourceHandler_result getResult(I iface, ResourceRequestHandler_GetResourceHandler_args args) throws org.apache.thrift.TException { ResourceRequestHandler_GetResourceHandler_result result = new ResourceRequestHandler_GetResourceHandler_result(); - result.success = iface.ResourceRequestHandler_GetResourceHandler(args.rrHandler, args.bid, args.request); + result.success = iface.ResourceRequestHandler_GetResourceHandler(args.rrHandler, args.bid, args.frame, args.request); return result; } } @@ -4768,7 +4848,7 @@ public class ClientHandlers { @Override public ResourceRequestHandler_OnResourceRedirect_result getResult(I iface, ResourceRequestHandler_OnResourceRedirect_args args) throws org.apache.thrift.TException { ResourceRequestHandler_OnResourceRedirect_result result = new ResourceRequestHandler_OnResourceRedirect_result(); - result.success = iface.ResourceRequestHandler_OnResourceRedirect(args.rrHandler, args.bid, args.request, args.response, args.new_url); + result.success = iface.ResourceRequestHandler_OnResourceRedirect(args.rrHandler, args.bid, args.frame, args.request, args.response, args.new_url); return result; } } @@ -4796,7 +4876,7 @@ public class ClientHandlers { @Override public ResourceRequestHandler_OnResourceResponse_result getResult(I iface, ResourceRequestHandler_OnResourceResponse_args args) throws org.apache.thrift.TException { ResourceRequestHandler_OnResourceResponse_result result = new ResourceRequestHandler_OnResourceResponse_result(); - result.success = iface.ResourceRequestHandler_OnResourceResponse(args.rrHandler, args.bid, args.request, args.response); + result.success = iface.ResourceRequestHandler_OnResourceResponse(args.rrHandler, args.bid, args.frame, args.request, args.response); result.setSuccessIsSet(true); return result; } @@ -4825,7 +4905,7 @@ public class ClientHandlers { @Override public ResourceRequestHandler_OnResourceLoadComplete_result getResult(I iface, ResourceRequestHandler_OnResourceLoadComplete_args args) throws org.apache.thrift.TException { ResourceRequestHandler_OnResourceLoadComplete_result result = new ResourceRequestHandler_OnResourceLoadComplete_result(); - iface.ResourceRequestHandler_OnResourceLoadComplete(args.rrHandler, args.bid, args.request, args.response, args.status, args.receivedContentLength); + iface.ResourceRequestHandler_OnResourceLoadComplete(args.rrHandler, args.bid, args.frame, args.request, args.response, args.status, args.receivedContentLength); return result; } } @@ -4853,7 +4933,7 @@ public class ClientHandlers { @Override public ResourceRequestHandler_OnProtocolExecution_result getResult(I iface, ResourceRequestHandler_OnProtocolExecution_args args) throws org.apache.thrift.TException { ResourceRequestHandler_OnProtocolExecution_result result = new ResourceRequestHandler_OnProtocolExecution_result(); - result.success = iface.ResourceRequestHandler_OnProtocolExecution(args.rrHandler, args.bid, args.request, args.allowOsExecution); + result.success = iface.ResourceRequestHandler_OnProtocolExecution(args.rrHandler, args.bid, args.frame, args.request, args.allowOsExecution); result.setSuccessIsSet(true); return result; } @@ -4882,7 +4962,7 @@ public class ClientHandlers { @Override public MessageRouterHandler_onQuery_result getResult(I iface, MessageRouterHandler_onQuery_args args) throws org.apache.thrift.TException { MessageRouterHandler_onQuery_result result = new MessageRouterHandler_onQuery_result(); - result.success = iface.MessageRouterHandler_onQuery(args.handler, args.bid, args.queryId, args.request, args.persistent, args.queryCallback); + result.success = iface.MessageRouterHandler_onQuery(args.handler, args.bid, args.frame, args.queryId, args.request, args.persistent, args.queryCallback); result.setSuccessIsSet(true); return result; } @@ -4910,7 +4990,7 @@ public class ClientHandlers { @Override public org.apache.thrift.TBase getResult(I iface, MessageRouterHandler_onQueryCanceled_args args) throws org.apache.thrift.TException { - iface.MessageRouterHandler_onQueryCanceled(args.handler, args.bid, args.queryId); + iface.MessageRouterHandler_onQueryCanceled(args.handler, args.bid, args.frame, args.queryId); return null; } } @@ -4965,7 +5045,7 @@ public class ClientHandlers { @Override public SchemeHandlerFactory_CreateHandler_result getResult(I iface, SchemeHandlerFactory_CreateHandler_args args) throws org.apache.thrift.TException { SchemeHandlerFactory_CreateHandler_result result = new SchemeHandlerFactory_CreateHandler_result(); - result.success = iface.SchemeHandlerFactory_CreateHandler(args.schemeHandlerFactory, args.bid, args.scheme_name, args.request); + result.success = iface.SchemeHandlerFactory_CreateHandler(args.schemeHandlerFactory, args.bid, args.frame, args.scheme_name, args.request); return result; } } @@ -5544,7 +5624,7 @@ public class ClientHandlers { @Override public void start(I iface, LifeSpanHandler_OnBeforePopup_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException { - iface.LifeSpanHandler_OnBeforePopup(args.bid, args.url, args.frameName, args.gesture,resultHandler); + iface.LifeSpanHandler_OnBeforePopup(args.bid, args.frame, args.url, args.frameName, args.gesture,resultHandler); } } @@ -5772,7 +5852,7 @@ public class ClientHandlers { @Override public void start(I iface, LoadHandler_OnLoadStart_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException { - iface.LoadHandler_OnLoadStart(args.bid, args.transition_type,resultHandler); + iface.LoadHandler_OnLoadStart(args.bid, args.frame, args.transition_type,resultHandler); } } @@ -5812,7 +5892,7 @@ public class ClientHandlers { @Override public void start(I iface, LoadHandler_OnLoadEnd_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException { - iface.LoadHandler_OnLoadEnd(args.bid, args.httpStatusCode,resultHandler); + iface.LoadHandler_OnLoadEnd(args.bid, args.frame, args.httpStatusCode,resultHandler); } } @@ -5852,7 +5932,7 @@ public class ClientHandlers { @Override public void start(I iface, LoadHandler_OnLoadError_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException { - iface.LoadHandler_OnLoadError(args.bid, args.errorCode, args.errorText, args.failedUrl,resultHandler); + iface.LoadHandler_OnLoadError(args.bid, args.frame, args.errorCode, args.errorText, args.failedUrl,resultHandler); } } @@ -5892,7 +5972,7 @@ public class ClientHandlers { @Override public void start(I iface, DisplayHandler_OnAddressChange_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException { - iface.DisplayHandler_OnAddressChange(args.bid, args.url,resultHandler); + iface.DisplayHandler_OnAddressChange(args.bid, args.frame, args.url,resultHandler); } } @@ -6460,7 +6540,7 @@ public class ClientHandlers { @Override public void start(I iface, RequestHandler_OnBeforeBrowse_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException { - iface.RequestHandler_OnBeforeBrowse(args.bid, args.request, args.user_gesture, args.is_redirect,resultHandler); + iface.RequestHandler_OnBeforeBrowse(args.bid, args.frame, args.request, args.user_gesture, args.is_redirect,resultHandler); } } @@ -6528,7 +6608,7 @@ public class ClientHandlers { @Override public void start(I iface, RequestHandler_OnOpenURLFromTab_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException { - iface.RequestHandler_OnOpenURLFromTab(args.bid, args.target_url, args.user_gesture,resultHandler); + iface.RequestHandler_OnOpenURLFromTab(args.bid, args.frame, args.target_url, args.user_gesture,resultHandler); } } @@ -6771,7 +6851,7 @@ public class ClientHandlers { @Override public void start(I iface, RequestHandler_GetResourceRequestHandler_args args, org.apache.thrift.async.AsyncMethodCallback<com.jetbrains.cef.remote.thrift_codegen.RObject> resultHandler) throws org.apache.thrift.TException { - iface.RequestHandler_GetResourceRequestHandler(args.bid, args.request, args.isNavigation, args.isDownload, args.requestInitiator,resultHandler); + iface.RequestHandler_GetResourceRequestHandler(args.bid, args.frame, args.request, args.isNavigation, args.isDownload, args.requestInitiator,resultHandler); } } @@ -6878,7 +6958,7 @@ public class ClientHandlers { @Override public void start(I iface, ResourceRequestHandler_GetCookieAccessFilter_args args, org.apache.thrift.async.AsyncMethodCallback<com.jetbrains.cef.remote.thrift_codegen.RObject> resultHandler) throws org.apache.thrift.TException { - iface.ResourceRequestHandler_GetCookieAccessFilter(args.rrHandler, args.bid, args.request,resultHandler); + iface.ResourceRequestHandler_GetCookieAccessFilter(args.rrHandler, args.bid, args.frame, args.request,resultHandler); } } @@ -6986,7 +7066,7 @@ public class ClientHandlers { @Override public void start(I iface, CookieAccessFilter_CanSendCookie_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException { - iface.CookieAccessFilter_CanSendCookie(args.filter, args.bid, args.request, args.cookie,resultHandler); + iface.CookieAccessFilter_CanSendCookie(args.filter, args.bid, args.frame, args.request, args.cookie,resultHandler); } } @@ -7054,7 +7134,7 @@ public class ClientHandlers { @Override public void start(I iface, CookieAccessFilter_CanSaveCookie_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException { - iface.CookieAccessFilter_CanSaveCookie(args.filter, args.bid, args.request, args.response, args.cookie,resultHandler); + iface.CookieAccessFilter_CanSaveCookie(args.filter, args.bid, args.frame, args.request, args.response, args.cookie,resultHandler); } } @@ -7122,7 +7202,7 @@ public class ClientHandlers { @Override public void start(I iface, ResourceRequestHandler_OnBeforeResourceLoad_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException { - iface.ResourceRequestHandler_OnBeforeResourceLoad(args.rrHandler, args.bid, args.request,resultHandler); + iface.ResourceRequestHandler_OnBeforeResourceLoad(args.rrHandler, args.bid, args.frame, args.request,resultHandler); } } @@ -7189,7 +7269,7 @@ public class ClientHandlers { @Override public void start(I iface, ResourceRequestHandler_GetResourceHandler_args args, org.apache.thrift.async.AsyncMethodCallback<com.jetbrains.cef.remote.thrift_codegen.RObject> resultHandler) throws org.apache.thrift.TException { - iface.ResourceRequestHandler_GetResourceHandler(args.rrHandler, args.bid, args.request,resultHandler); + iface.ResourceRequestHandler_GetResourceHandler(args.rrHandler, args.bid, args.frame, args.request,resultHandler); } } @@ -7538,7 +7618,7 @@ public class ClientHandlers { @Override public void start(I iface, ResourceRequestHandler_OnResourceRedirect_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException { - iface.ResourceRequestHandler_OnResourceRedirect(args.rrHandler, args.bid, args.request, args.response, args.new_url,resultHandler); + iface.ResourceRequestHandler_OnResourceRedirect(args.rrHandler, args.bid, args.frame, args.request, args.response, args.new_url,resultHandler); } } @@ -7606,7 +7686,7 @@ public class ClientHandlers { @Override public void start(I iface, ResourceRequestHandler_OnResourceResponse_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException { - iface.ResourceRequestHandler_OnResourceResponse(args.rrHandler, args.bid, args.request, args.response,resultHandler); + iface.ResourceRequestHandler_OnResourceResponse(args.rrHandler, args.bid, args.frame, args.request, args.response,resultHandler); } } @@ -7672,7 +7752,7 @@ public class ClientHandlers { @Override public void start(I iface, ResourceRequestHandler_OnResourceLoadComplete_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException { - iface.ResourceRequestHandler_OnResourceLoadComplete(args.rrHandler, args.bid, args.request, args.response, args.status, args.receivedContentLength,resultHandler); + iface.ResourceRequestHandler_OnResourceLoadComplete(args.rrHandler, args.bid, args.frame, args.request, args.response, args.status, args.receivedContentLength,resultHandler); } } @@ -7740,7 +7820,7 @@ public class ClientHandlers { @Override public void start(I iface, ResourceRequestHandler_OnProtocolExecution_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException { - iface.ResourceRequestHandler_OnProtocolExecution(args.rrHandler, args.bid, args.request, args.allowOsExecution,resultHandler); + iface.ResourceRequestHandler_OnProtocolExecution(args.rrHandler, args.bid, args.frame, args.request, args.allowOsExecution,resultHandler); } } @@ -7808,7 +7888,7 @@ public class ClientHandlers { @Override public void start(I iface, MessageRouterHandler_onQuery_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException { - iface.MessageRouterHandler_onQuery(args.handler, args.bid, args.queryId, args.request, args.persistent, args.queryCallback,resultHandler); + iface.MessageRouterHandler_onQuery(args.handler, args.bid, args.frame, args.queryId, args.request, args.persistent, args.queryCallback,resultHandler); } } @@ -7848,7 +7928,7 @@ public class ClientHandlers { @Override public void start(I iface, MessageRouterHandler_onQueryCanceled_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException { - iface.MessageRouterHandler_onQueryCanceled(args.handler, args.bid, args.queryId,resultHandler); + iface.MessageRouterHandler_onQueryCanceled(args.handler, args.bid, args.frame, args.queryId,resultHandler); } } @@ -7955,7 +8035,7 @@ public class ClientHandlers { @Override public void start(I iface, SchemeHandlerFactory_CreateHandler_args args, org.apache.thrift.async.AsyncMethodCallback<com.jetbrains.cef.remote.thrift_codegen.RObject> resultHandler) throws org.apache.thrift.TException { - iface.SchemeHandlerFactory_CreateHandler(args.schemeHandlerFactory, args.bid, args.scheme_name, args.request,resultHandler); + iface.SchemeHandlerFactory_CreateHandler(args.schemeHandlerFactory, args.bid, args.frame, args.scheme_name, args.request,resultHandler); } } @@ -12979,14 +13059,16 @@ public class ClientHandlers { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LifeSpanHandler_OnBeforePopup_args"); private static final org.apache.thrift.protocol.TField BID_FIELD_DESC = new org.apache.thrift.protocol.TField("bid", org.apache.thrift.protocol.TType.I32, (short)1); - private static final org.apache.thrift.protocol.TField URL_FIELD_DESC = new org.apache.thrift.protocol.TField("url", org.apache.thrift.protocol.TType.STRING, (short)2); - private static final org.apache.thrift.protocol.TField FRAME_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("frameName", org.apache.thrift.protocol.TType.STRING, (short)3); - private static final org.apache.thrift.protocol.TField GESTURE_FIELD_DESC = new org.apache.thrift.protocol.TField("gesture", org.apache.thrift.protocol.TType.BOOL, (short)4); + private static final org.apache.thrift.protocol.TField FRAME_FIELD_DESC = new org.apache.thrift.protocol.TField("frame", org.apache.thrift.protocol.TType.STRUCT, (short)2); + private static final org.apache.thrift.protocol.TField URL_FIELD_DESC = new org.apache.thrift.protocol.TField("url", org.apache.thrift.protocol.TType.STRING, (short)3); + private static final org.apache.thrift.protocol.TField FRAME_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("frameName", org.apache.thrift.protocol.TType.STRING, (short)4); + private static final org.apache.thrift.protocol.TField GESTURE_FIELD_DESC = new org.apache.thrift.protocol.TField("gesture", org.apache.thrift.protocol.TType.BOOL, (short)5); private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new LifeSpanHandler_OnBeforePopup_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new LifeSpanHandler_OnBeforePopup_argsTupleSchemeFactory(); public int bid; // required + public @org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame; // required public @org.apache.thrift.annotation.Nullable java.lang.String url; // required public @org.apache.thrift.annotation.Nullable java.lang.String frameName; // required public boolean gesture; // required @@ -12994,9 +13076,10 @@ public class ClientHandlers { /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { BID((short)1, "bid"), - URL((short)2, "url"), - FRAME_NAME((short)3, "frameName"), - GESTURE((short)4, "gesture"); + FRAME((short)2, "frame"), + URL((short)3, "url"), + FRAME_NAME((short)4, "frameName"), + GESTURE((short)5, "gesture"); private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>(); @@ -13014,11 +13097,13 @@ public class ClientHandlers { switch(fieldId) { case 1: // BID return BID; - case 2: // URL + case 2: // FRAME + return FRAME; + case 3: // URL return URL; - case 3: // FRAME_NAME + case 4: // FRAME_NAME return FRAME_NAME; - case 4: // GESTURE + case 5: // GESTURE return GESTURE; default: return null; @@ -13071,6 +13156,8 @@ public class ClientHandlers { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.BID, new org.apache.thrift.meta_data.FieldMetaData("bid", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.FRAME, new org.apache.thrift.meta_data.FieldMetaData("frame", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.jetbrains.cef.remote.thrift_codegen.RObject.class))); tmpMap.put(_Fields.URL, new org.apache.thrift.meta_data.FieldMetaData("url", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.FRAME_NAME, new org.apache.thrift.meta_data.FieldMetaData("frameName", org.apache.thrift.TFieldRequirementType.DEFAULT, @@ -13086,6 +13173,7 @@ public class ClientHandlers { public LifeSpanHandler_OnBeforePopup_args( int bid, + com.jetbrains.cef.remote.thrift_codegen.RObject frame, java.lang.String url, java.lang.String frameName, boolean gesture) @@ -13093,6 +13181,7 @@ public class ClientHandlers { this(); this.bid = bid; setBidIsSet(true); + this.frame = frame; this.url = url; this.frameName = frameName; this.gesture = gesture; @@ -13105,6 +13194,9 @@ public class ClientHandlers { public LifeSpanHandler_OnBeforePopup_args(LifeSpanHandler_OnBeforePopup_args other) { __isset_bitfield = other.__isset_bitfield; this.bid = other.bid; + if (other.isSetFrame()) { + this.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(other.frame); + } if (other.isSetUrl()) { this.url = other.url; } @@ -13123,6 +13215,7 @@ public class ClientHandlers { public void clear() { setBidIsSet(false); this.bid = 0; + this.frame = null; this.url = null; this.frameName = null; setGestureIsSet(false); @@ -13153,6 +13246,31 @@ public class ClientHandlers { } @org.apache.thrift.annotation.Nullable + public com.jetbrains.cef.remote.thrift_codegen.RObject getFrame() { + return this.frame; + } + + public LifeSpanHandler_OnBeforePopup_args setFrame(@org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame) { + this.frame = frame; + return this; + } + + public void unsetFrame() { + this.frame = null; + } + + /** Returns true if field frame is set (has been assigned a value) and false otherwise */ + public boolean isSetFrame() { + return this.frame != null; + } + + public void setFrameIsSet(boolean value) { + if (!value) { + this.frame = null; + } + } + + @org.apache.thrift.annotation.Nullable public java.lang.String getUrl() { return this.url; } @@ -13236,6 +13354,14 @@ public class ClientHandlers { } break; + case FRAME: + if (value == null) { + unsetFrame(); + } else { + setFrame((com.jetbrains.cef.remote.thrift_codegen.RObject)value); + } + break; + case URL: if (value == null) { unsetUrl(); @@ -13270,6 +13396,9 @@ public class ClientHandlers { case BID: return getBid(); + case FRAME: + return getFrame(); + case URL: return getUrl(); @@ -13293,6 +13422,8 @@ public class ClientHandlers { switch (field) { case BID: return isSetBid(); + case FRAME: + return isSetFrame(); case URL: return isSetUrl(); case FRAME_NAME: @@ -13325,6 +13456,15 @@ public class ClientHandlers { return false; } + boolean this_present_frame = true && this.isSetFrame(); + boolean that_present_frame = true && that.isSetFrame(); + if (this_present_frame || that_present_frame) { + if (!(this_present_frame && that_present_frame)) + return false; + if (!this.frame.equals(that.frame)) + return false; + } + boolean this_present_url = true && this.isSetUrl(); boolean that_present_url = true && that.isSetUrl(); if (this_present_url || that_present_url) { @@ -13361,6 +13501,10 @@ public class ClientHandlers { hashCode = hashCode * 8191 + bid; + hashCode = hashCode * 8191 + ((isSetFrame()) ? 131071 : 524287); + if (isSetFrame()) + hashCode = hashCode * 8191 + frame.hashCode(); + hashCode = hashCode * 8191 + ((isSetUrl()) ? 131071 : 524287); if (isSetUrl()) hashCode = hashCode * 8191 + url.hashCode(); @@ -13392,6 +13536,16 @@ public class ClientHandlers { return lastComparison; } } + lastComparison = java.lang.Boolean.compare(isSetFrame(), other.isSetFrame()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetFrame()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.frame, other.frame); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = java.lang.Boolean.compare(isSetUrl(), other.isSetUrl()); if (lastComparison != 0) { return lastComparison; @@ -13450,6 +13604,14 @@ public class ClientHandlers { sb.append(this.bid); first = false; if (!first) sb.append(", "); + sb.append("frame:"); + if (this.frame == null) { + sb.append("null"); + } else { + sb.append(this.frame); + } + first = false; + if (!first) sb.append(", "); sb.append("url:"); if (this.url == null) { sb.append("null"); @@ -13476,6 +13638,9 @@ public class ClientHandlers { public void validate() throws org.apache.thrift.TException { // check for required fields // check for sub-struct validity + if (frame != null) { + frame.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -13524,7 +13689,16 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 2: // URL + case 2: // FRAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 3: // URL if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.url = iprot.readString(); struct.setUrlIsSet(true); @@ -13532,7 +13706,7 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // FRAME_NAME + case 4: // FRAME_NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.frameName = iprot.readString(); struct.setFrameNameIsSet(true); @@ -13540,7 +13714,7 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // GESTURE + case 5: // GESTURE if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.gesture = iprot.readBool(); struct.setGestureIsSet(true); @@ -13567,6 +13741,11 @@ public class ClientHandlers { oprot.writeFieldBegin(BID_FIELD_DESC); oprot.writeI32(struct.bid); oprot.writeFieldEnd(); + if (struct.frame != null) { + oprot.writeFieldBegin(FRAME_FIELD_DESC); + struct.frame.write(oprot); + oprot.writeFieldEnd(); + } if (struct.url != null) { oprot.writeFieldBegin(URL_FIELD_DESC); oprot.writeString(struct.url); @@ -13602,19 +13781,25 @@ public class ClientHandlers { if (struct.isSetBid()) { optionals.set(0); } - if (struct.isSetUrl()) { + if (struct.isSetFrame()) { optionals.set(1); } - if (struct.isSetFrameName()) { + if (struct.isSetUrl()) { optionals.set(2); } - if (struct.isSetGesture()) { + if (struct.isSetFrameName()) { optionals.set(3); } - oprot.writeBitSet(optionals, 4); + if (struct.isSetGesture()) { + optionals.set(4); + } + oprot.writeBitSet(optionals, 5); if (struct.isSetBid()) { oprot.writeI32(struct.bid); } + if (struct.isSetFrame()) { + struct.frame.write(oprot); + } if (struct.isSetUrl()) { oprot.writeString(struct.url); } @@ -13629,20 +13814,25 @@ public class ClientHandlers { @Override public void read(org.apache.thrift.protocol.TProtocol prot, LifeSpanHandler_OnBeforePopup_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(4); + java.util.BitSet incoming = iprot.readBitSet(5); if (incoming.get(0)) { struct.bid = iprot.readI32(); struct.setBidIsSet(true); } if (incoming.get(1)) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } + if (incoming.get(2)) { struct.url = iprot.readString(); struct.setUrlIsSet(true); } - if (incoming.get(2)) { + if (incoming.get(3)) { struct.frameName = iprot.readString(); struct.setFrameNameIsSet(true); } - if (incoming.get(3)) { + if (incoming.get(4)) { struct.gesture = iprot.readBool(); struct.setGestureIsSet(true); } @@ -16289,18 +16479,21 @@ public class ClientHandlers { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LoadHandler_OnLoadStart_args"); private static final org.apache.thrift.protocol.TField BID_FIELD_DESC = new org.apache.thrift.protocol.TField("bid", org.apache.thrift.protocol.TType.I32, (short)1); - private static final org.apache.thrift.protocol.TField TRANSITION_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("transition_type", org.apache.thrift.protocol.TType.I32, (short)2); + private static final org.apache.thrift.protocol.TField FRAME_FIELD_DESC = new org.apache.thrift.protocol.TField("frame", org.apache.thrift.protocol.TType.STRUCT, (short)2); + private static final org.apache.thrift.protocol.TField TRANSITION_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("transition_type", org.apache.thrift.protocol.TType.I32, (short)3); private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new LoadHandler_OnLoadStart_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new LoadHandler_OnLoadStart_argsTupleSchemeFactory(); public int bid; // required + public @org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame; // required public int transition_type; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { BID((short)1, "bid"), - TRANSITION_TYPE((short)2, "transition_type"); + FRAME((short)2, "frame"), + TRANSITION_TYPE((short)3, "transition_type"); private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>(); @@ -16318,7 +16511,9 @@ public class ClientHandlers { switch(fieldId) { case 1: // BID return BID; - case 2: // TRANSITION_TYPE + case 2: // FRAME + return FRAME; + case 3: // TRANSITION_TYPE return TRANSITION_TYPE; default: return null; @@ -16371,6 +16566,8 @@ public class ClientHandlers { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.BID, new org.apache.thrift.meta_data.FieldMetaData("bid", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.FRAME, new org.apache.thrift.meta_data.FieldMetaData("frame", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.jetbrains.cef.remote.thrift_codegen.RObject.class))); tmpMap.put(_Fields.TRANSITION_TYPE, new org.apache.thrift.meta_data.FieldMetaData("transition_type", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); @@ -16382,11 +16579,13 @@ public class ClientHandlers { public LoadHandler_OnLoadStart_args( int bid, + com.jetbrains.cef.remote.thrift_codegen.RObject frame, int transition_type) { this(); this.bid = bid; setBidIsSet(true); + this.frame = frame; this.transition_type = transition_type; setTransition_typeIsSet(true); } @@ -16397,6 +16596,9 @@ public class ClientHandlers { public LoadHandler_OnLoadStart_args(LoadHandler_OnLoadStart_args other) { __isset_bitfield = other.__isset_bitfield; this.bid = other.bid; + if (other.isSetFrame()) { + this.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(other.frame); + } this.transition_type = other.transition_type; } @@ -16409,6 +16611,7 @@ public class ClientHandlers { public void clear() { setBidIsSet(false); this.bid = 0; + this.frame = null; setTransition_typeIsSet(false); this.transition_type = 0; } @@ -16436,6 +16639,31 @@ public class ClientHandlers { __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __BID_ISSET_ID, value); } + @org.apache.thrift.annotation.Nullable + public com.jetbrains.cef.remote.thrift_codegen.RObject getFrame() { + return this.frame; + } + + public LoadHandler_OnLoadStart_args setFrame(@org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame) { + this.frame = frame; + return this; + } + + public void unsetFrame() { + this.frame = null; + } + + /** Returns true if field frame is set (has been assigned a value) and false otherwise */ + public boolean isSetFrame() { + return this.frame != null; + } + + public void setFrameIsSet(boolean value) { + if (!value) { + this.frame = null; + } + } + public int getTransition_type() { return this.transition_type; } @@ -16470,6 +16698,14 @@ public class ClientHandlers { } break; + case FRAME: + if (value == null) { + unsetFrame(); + } else { + setFrame((com.jetbrains.cef.remote.thrift_codegen.RObject)value); + } + break; + case TRANSITION_TYPE: if (value == null) { unsetTransition_type(); @@ -16488,6 +16724,9 @@ public class ClientHandlers { case BID: return getBid(); + case FRAME: + return getFrame(); + case TRANSITION_TYPE: return getTransition_type(); @@ -16505,6 +16744,8 @@ public class ClientHandlers { switch (field) { case BID: return isSetBid(); + case FRAME: + return isSetFrame(); case TRANSITION_TYPE: return isSetTransition_type(); } @@ -16533,6 +16774,15 @@ public class ClientHandlers { return false; } + boolean this_present_frame = true && this.isSetFrame(); + boolean that_present_frame = true && that.isSetFrame(); + if (this_present_frame || that_present_frame) { + if (!(this_present_frame && that_present_frame)) + return false; + if (!this.frame.equals(that.frame)) + return false; + } + boolean this_present_transition_type = true; boolean that_present_transition_type = true; if (this_present_transition_type || that_present_transition_type) { @@ -16551,6 +16801,10 @@ public class ClientHandlers { hashCode = hashCode * 8191 + bid; + hashCode = hashCode * 8191 + ((isSetFrame()) ? 131071 : 524287); + if (isSetFrame()) + hashCode = hashCode * 8191 + frame.hashCode(); + hashCode = hashCode * 8191 + transition_type; return hashCode; @@ -16574,6 +16828,16 @@ public class ClientHandlers { return lastComparison; } } + lastComparison = java.lang.Boolean.compare(isSetFrame(), other.isSetFrame()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetFrame()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.frame, other.frame); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = java.lang.Boolean.compare(isSetTransition_type(), other.isSetTransition_type()); if (lastComparison != 0) { return lastComparison; @@ -16612,6 +16876,14 @@ public class ClientHandlers { sb.append(this.bid); first = false; if (!first) sb.append(", "); + sb.append("frame:"); + if (this.frame == null) { + sb.append("null"); + } else { + sb.append(this.frame); + } + first = false; + if (!first) sb.append(", "); sb.append("transition_type:"); sb.append(this.transition_type); first = false; @@ -16622,6 +16894,9 @@ public class ClientHandlers { public void validate() throws org.apache.thrift.TException { // check for required fields // check for sub-struct validity + if (frame != null) { + frame.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -16670,7 +16945,16 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 2: // TRANSITION_TYPE + case 2: // FRAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 3: // TRANSITION_TYPE if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.transition_type = iprot.readI32(); struct.setTransition_typeIsSet(true); @@ -16697,6 +16981,11 @@ public class ClientHandlers { oprot.writeFieldBegin(BID_FIELD_DESC); oprot.writeI32(struct.bid); oprot.writeFieldEnd(); + if (struct.frame != null) { + oprot.writeFieldBegin(FRAME_FIELD_DESC); + struct.frame.write(oprot); + oprot.writeFieldEnd(); + } oprot.writeFieldBegin(TRANSITION_TYPE_FIELD_DESC); oprot.writeI32(struct.transition_type); oprot.writeFieldEnd(); @@ -16722,13 +17011,19 @@ public class ClientHandlers { if (struct.isSetBid()) { optionals.set(0); } - if (struct.isSetTransition_type()) { + if (struct.isSetFrame()) { optionals.set(1); } - oprot.writeBitSet(optionals, 2); + if (struct.isSetTransition_type()) { + optionals.set(2); + } + oprot.writeBitSet(optionals, 3); if (struct.isSetBid()) { oprot.writeI32(struct.bid); } + if (struct.isSetFrame()) { + struct.frame.write(oprot); + } if (struct.isSetTransition_type()) { oprot.writeI32(struct.transition_type); } @@ -16737,12 +17032,17 @@ public class ClientHandlers { @Override public void read(org.apache.thrift.protocol.TProtocol prot, LoadHandler_OnLoadStart_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(2); + java.util.BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { struct.bid = iprot.readI32(); struct.setBidIsSet(true); } if (incoming.get(1)) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } + if (incoming.get(2)) { struct.transition_type = iprot.readI32(); struct.setTransition_typeIsSet(true); } @@ -16759,18 +17059,21 @@ public class ClientHandlers { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LoadHandler_OnLoadEnd_args"); private static final org.apache.thrift.protocol.TField BID_FIELD_DESC = new org.apache.thrift.protocol.TField("bid", org.apache.thrift.protocol.TType.I32, (short)1); - private static final org.apache.thrift.protocol.TField HTTP_STATUS_CODE_FIELD_DESC = new org.apache.thrift.protocol.TField("httpStatusCode", org.apache.thrift.protocol.TType.I32, (short)2); + private static final org.apache.thrift.protocol.TField FRAME_FIELD_DESC = new org.apache.thrift.protocol.TField("frame", org.apache.thrift.protocol.TType.STRUCT, (short)2); + private static final org.apache.thrift.protocol.TField HTTP_STATUS_CODE_FIELD_DESC = new org.apache.thrift.protocol.TField("httpStatusCode", org.apache.thrift.protocol.TType.I32, (short)3); private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new LoadHandler_OnLoadEnd_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new LoadHandler_OnLoadEnd_argsTupleSchemeFactory(); public int bid; // required + public @org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame; // required public int httpStatusCode; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { BID((short)1, "bid"), - HTTP_STATUS_CODE((short)2, "httpStatusCode"); + FRAME((short)2, "frame"), + HTTP_STATUS_CODE((short)3, "httpStatusCode"); private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>(); @@ -16788,7 +17091,9 @@ public class ClientHandlers { switch(fieldId) { case 1: // BID return BID; - case 2: // HTTP_STATUS_CODE + case 2: // FRAME + return FRAME; + case 3: // HTTP_STATUS_CODE return HTTP_STATUS_CODE; default: return null; @@ -16841,6 +17146,8 @@ public class ClientHandlers { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.BID, new org.apache.thrift.meta_data.FieldMetaData("bid", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.FRAME, new org.apache.thrift.meta_data.FieldMetaData("frame", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.jetbrains.cef.remote.thrift_codegen.RObject.class))); tmpMap.put(_Fields.HTTP_STATUS_CODE, new org.apache.thrift.meta_data.FieldMetaData("httpStatusCode", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); @@ -16852,11 +17159,13 @@ public class ClientHandlers { public LoadHandler_OnLoadEnd_args( int bid, + com.jetbrains.cef.remote.thrift_codegen.RObject frame, int httpStatusCode) { this(); this.bid = bid; setBidIsSet(true); + this.frame = frame; this.httpStatusCode = httpStatusCode; setHttpStatusCodeIsSet(true); } @@ -16867,6 +17176,9 @@ public class ClientHandlers { public LoadHandler_OnLoadEnd_args(LoadHandler_OnLoadEnd_args other) { __isset_bitfield = other.__isset_bitfield; this.bid = other.bid; + if (other.isSetFrame()) { + this.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(other.frame); + } this.httpStatusCode = other.httpStatusCode; } @@ -16879,6 +17191,7 @@ public class ClientHandlers { public void clear() { setBidIsSet(false); this.bid = 0; + this.frame = null; setHttpStatusCodeIsSet(false); this.httpStatusCode = 0; } @@ -16906,6 +17219,31 @@ public class ClientHandlers { __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __BID_ISSET_ID, value); } + @org.apache.thrift.annotation.Nullable + public com.jetbrains.cef.remote.thrift_codegen.RObject getFrame() { + return this.frame; + } + + public LoadHandler_OnLoadEnd_args setFrame(@org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame) { + this.frame = frame; + return this; + } + + public void unsetFrame() { + this.frame = null; + } + + /** Returns true if field frame is set (has been assigned a value) and false otherwise */ + public boolean isSetFrame() { + return this.frame != null; + } + + public void setFrameIsSet(boolean value) { + if (!value) { + this.frame = null; + } + } + public int getHttpStatusCode() { return this.httpStatusCode; } @@ -16940,6 +17278,14 @@ public class ClientHandlers { } break; + case FRAME: + if (value == null) { + unsetFrame(); + } else { + setFrame((com.jetbrains.cef.remote.thrift_codegen.RObject)value); + } + break; + case HTTP_STATUS_CODE: if (value == null) { unsetHttpStatusCode(); @@ -16958,6 +17304,9 @@ public class ClientHandlers { case BID: return getBid(); + case FRAME: + return getFrame(); + case HTTP_STATUS_CODE: return getHttpStatusCode(); @@ -16975,6 +17324,8 @@ public class ClientHandlers { switch (field) { case BID: return isSetBid(); + case FRAME: + return isSetFrame(); case HTTP_STATUS_CODE: return isSetHttpStatusCode(); } @@ -17003,6 +17354,15 @@ public class ClientHandlers { return false; } + boolean this_present_frame = true && this.isSetFrame(); + boolean that_present_frame = true && that.isSetFrame(); + if (this_present_frame || that_present_frame) { + if (!(this_present_frame && that_present_frame)) + return false; + if (!this.frame.equals(that.frame)) + return false; + } + boolean this_present_httpStatusCode = true; boolean that_present_httpStatusCode = true; if (this_present_httpStatusCode || that_present_httpStatusCode) { @@ -17021,6 +17381,10 @@ public class ClientHandlers { hashCode = hashCode * 8191 + bid; + hashCode = hashCode * 8191 + ((isSetFrame()) ? 131071 : 524287); + if (isSetFrame()) + hashCode = hashCode * 8191 + frame.hashCode(); + hashCode = hashCode * 8191 + httpStatusCode; return hashCode; @@ -17044,6 +17408,16 @@ public class ClientHandlers { return lastComparison; } } + lastComparison = java.lang.Boolean.compare(isSetFrame(), other.isSetFrame()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetFrame()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.frame, other.frame); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = java.lang.Boolean.compare(isSetHttpStatusCode(), other.isSetHttpStatusCode()); if (lastComparison != 0) { return lastComparison; @@ -17082,6 +17456,14 @@ public class ClientHandlers { sb.append(this.bid); first = false; if (!first) sb.append(", "); + sb.append("frame:"); + if (this.frame == null) { + sb.append("null"); + } else { + sb.append(this.frame); + } + first = false; + if (!first) sb.append(", "); sb.append("httpStatusCode:"); sb.append(this.httpStatusCode); first = false; @@ -17092,6 +17474,9 @@ public class ClientHandlers { public void validate() throws org.apache.thrift.TException { // check for required fields // check for sub-struct validity + if (frame != null) { + frame.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -17140,7 +17525,16 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 2: // HTTP_STATUS_CODE + case 2: // FRAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 3: // HTTP_STATUS_CODE if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.httpStatusCode = iprot.readI32(); struct.setHttpStatusCodeIsSet(true); @@ -17167,6 +17561,11 @@ public class ClientHandlers { oprot.writeFieldBegin(BID_FIELD_DESC); oprot.writeI32(struct.bid); oprot.writeFieldEnd(); + if (struct.frame != null) { + oprot.writeFieldBegin(FRAME_FIELD_DESC); + struct.frame.write(oprot); + oprot.writeFieldEnd(); + } oprot.writeFieldBegin(HTTP_STATUS_CODE_FIELD_DESC); oprot.writeI32(struct.httpStatusCode); oprot.writeFieldEnd(); @@ -17192,13 +17591,19 @@ public class ClientHandlers { if (struct.isSetBid()) { optionals.set(0); } - if (struct.isSetHttpStatusCode()) { + if (struct.isSetFrame()) { optionals.set(1); } - oprot.writeBitSet(optionals, 2); + if (struct.isSetHttpStatusCode()) { + optionals.set(2); + } + oprot.writeBitSet(optionals, 3); if (struct.isSetBid()) { oprot.writeI32(struct.bid); } + if (struct.isSetFrame()) { + struct.frame.write(oprot); + } if (struct.isSetHttpStatusCode()) { oprot.writeI32(struct.httpStatusCode); } @@ -17207,12 +17612,17 @@ public class ClientHandlers { @Override public void read(org.apache.thrift.protocol.TProtocol prot, LoadHandler_OnLoadEnd_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(2); + java.util.BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { struct.bid = iprot.readI32(); struct.setBidIsSet(true); } if (incoming.get(1)) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } + if (incoming.get(2)) { struct.httpStatusCode = iprot.readI32(); struct.setHttpStatusCodeIsSet(true); } @@ -17229,14 +17639,16 @@ public class ClientHandlers { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LoadHandler_OnLoadError_args"); private static final org.apache.thrift.protocol.TField BID_FIELD_DESC = new org.apache.thrift.protocol.TField("bid", org.apache.thrift.protocol.TType.I32, (short)1); - private static final org.apache.thrift.protocol.TField ERROR_CODE_FIELD_DESC = new org.apache.thrift.protocol.TField("errorCode", org.apache.thrift.protocol.TType.I32, (short)2); - private static final org.apache.thrift.protocol.TField ERROR_TEXT_FIELD_DESC = new org.apache.thrift.protocol.TField("errorText", org.apache.thrift.protocol.TType.STRING, (short)3); - private static final org.apache.thrift.protocol.TField FAILED_URL_FIELD_DESC = new org.apache.thrift.protocol.TField("failedUrl", org.apache.thrift.protocol.TType.STRING, (short)4); + private static final org.apache.thrift.protocol.TField FRAME_FIELD_DESC = new org.apache.thrift.protocol.TField("frame", org.apache.thrift.protocol.TType.STRUCT, (short)2); + private static final org.apache.thrift.protocol.TField ERROR_CODE_FIELD_DESC = new org.apache.thrift.protocol.TField("errorCode", org.apache.thrift.protocol.TType.I32, (short)3); + private static final org.apache.thrift.protocol.TField ERROR_TEXT_FIELD_DESC = new org.apache.thrift.protocol.TField("errorText", org.apache.thrift.protocol.TType.STRING, (short)4); + private static final org.apache.thrift.protocol.TField FAILED_URL_FIELD_DESC = new org.apache.thrift.protocol.TField("failedUrl", org.apache.thrift.protocol.TType.STRING, (short)5); private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new LoadHandler_OnLoadError_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new LoadHandler_OnLoadError_argsTupleSchemeFactory(); public int bid; // required + public @org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame; // required public int errorCode; // required public @org.apache.thrift.annotation.Nullable java.lang.String errorText; // required public @org.apache.thrift.annotation.Nullable java.lang.String failedUrl; // required @@ -17244,9 +17656,10 @@ public class ClientHandlers { /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { BID((short)1, "bid"), - ERROR_CODE((short)2, "errorCode"), - ERROR_TEXT((short)3, "errorText"), - FAILED_URL((short)4, "failedUrl"); + FRAME((short)2, "frame"), + ERROR_CODE((short)3, "errorCode"), + ERROR_TEXT((short)4, "errorText"), + FAILED_URL((short)5, "failedUrl"); private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>(); @@ -17264,11 +17677,13 @@ public class ClientHandlers { switch(fieldId) { case 1: // BID return BID; - case 2: // ERROR_CODE + case 2: // FRAME + return FRAME; + case 3: // ERROR_CODE return ERROR_CODE; - case 3: // ERROR_TEXT + case 4: // ERROR_TEXT return ERROR_TEXT; - case 4: // FAILED_URL + case 5: // FAILED_URL return FAILED_URL; default: return null; @@ -17321,6 +17736,8 @@ public class ClientHandlers { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.BID, new org.apache.thrift.meta_data.FieldMetaData("bid", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.FRAME, new org.apache.thrift.meta_data.FieldMetaData("frame", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.jetbrains.cef.remote.thrift_codegen.RObject.class))); tmpMap.put(_Fields.ERROR_CODE, new org.apache.thrift.meta_data.FieldMetaData("errorCode", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); tmpMap.put(_Fields.ERROR_TEXT, new org.apache.thrift.meta_data.FieldMetaData("errorText", org.apache.thrift.TFieldRequirementType.DEFAULT, @@ -17336,6 +17753,7 @@ public class ClientHandlers { public LoadHandler_OnLoadError_args( int bid, + com.jetbrains.cef.remote.thrift_codegen.RObject frame, int errorCode, java.lang.String errorText, java.lang.String failedUrl) @@ -17343,6 +17761,7 @@ public class ClientHandlers { this(); this.bid = bid; setBidIsSet(true); + this.frame = frame; this.errorCode = errorCode; setErrorCodeIsSet(true); this.errorText = errorText; @@ -17355,6 +17774,9 @@ public class ClientHandlers { public LoadHandler_OnLoadError_args(LoadHandler_OnLoadError_args other) { __isset_bitfield = other.__isset_bitfield; this.bid = other.bid; + if (other.isSetFrame()) { + this.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(other.frame); + } this.errorCode = other.errorCode; if (other.isSetErrorText()) { this.errorText = other.errorText; @@ -17373,6 +17795,7 @@ public class ClientHandlers { public void clear() { setBidIsSet(false); this.bid = 0; + this.frame = null; setErrorCodeIsSet(false); this.errorCode = 0; this.errorText = null; @@ -17402,6 +17825,31 @@ public class ClientHandlers { __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __BID_ISSET_ID, value); } + @org.apache.thrift.annotation.Nullable + public com.jetbrains.cef.remote.thrift_codegen.RObject getFrame() { + return this.frame; + } + + public LoadHandler_OnLoadError_args setFrame(@org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame) { + this.frame = frame; + return this; + } + + public void unsetFrame() { + this.frame = null; + } + + /** Returns true if field frame is set (has been assigned a value) and false otherwise */ + public boolean isSetFrame() { + return this.frame != null; + } + + public void setFrameIsSet(boolean value) { + if (!value) { + this.frame = null; + } + } + public int getErrorCode() { return this.errorCode; } @@ -17486,6 +17934,14 @@ public class ClientHandlers { } break; + case FRAME: + if (value == null) { + unsetFrame(); + } else { + setFrame((com.jetbrains.cef.remote.thrift_codegen.RObject)value); + } + break; + case ERROR_CODE: if (value == null) { unsetErrorCode(); @@ -17520,6 +17976,9 @@ public class ClientHandlers { case BID: return getBid(); + case FRAME: + return getFrame(); + case ERROR_CODE: return getErrorCode(); @@ -17543,6 +18002,8 @@ public class ClientHandlers { switch (field) { case BID: return isSetBid(); + case FRAME: + return isSetFrame(); case ERROR_CODE: return isSetErrorCode(); case ERROR_TEXT: @@ -17575,6 +18036,15 @@ public class ClientHandlers { return false; } + boolean this_present_frame = true && this.isSetFrame(); + boolean that_present_frame = true && that.isSetFrame(); + if (this_present_frame || that_present_frame) { + if (!(this_present_frame && that_present_frame)) + return false; + if (!this.frame.equals(that.frame)) + return false; + } + boolean this_present_errorCode = true; boolean that_present_errorCode = true; if (this_present_errorCode || that_present_errorCode) { @@ -17611,6 +18081,10 @@ public class ClientHandlers { hashCode = hashCode * 8191 + bid; + hashCode = hashCode * 8191 + ((isSetFrame()) ? 131071 : 524287); + if (isSetFrame()) + hashCode = hashCode * 8191 + frame.hashCode(); + hashCode = hashCode * 8191 + errorCode; hashCode = hashCode * 8191 + ((isSetErrorText()) ? 131071 : 524287); @@ -17642,6 +18116,16 @@ public class ClientHandlers { return lastComparison; } } + lastComparison = java.lang.Boolean.compare(isSetFrame(), other.isSetFrame()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetFrame()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.frame, other.frame); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = java.lang.Boolean.compare(isSetErrorCode(), other.isSetErrorCode()); if (lastComparison != 0) { return lastComparison; @@ -17700,6 +18184,14 @@ public class ClientHandlers { sb.append(this.bid); first = false; if (!first) sb.append(", "); + sb.append("frame:"); + if (this.frame == null) { + sb.append("null"); + } else { + sb.append(this.frame); + } + first = false; + if (!first) sb.append(", "); sb.append("errorCode:"); sb.append(this.errorCode); first = false; @@ -17726,6 +18218,9 @@ public class ClientHandlers { public void validate() throws org.apache.thrift.TException { // check for required fields // check for sub-struct validity + if (frame != null) { + frame.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -17774,7 +18269,16 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 2: // ERROR_CODE + case 2: // FRAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 3: // ERROR_CODE if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.errorCode = iprot.readI32(); struct.setErrorCodeIsSet(true); @@ -17782,7 +18286,7 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // ERROR_TEXT + case 4: // ERROR_TEXT if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.errorText = iprot.readString(); struct.setErrorTextIsSet(true); @@ -17790,7 +18294,7 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // FAILED_URL + case 5: // FAILED_URL if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.failedUrl = iprot.readString(); struct.setFailedUrlIsSet(true); @@ -17817,6 +18321,11 @@ public class ClientHandlers { oprot.writeFieldBegin(BID_FIELD_DESC); oprot.writeI32(struct.bid); oprot.writeFieldEnd(); + if (struct.frame != null) { + oprot.writeFieldBegin(FRAME_FIELD_DESC); + struct.frame.write(oprot); + oprot.writeFieldEnd(); + } oprot.writeFieldBegin(ERROR_CODE_FIELD_DESC); oprot.writeI32(struct.errorCode); oprot.writeFieldEnd(); @@ -17852,19 +18361,25 @@ public class ClientHandlers { if (struct.isSetBid()) { optionals.set(0); } - if (struct.isSetErrorCode()) { + if (struct.isSetFrame()) { optionals.set(1); } - if (struct.isSetErrorText()) { + if (struct.isSetErrorCode()) { optionals.set(2); } - if (struct.isSetFailedUrl()) { + if (struct.isSetErrorText()) { optionals.set(3); } - oprot.writeBitSet(optionals, 4); + if (struct.isSetFailedUrl()) { + optionals.set(4); + } + oprot.writeBitSet(optionals, 5); if (struct.isSetBid()) { oprot.writeI32(struct.bid); } + if (struct.isSetFrame()) { + struct.frame.write(oprot); + } if (struct.isSetErrorCode()) { oprot.writeI32(struct.errorCode); } @@ -17879,20 +18394,25 @@ public class ClientHandlers { @Override public void read(org.apache.thrift.protocol.TProtocol prot, LoadHandler_OnLoadError_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(4); + java.util.BitSet incoming = iprot.readBitSet(5); if (incoming.get(0)) { struct.bid = iprot.readI32(); struct.setBidIsSet(true); } if (incoming.get(1)) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } + if (incoming.get(2)) { struct.errorCode = iprot.readI32(); struct.setErrorCodeIsSet(true); } - if (incoming.get(2)) { + if (incoming.get(3)) { struct.errorText = iprot.readString(); struct.setErrorTextIsSet(true); } - if (incoming.get(3)) { + if (incoming.get(4)) { struct.failedUrl = iprot.readString(); struct.setFailedUrlIsSet(true); } @@ -17909,18 +18429,21 @@ public class ClientHandlers { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DisplayHandler_OnAddressChange_args"); private static final org.apache.thrift.protocol.TField BID_FIELD_DESC = new org.apache.thrift.protocol.TField("bid", org.apache.thrift.protocol.TType.I32, (short)1); - private static final org.apache.thrift.protocol.TField URL_FIELD_DESC = new org.apache.thrift.protocol.TField("url", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField FRAME_FIELD_DESC = new org.apache.thrift.protocol.TField("frame", org.apache.thrift.protocol.TType.STRUCT, (short)2); + private static final org.apache.thrift.protocol.TField URL_FIELD_DESC = new org.apache.thrift.protocol.TField("url", org.apache.thrift.protocol.TType.STRING, (short)3); private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new DisplayHandler_OnAddressChange_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new DisplayHandler_OnAddressChange_argsTupleSchemeFactory(); public int bid; // required + public @org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame; // required public @org.apache.thrift.annotation.Nullable java.lang.String url; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { BID((short)1, "bid"), - URL((short)2, "url"); + FRAME((short)2, "frame"), + URL((short)3, "url"); private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>(); @@ -17938,7 +18461,9 @@ public class ClientHandlers { switch(fieldId) { case 1: // BID return BID; - case 2: // URL + case 2: // FRAME + return FRAME; + case 3: // URL return URL; default: return null; @@ -17990,6 +18515,8 @@ public class ClientHandlers { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.BID, new org.apache.thrift.meta_data.FieldMetaData("bid", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.FRAME, new org.apache.thrift.meta_data.FieldMetaData("frame", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.jetbrains.cef.remote.thrift_codegen.RObject.class))); tmpMap.put(_Fields.URL, new org.apache.thrift.meta_data.FieldMetaData("url", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); @@ -18001,11 +18528,13 @@ public class ClientHandlers { public DisplayHandler_OnAddressChange_args( int bid, + com.jetbrains.cef.remote.thrift_codegen.RObject frame, java.lang.String url) { this(); this.bid = bid; setBidIsSet(true); + this.frame = frame; this.url = url; } @@ -18015,6 +18544,9 @@ public class ClientHandlers { public DisplayHandler_OnAddressChange_args(DisplayHandler_OnAddressChange_args other) { __isset_bitfield = other.__isset_bitfield; this.bid = other.bid; + if (other.isSetFrame()) { + this.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(other.frame); + } if (other.isSetUrl()) { this.url = other.url; } @@ -18029,6 +18561,7 @@ public class ClientHandlers { public void clear() { setBidIsSet(false); this.bid = 0; + this.frame = null; this.url = null; } @@ -18056,6 +18589,31 @@ public class ClientHandlers { } @org.apache.thrift.annotation.Nullable + public com.jetbrains.cef.remote.thrift_codegen.RObject getFrame() { + return this.frame; + } + + public DisplayHandler_OnAddressChange_args setFrame(@org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame) { + this.frame = frame; + return this; + } + + public void unsetFrame() { + this.frame = null; + } + + /** Returns true if field frame is set (has been assigned a value) and false otherwise */ + public boolean isSetFrame() { + return this.frame != null; + } + + public void setFrameIsSet(boolean value) { + if (!value) { + this.frame = null; + } + } + + @org.apache.thrift.annotation.Nullable public java.lang.String getUrl() { return this.url; } @@ -18091,6 +18649,14 @@ public class ClientHandlers { } break; + case FRAME: + if (value == null) { + unsetFrame(); + } else { + setFrame((com.jetbrains.cef.remote.thrift_codegen.RObject)value); + } + break; + case URL: if (value == null) { unsetUrl(); @@ -18109,6 +18675,9 @@ public class ClientHandlers { case BID: return getBid(); + case FRAME: + return getFrame(); + case URL: return getUrl(); @@ -18126,6 +18695,8 @@ public class ClientHandlers { switch (field) { case BID: return isSetBid(); + case FRAME: + return isSetFrame(); case URL: return isSetUrl(); } @@ -18154,6 +18725,15 @@ public class ClientHandlers { return false; } + boolean this_present_frame = true && this.isSetFrame(); + boolean that_present_frame = true && that.isSetFrame(); + if (this_present_frame || that_present_frame) { + if (!(this_present_frame && that_present_frame)) + return false; + if (!this.frame.equals(that.frame)) + return false; + } + boolean this_present_url = true && this.isSetUrl(); boolean that_present_url = true && that.isSetUrl(); if (this_present_url || that_present_url) { @@ -18172,6 +18752,10 @@ public class ClientHandlers { hashCode = hashCode * 8191 + bid; + hashCode = hashCode * 8191 + ((isSetFrame()) ? 131071 : 524287); + if (isSetFrame()) + hashCode = hashCode * 8191 + frame.hashCode(); + hashCode = hashCode * 8191 + ((isSetUrl()) ? 131071 : 524287); if (isSetUrl()) hashCode = hashCode * 8191 + url.hashCode(); @@ -18197,6 +18781,16 @@ public class ClientHandlers { return lastComparison; } } + lastComparison = java.lang.Boolean.compare(isSetFrame(), other.isSetFrame()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetFrame()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.frame, other.frame); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = java.lang.Boolean.compare(isSetUrl(), other.isSetUrl()); if (lastComparison != 0) { return lastComparison; @@ -18235,6 +18829,14 @@ public class ClientHandlers { sb.append(this.bid); first = false; if (!first) sb.append(", "); + sb.append("frame:"); + if (this.frame == null) { + sb.append("null"); + } else { + sb.append(this.frame); + } + first = false; + if (!first) sb.append(", "); sb.append("url:"); if (this.url == null) { sb.append("null"); @@ -18249,6 +18851,9 @@ public class ClientHandlers { public void validate() throws org.apache.thrift.TException { // check for required fields // check for sub-struct validity + if (frame != null) { + frame.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -18297,7 +18902,16 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 2: // URL + case 2: // FRAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 3: // URL if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.url = iprot.readString(); struct.setUrlIsSet(true); @@ -18324,6 +18938,11 @@ public class ClientHandlers { oprot.writeFieldBegin(BID_FIELD_DESC); oprot.writeI32(struct.bid); oprot.writeFieldEnd(); + if (struct.frame != null) { + oprot.writeFieldBegin(FRAME_FIELD_DESC); + struct.frame.write(oprot); + oprot.writeFieldEnd(); + } if (struct.url != null) { oprot.writeFieldBegin(URL_FIELD_DESC); oprot.writeString(struct.url); @@ -18351,13 +18970,19 @@ public class ClientHandlers { if (struct.isSetBid()) { optionals.set(0); } - if (struct.isSetUrl()) { + if (struct.isSetFrame()) { optionals.set(1); } - oprot.writeBitSet(optionals, 2); + if (struct.isSetUrl()) { + optionals.set(2); + } + oprot.writeBitSet(optionals, 3); if (struct.isSetBid()) { oprot.writeI32(struct.bid); } + if (struct.isSetFrame()) { + struct.frame.write(oprot); + } if (struct.isSetUrl()) { oprot.writeString(struct.url); } @@ -18366,12 +18991,17 @@ public class ClientHandlers { @Override public void read(org.apache.thrift.protocol.TProtocol prot, DisplayHandler_OnAddressChange_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(2); + java.util.BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { struct.bid = iprot.readI32(); struct.setBidIsSet(true); } if (incoming.get(1)) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } + if (incoming.get(2)) { struct.url = iprot.readString(); struct.setUrlIsSet(true); } @@ -24767,14 +25397,16 @@ public class ClientHandlers { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RequestHandler_OnBeforeBrowse_args"); private static final org.apache.thrift.protocol.TField BID_FIELD_DESC = new org.apache.thrift.protocol.TField("bid", org.apache.thrift.protocol.TType.I32, (short)1); - private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)2); - private static final org.apache.thrift.protocol.TField USER_GESTURE_FIELD_DESC = new org.apache.thrift.protocol.TField("user_gesture", org.apache.thrift.protocol.TType.BOOL, (short)3); - private static final org.apache.thrift.protocol.TField IS_REDIRECT_FIELD_DESC = new org.apache.thrift.protocol.TField("is_redirect", org.apache.thrift.protocol.TType.BOOL, (short)4); + private static final org.apache.thrift.protocol.TField FRAME_FIELD_DESC = new org.apache.thrift.protocol.TField("frame", org.apache.thrift.protocol.TType.STRUCT, (short)2); + private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)3); + private static final org.apache.thrift.protocol.TField USER_GESTURE_FIELD_DESC = new org.apache.thrift.protocol.TField("user_gesture", org.apache.thrift.protocol.TType.BOOL, (short)4); + private static final org.apache.thrift.protocol.TField IS_REDIRECT_FIELD_DESC = new org.apache.thrift.protocol.TField("is_redirect", org.apache.thrift.protocol.TType.BOOL, (short)5); private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new RequestHandler_OnBeforeBrowse_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new RequestHandler_OnBeforeBrowse_argsTupleSchemeFactory(); public int bid; // required + public @org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame; // required public @org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject request; // required public boolean user_gesture; // required public boolean is_redirect; // required @@ -24782,9 +25414,10 @@ public class ClientHandlers { /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { BID((short)1, "bid"), - REQUEST((short)2, "request"), - USER_GESTURE((short)3, "user_gesture"), - IS_REDIRECT((short)4, "is_redirect"); + FRAME((short)2, "frame"), + REQUEST((short)3, "request"), + USER_GESTURE((short)4, "user_gesture"), + IS_REDIRECT((short)5, "is_redirect"); private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>(); @@ -24802,11 +25435,13 @@ public class ClientHandlers { switch(fieldId) { case 1: // BID return BID; - case 2: // REQUEST + case 2: // FRAME + return FRAME; + case 3: // REQUEST return REQUEST; - case 3: // USER_GESTURE + case 4: // USER_GESTURE return USER_GESTURE; - case 4: // IS_REDIRECT + case 5: // IS_REDIRECT return IS_REDIRECT; default: return null; @@ -24860,6 +25495,8 @@ public class ClientHandlers { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.BID, new org.apache.thrift.meta_data.FieldMetaData("bid", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.FRAME, new org.apache.thrift.meta_data.FieldMetaData("frame", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.jetbrains.cef.remote.thrift_codegen.RObject.class))); tmpMap.put(_Fields.REQUEST, new org.apache.thrift.meta_data.FieldMetaData("request", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.jetbrains.cef.remote.thrift_codegen.RObject.class))); tmpMap.put(_Fields.USER_GESTURE, new org.apache.thrift.meta_data.FieldMetaData("user_gesture", org.apache.thrift.TFieldRequirementType.DEFAULT, @@ -24875,6 +25512,7 @@ public class ClientHandlers { public RequestHandler_OnBeforeBrowse_args( int bid, + com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, boolean user_gesture, boolean is_redirect) @@ -24882,6 +25520,7 @@ public class ClientHandlers { this(); this.bid = bid; setBidIsSet(true); + this.frame = frame; this.request = request; this.user_gesture = user_gesture; setUser_gestureIsSet(true); @@ -24895,6 +25534,9 @@ public class ClientHandlers { public RequestHandler_OnBeforeBrowse_args(RequestHandler_OnBeforeBrowse_args other) { __isset_bitfield = other.__isset_bitfield; this.bid = other.bid; + if (other.isSetFrame()) { + this.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(other.frame); + } if (other.isSetRequest()) { this.request = new com.jetbrains.cef.remote.thrift_codegen.RObject(other.request); } @@ -24911,6 +25553,7 @@ public class ClientHandlers { public void clear() { setBidIsSet(false); this.bid = 0; + this.frame = null; this.request = null; setUser_gestureIsSet(false); this.user_gesture = false; @@ -24942,6 +25585,31 @@ public class ClientHandlers { } @org.apache.thrift.annotation.Nullable + public com.jetbrains.cef.remote.thrift_codegen.RObject getFrame() { + return this.frame; + } + + public RequestHandler_OnBeforeBrowse_args setFrame(@org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame) { + this.frame = frame; + return this; + } + + public void unsetFrame() { + this.frame = null; + } + + /** Returns true if field frame is set (has been assigned a value) and false otherwise */ + public boolean isSetFrame() { + return this.frame != null; + } + + public void setFrameIsSet(boolean value) { + if (!value) { + this.frame = null; + } + } + + @org.apache.thrift.annotation.Nullable public com.jetbrains.cef.remote.thrift_codegen.RObject getRequest() { return this.request; } @@ -25023,6 +25691,14 @@ public class ClientHandlers { } break; + case FRAME: + if (value == null) { + unsetFrame(); + } else { + setFrame((com.jetbrains.cef.remote.thrift_codegen.RObject)value); + } + break; + case REQUEST: if (value == null) { unsetRequest(); @@ -25057,6 +25733,9 @@ public class ClientHandlers { case BID: return getBid(); + case FRAME: + return getFrame(); + case REQUEST: return getRequest(); @@ -25080,6 +25759,8 @@ public class ClientHandlers { switch (field) { case BID: return isSetBid(); + case FRAME: + return isSetFrame(); case REQUEST: return isSetRequest(); case USER_GESTURE: @@ -25112,6 +25793,15 @@ public class ClientHandlers { return false; } + boolean this_present_frame = true && this.isSetFrame(); + boolean that_present_frame = true && that.isSetFrame(); + if (this_present_frame || that_present_frame) { + if (!(this_present_frame && that_present_frame)) + return false; + if (!this.frame.equals(that.frame)) + return false; + } + boolean this_present_request = true && this.isSetRequest(); boolean that_present_request = true && that.isSetRequest(); if (this_present_request || that_present_request) { @@ -25148,6 +25838,10 @@ public class ClientHandlers { hashCode = hashCode * 8191 + bid; + hashCode = hashCode * 8191 + ((isSetFrame()) ? 131071 : 524287); + if (isSetFrame()) + hashCode = hashCode * 8191 + frame.hashCode(); + hashCode = hashCode * 8191 + ((isSetRequest()) ? 131071 : 524287); if (isSetRequest()) hashCode = hashCode * 8191 + request.hashCode(); @@ -25177,6 +25871,16 @@ public class ClientHandlers { return lastComparison; } } + lastComparison = java.lang.Boolean.compare(isSetFrame(), other.isSetFrame()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetFrame()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.frame, other.frame); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = java.lang.Boolean.compare(isSetRequest(), other.isSetRequest()); if (lastComparison != 0) { return lastComparison; @@ -25235,6 +25939,14 @@ public class ClientHandlers { sb.append(this.bid); first = false; if (!first) sb.append(", "); + sb.append("frame:"); + if (this.frame == null) { + sb.append("null"); + } else { + sb.append(this.frame); + } + first = false; + if (!first) sb.append(", "); sb.append("request:"); if (this.request == null) { sb.append("null"); @@ -25257,6 +25969,9 @@ public class ClientHandlers { public void validate() throws org.apache.thrift.TException { // check for required fields // check for sub-struct validity + if (frame != null) { + frame.validate(); + } if (request != null) { request.validate(); } @@ -25308,7 +26023,16 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 2: // REQUEST + case 2: // FRAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 3: // REQUEST if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { struct.request = new com.jetbrains.cef.remote.thrift_codegen.RObject(); struct.request.read(iprot); @@ -25317,7 +26041,7 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // USER_GESTURE + case 4: // USER_GESTURE if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.user_gesture = iprot.readBool(); struct.setUser_gestureIsSet(true); @@ -25325,7 +26049,7 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // IS_REDIRECT + case 5: // IS_REDIRECT if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.is_redirect = iprot.readBool(); struct.setIs_redirectIsSet(true); @@ -25352,6 +26076,11 @@ public class ClientHandlers { oprot.writeFieldBegin(BID_FIELD_DESC); oprot.writeI32(struct.bid); oprot.writeFieldEnd(); + if (struct.frame != null) { + oprot.writeFieldBegin(FRAME_FIELD_DESC); + struct.frame.write(oprot); + oprot.writeFieldEnd(); + } if (struct.request != null) { oprot.writeFieldBegin(REQUEST_FIELD_DESC); struct.request.write(oprot); @@ -25385,19 +26114,25 @@ public class ClientHandlers { if (struct.isSetBid()) { optionals.set(0); } - if (struct.isSetRequest()) { + if (struct.isSetFrame()) { optionals.set(1); } - if (struct.isSetUser_gesture()) { + if (struct.isSetRequest()) { optionals.set(2); } - if (struct.isSetIs_redirect()) { + if (struct.isSetUser_gesture()) { optionals.set(3); } - oprot.writeBitSet(optionals, 4); + if (struct.isSetIs_redirect()) { + optionals.set(4); + } + oprot.writeBitSet(optionals, 5); if (struct.isSetBid()) { oprot.writeI32(struct.bid); } + if (struct.isSetFrame()) { + struct.frame.write(oprot); + } if (struct.isSetRequest()) { struct.request.write(oprot); } @@ -25412,21 +26147,26 @@ public class ClientHandlers { @Override public void read(org.apache.thrift.protocol.TProtocol prot, RequestHandler_OnBeforeBrowse_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(4); + java.util.BitSet incoming = iprot.readBitSet(5); if (incoming.get(0)) { struct.bid = iprot.readI32(); struct.setBidIsSet(true); } if (incoming.get(1)) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } + if (incoming.get(2)) { struct.request = new com.jetbrains.cef.remote.thrift_codegen.RObject(); struct.request.read(iprot); struct.setRequestIsSet(true); } - if (incoming.get(2)) { + if (incoming.get(3)) { struct.user_gesture = iprot.readBool(); struct.setUser_gestureIsSet(true); } - if (incoming.get(3)) { + if (incoming.get(4)) { struct.is_redirect = iprot.readBool(); struct.setIs_redirectIsSet(true); } @@ -25818,21 +26558,24 @@ public class ClientHandlers { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RequestHandler_OnOpenURLFromTab_args"); private static final org.apache.thrift.protocol.TField BID_FIELD_DESC = new org.apache.thrift.protocol.TField("bid", org.apache.thrift.protocol.TType.I32, (short)1); - private static final org.apache.thrift.protocol.TField TARGET_URL_FIELD_DESC = new org.apache.thrift.protocol.TField("target_url", org.apache.thrift.protocol.TType.STRING, (short)2); - private static final org.apache.thrift.protocol.TField USER_GESTURE_FIELD_DESC = new org.apache.thrift.protocol.TField("user_gesture", org.apache.thrift.protocol.TType.BOOL, (short)3); + private static final org.apache.thrift.protocol.TField FRAME_FIELD_DESC = new org.apache.thrift.protocol.TField("frame", org.apache.thrift.protocol.TType.STRUCT, (short)2); + private static final org.apache.thrift.protocol.TField TARGET_URL_FIELD_DESC = new org.apache.thrift.protocol.TField("target_url", org.apache.thrift.protocol.TType.STRING, (short)3); + private static final org.apache.thrift.protocol.TField USER_GESTURE_FIELD_DESC = new org.apache.thrift.protocol.TField("user_gesture", org.apache.thrift.protocol.TType.BOOL, (short)4); private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new RequestHandler_OnOpenURLFromTab_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new RequestHandler_OnOpenURLFromTab_argsTupleSchemeFactory(); public int bid; // required + public @org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame; // required public @org.apache.thrift.annotation.Nullable java.lang.String target_url; // required public boolean user_gesture; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { BID((short)1, "bid"), - TARGET_URL((short)2, "target_url"), - USER_GESTURE((short)3, "user_gesture"); + FRAME((short)2, "frame"), + TARGET_URL((short)3, "target_url"), + USER_GESTURE((short)4, "user_gesture"); private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>(); @@ -25850,9 +26593,11 @@ public class ClientHandlers { switch(fieldId) { case 1: // BID return BID; - case 2: // TARGET_URL + case 2: // FRAME + return FRAME; + case 3: // TARGET_URL return TARGET_URL; - case 3: // USER_GESTURE + case 4: // USER_GESTURE return USER_GESTURE; default: return null; @@ -25905,6 +26650,8 @@ public class ClientHandlers { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.BID, new org.apache.thrift.meta_data.FieldMetaData("bid", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.FRAME, new org.apache.thrift.meta_data.FieldMetaData("frame", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.jetbrains.cef.remote.thrift_codegen.RObject.class))); tmpMap.put(_Fields.TARGET_URL, new org.apache.thrift.meta_data.FieldMetaData("target_url", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.USER_GESTURE, new org.apache.thrift.meta_data.FieldMetaData("user_gesture", org.apache.thrift.TFieldRequirementType.DEFAULT, @@ -25918,12 +26665,14 @@ public class ClientHandlers { public RequestHandler_OnOpenURLFromTab_args( int bid, + com.jetbrains.cef.remote.thrift_codegen.RObject frame, java.lang.String target_url, boolean user_gesture) { this(); this.bid = bid; setBidIsSet(true); + this.frame = frame; this.target_url = target_url; this.user_gesture = user_gesture; setUser_gestureIsSet(true); @@ -25935,6 +26684,9 @@ public class ClientHandlers { public RequestHandler_OnOpenURLFromTab_args(RequestHandler_OnOpenURLFromTab_args other) { __isset_bitfield = other.__isset_bitfield; this.bid = other.bid; + if (other.isSetFrame()) { + this.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(other.frame); + } if (other.isSetTarget_url()) { this.target_url = other.target_url; } @@ -25950,6 +26702,7 @@ public class ClientHandlers { public void clear() { setBidIsSet(false); this.bid = 0; + this.frame = null; this.target_url = null; setUser_gestureIsSet(false); this.user_gesture = false; @@ -25979,6 +26732,31 @@ public class ClientHandlers { } @org.apache.thrift.annotation.Nullable + public com.jetbrains.cef.remote.thrift_codegen.RObject getFrame() { + return this.frame; + } + + public RequestHandler_OnOpenURLFromTab_args setFrame(@org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame) { + this.frame = frame; + return this; + } + + public void unsetFrame() { + this.frame = null; + } + + /** Returns true if field frame is set (has been assigned a value) and false otherwise */ + public boolean isSetFrame() { + return this.frame != null; + } + + public void setFrameIsSet(boolean value) { + if (!value) { + this.frame = null; + } + } + + @org.apache.thrift.annotation.Nullable public java.lang.String getTarget_url() { return this.target_url; } @@ -26037,6 +26815,14 @@ public class ClientHandlers { } break; + case FRAME: + if (value == null) { + unsetFrame(); + } else { + setFrame((com.jetbrains.cef.remote.thrift_codegen.RObject)value); + } + break; + case TARGET_URL: if (value == null) { unsetTarget_url(); @@ -26063,6 +26849,9 @@ public class ClientHandlers { case BID: return getBid(); + case FRAME: + return getFrame(); + case TARGET_URL: return getTarget_url(); @@ -26083,6 +26872,8 @@ public class ClientHandlers { switch (field) { case BID: return isSetBid(); + case FRAME: + return isSetFrame(); case TARGET_URL: return isSetTarget_url(); case USER_GESTURE: @@ -26113,6 +26904,15 @@ public class ClientHandlers { return false; } + boolean this_present_frame = true && this.isSetFrame(); + boolean that_present_frame = true && that.isSetFrame(); + if (this_present_frame || that_present_frame) { + if (!(this_present_frame && that_present_frame)) + return false; + if (!this.frame.equals(that.frame)) + return false; + } + boolean this_present_target_url = true && this.isSetTarget_url(); boolean that_present_target_url = true && that.isSetTarget_url(); if (this_present_target_url || that_present_target_url) { @@ -26140,6 +26940,10 @@ public class ClientHandlers { hashCode = hashCode * 8191 + bid; + hashCode = hashCode * 8191 + ((isSetFrame()) ? 131071 : 524287); + if (isSetFrame()) + hashCode = hashCode * 8191 + frame.hashCode(); + hashCode = hashCode * 8191 + ((isSetTarget_url()) ? 131071 : 524287); if (isSetTarget_url()) hashCode = hashCode * 8191 + target_url.hashCode(); @@ -26167,6 +26971,16 @@ public class ClientHandlers { return lastComparison; } } + lastComparison = java.lang.Boolean.compare(isSetFrame(), other.isSetFrame()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetFrame()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.frame, other.frame); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = java.lang.Boolean.compare(isSetTarget_url(), other.isSetTarget_url()); if (lastComparison != 0) { return lastComparison; @@ -26215,6 +27029,14 @@ public class ClientHandlers { sb.append(this.bid); first = false; if (!first) sb.append(", "); + sb.append("frame:"); + if (this.frame == null) { + sb.append("null"); + } else { + sb.append(this.frame); + } + first = false; + if (!first) sb.append(", "); sb.append("target_url:"); if (this.target_url == null) { sb.append("null"); @@ -26233,6 +27055,9 @@ public class ClientHandlers { public void validate() throws org.apache.thrift.TException { // check for required fields // check for sub-struct validity + if (frame != null) { + frame.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -26281,7 +27106,16 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 2: // TARGET_URL + case 2: // FRAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 3: // TARGET_URL if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.target_url = iprot.readString(); struct.setTarget_urlIsSet(true); @@ -26289,7 +27123,7 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // USER_GESTURE + case 4: // USER_GESTURE if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.user_gesture = iprot.readBool(); struct.setUser_gestureIsSet(true); @@ -26316,6 +27150,11 @@ public class ClientHandlers { oprot.writeFieldBegin(BID_FIELD_DESC); oprot.writeI32(struct.bid); oprot.writeFieldEnd(); + if (struct.frame != null) { + oprot.writeFieldBegin(FRAME_FIELD_DESC); + struct.frame.write(oprot); + oprot.writeFieldEnd(); + } if (struct.target_url != null) { oprot.writeFieldBegin(TARGET_URL_FIELD_DESC); oprot.writeString(struct.target_url); @@ -26346,16 +27185,22 @@ public class ClientHandlers { if (struct.isSetBid()) { optionals.set(0); } - if (struct.isSetTarget_url()) { + if (struct.isSetFrame()) { optionals.set(1); } - if (struct.isSetUser_gesture()) { + if (struct.isSetTarget_url()) { optionals.set(2); } - oprot.writeBitSet(optionals, 3); + if (struct.isSetUser_gesture()) { + optionals.set(3); + } + oprot.writeBitSet(optionals, 4); if (struct.isSetBid()) { oprot.writeI32(struct.bid); } + if (struct.isSetFrame()) { + struct.frame.write(oprot); + } if (struct.isSetTarget_url()) { oprot.writeString(struct.target_url); } @@ -26367,16 +27212,21 @@ public class ClientHandlers { @Override public void read(org.apache.thrift.protocol.TProtocol prot, RequestHandler_OnOpenURLFromTab_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(3); + java.util.BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { struct.bid = iprot.readI32(); struct.setBidIsSet(true); } if (incoming.get(1)) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } + if (incoming.get(2)) { struct.target_url = iprot.readString(); struct.setTarget_urlIsSet(true); } - if (incoming.get(2)) { + if (incoming.get(3)) { struct.user_gesture = iprot.readBool(); struct.setUser_gestureIsSet(true); } @@ -29905,15 +30755,17 @@ public class ClientHandlers { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RequestHandler_GetResourceRequestHandler_args"); private static final org.apache.thrift.protocol.TField BID_FIELD_DESC = new org.apache.thrift.protocol.TField("bid", org.apache.thrift.protocol.TType.I32, (short)1); - private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)2); - private static final org.apache.thrift.protocol.TField IS_NAVIGATION_FIELD_DESC = new org.apache.thrift.protocol.TField("isNavigation", org.apache.thrift.protocol.TType.BOOL, (short)3); - private static final org.apache.thrift.protocol.TField IS_DOWNLOAD_FIELD_DESC = new org.apache.thrift.protocol.TField("isDownload", org.apache.thrift.protocol.TType.BOOL, (short)4); - private static final org.apache.thrift.protocol.TField REQUEST_INITIATOR_FIELD_DESC = new org.apache.thrift.protocol.TField("requestInitiator", org.apache.thrift.protocol.TType.STRING, (short)5); + private static final org.apache.thrift.protocol.TField FRAME_FIELD_DESC = new org.apache.thrift.protocol.TField("frame", org.apache.thrift.protocol.TType.STRUCT, (short)2); + private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)3); + private static final org.apache.thrift.protocol.TField IS_NAVIGATION_FIELD_DESC = new org.apache.thrift.protocol.TField("isNavigation", org.apache.thrift.protocol.TType.BOOL, (short)4); + private static final org.apache.thrift.protocol.TField IS_DOWNLOAD_FIELD_DESC = new org.apache.thrift.protocol.TField("isDownload", org.apache.thrift.protocol.TType.BOOL, (short)5); + private static final org.apache.thrift.protocol.TField REQUEST_INITIATOR_FIELD_DESC = new org.apache.thrift.protocol.TField("requestInitiator", org.apache.thrift.protocol.TType.STRING, (short)6); private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new RequestHandler_GetResourceRequestHandler_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new RequestHandler_GetResourceRequestHandler_argsTupleSchemeFactory(); public int bid; // required + public @org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame; // required public @org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject request; // required public boolean isNavigation; // required public boolean isDownload; // required @@ -29922,10 +30774,11 @@ public class ClientHandlers { /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { BID((short)1, "bid"), - REQUEST((short)2, "request"), - IS_NAVIGATION((short)3, "isNavigation"), - IS_DOWNLOAD((short)4, "isDownload"), - REQUEST_INITIATOR((short)5, "requestInitiator"); + FRAME((short)2, "frame"), + REQUEST((short)3, "request"), + IS_NAVIGATION((short)4, "isNavigation"), + IS_DOWNLOAD((short)5, "isDownload"), + REQUEST_INITIATOR((short)6, "requestInitiator"); private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>(); @@ -29943,13 +30796,15 @@ public class ClientHandlers { switch(fieldId) { case 1: // BID return BID; - case 2: // REQUEST + case 2: // FRAME + return FRAME; + case 3: // REQUEST return REQUEST; - case 3: // IS_NAVIGATION + case 4: // IS_NAVIGATION return IS_NAVIGATION; - case 4: // IS_DOWNLOAD + case 5: // IS_DOWNLOAD return IS_DOWNLOAD; - case 5: // REQUEST_INITIATOR + case 6: // REQUEST_INITIATOR return REQUEST_INITIATOR; default: return null; @@ -30003,6 +30858,8 @@ public class ClientHandlers { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.BID, new org.apache.thrift.meta_data.FieldMetaData("bid", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.FRAME, new org.apache.thrift.meta_data.FieldMetaData("frame", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.jetbrains.cef.remote.thrift_codegen.RObject.class))); tmpMap.put(_Fields.REQUEST, new org.apache.thrift.meta_data.FieldMetaData("request", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.jetbrains.cef.remote.thrift_codegen.RObject.class))); tmpMap.put(_Fields.IS_NAVIGATION, new org.apache.thrift.meta_data.FieldMetaData("isNavigation", org.apache.thrift.TFieldRequirementType.DEFAULT, @@ -30020,6 +30877,7 @@ public class ClientHandlers { public RequestHandler_GetResourceRequestHandler_args( int bid, + com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, boolean isNavigation, boolean isDownload, @@ -30028,6 +30886,7 @@ public class ClientHandlers { this(); this.bid = bid; setBidIsSet(true); + this.frame = frame; this.request = request; this.isNavigation = isNavigation; setIsNavigationIsSet(true); @@ -30042,6 +30901,9 @@ public class ClientHandlers { public RequestHandler_GetResourceRequestHandler_args(RequestHandler_GetResourceRequestHandler_args other) { __isset_bitfield = other.__isset_bitfield; this.bid = other.bid; + if (other.isSetFrame()) { + this.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(other.frame); + } if (other.isSetRequest()) { this.request = new com.jetbrains.cef.remote.thrift_codegen.RObject(other.request); } @@ -30061,6 +30923,7 @@ public class ClientHandlers { public void clear() { setBidIsSet(false); this.bid = 0; + this.frame = null; this.request = null; setIsNavigationIsSet(false); this.isNavigation = false; @@ -30093,6 +30956,31 @@ public class ClientHandlers { } @org.apache.thrift.annotation.Nullable + public com.jetbrains.cef.remote.thrift_codegen.RObject getFrame() { + return this.frame; + } + + public RequestHandler_GetResourceRequestHandler_args setFrame(@org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame) { + this.frame = frame; + return this; + } + + public void unsetFrame() { + this.frame = null; + } + + /** Returns true if field frame is set (has been assigned a value) and false otherwise */ + public boolean isSetFrame() { + return this.frame != null; + } + + public void setFrameIsSet(boolean value) { + if (!value) { + this.frame = null; + } + } + + @org.apache.thrift.annotation.Nullable public com.jetbrains.cef.remote.thrift_codegen.RObject getRequest() { return this.request; } @@ -30199,6 +31087,14 @@ public class ClientHandlers { } break; + case FRAME: + if (value == null) { + unsetFrame(); + } else { + setFrame((com.jetbrains.cef.remote.thrift_codegen.RObject)value); + } + break; + case REQUEST: if (value == null) { unsetRequest(); @@ -30241,6 +31137,9 @@ public class ClientHandlers { case BID: return getBid(); + case FRAME: + return getFrame(); + case REQUEST: return getRequest(); @@ -30267,6 +31166,8 @@ public class ClientHandlers { switch (field) { case BID: return isSetBid(); + case FRAME: + return isSetFrame(); case REQUEST: return isSetRequest(); case IS_NAVIGATION: @@ -30301,6 +31202,15 @@ public class ClientHandlers { return false; } + boolean this_present_frame = true && this.isSetFrame(); + boolean that_present_frame = true && that.isSetFrame(); + if (this_present_frame || that_present_frame) { + if (!(this_present_frame && that_present_frame)) + return false; + if (!this.frame.equals(that.frame)) + return false; + } + boolean this_present_request = true && this.isSetRequest(); boolean that_present_request = true && that.isSetRequest(); if (this_present_request || that_present_request) { @@ -30346,6 +31256,10 @@ public class ClientHandlers { hashCode = hashCode * 8191 + bid; + hashCode = hashCode * 8191 + ((isSetFrame()) ? 131071 : 524287); + if (isSetFrame()) + hashCode = hashCode * 8191 + frame.hashCode(); + hashCode = hashCode * 8191 + ((isSetRequest()) ? 131071 : 524287); if (isSetRequest()) hashCode = hashCode * 8191 + request.hashCode(); @@ -30379,6 +31293,16 @@ public class ClientHandlers { return lastComparison; } } + lastComparison = java.lang.Boolean.compare(isSetFrame(), other.isSetFrame()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetFrame()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.frame, other.frame); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = java.lang.Boolean.compare(isSetRequest(), other.isSetRequest()); if (lastComparison != 0) { return lastComparison; @@ -30447,6 +31371,14 @@ public class ClientHandlers { sb.append(this.bid); first = false; if (!first) sb.append(", "); + sb.append("frame:"); + if (this.frame == null) { + sb.append("null"); + } else { + sb.append(this.frame); + } + first = false; + if (!first) sb.append(", "); sb.append("request:"); if (this.request == null) { sb.append("null"); @@ -30477,6 +31409,9 @@ public class ClientHandlers { public void validate() throws org.apache.thrift.TException { // check for required fields // check for sub-struct validity + if (frame != null) { + frame.validate(); + } if (request != null) { request.validate(); } @@ -30528,7 +31463,16 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 2: // REQUEST + case 2: // FRAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 3: // REQUEST if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { struct.request = new com.jetbrains.cef.remote.thrift_codegen.RObject(); struct.request.read(iprot); @@ -30537,7 +31481,7 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // IS_NAVIGATION + case 4: // IS_NAVIGATION if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.isNavigation = iprot.readBool(); struct.setIsNavigationIsSet(true); @@ -30545,7 +31489,7 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // IS_DOWNLOAD + case 5: // IS_DOWNLOAD if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.isDownload = iprot.readBool(); struct.setIsDownloadIsSet(true); @@ -30553,7 +31497,7 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 5: // REQUEST_INITIATOR + case 6: // REQUEST_INITIATOR if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.requestInitiator = iprot.readString(); struct.setRequestInitiatorIsSet(true); @@ -30580,6 +31524,11 @@ public class ClientHandlers { oprot.writeFieldBegin(BID_FIELD_DESC); oprot.writeI32(struct.bid); oprot.writeFieldEnd(); + if (struct.frame != null) { + oprot.writeFieldBegin(FRAME_FIELD_DESC); + struct.frame.write(oprot); + oprot.writeFieldEnd(); + } if (struct.request != null) { oprot.writeFieldBegin(REQUEST_FIELD_DESC); struct.request.write(oprot); @@ -30618,22 +31567,28 @@ public class ClientHandlers { if (struct.isSetBid()) { optionals.set(0); } - if (struct.isSetRequest()) { + if (struct.isSetFrame()) { optionals.set(1); } - if (struct.isSetIsNavigation()) { + if (struct.isSetRequest()) { optionals.set(2); } - if (struct.isSetIsDownload()) { + if (struct.isSetIsNavigation()) { optionals.set(3); } - if (struct.isSetRequestInitiator()) { + if (struct.isSetIsDownload()) { optionals.set(4); } - oprot.writeBitSet(optionals, 5); + if (struct.isSetRequestInitiator()) { + optionals.set(5); + } + oprot.writeBitSet(optionals, 6); if (struct.isSetBid()) { oprot.writeI32(struct.bid); } + if (struct.isSetFrame()) { + struct.frame.write(oprot); + } if (struct.isSetRequest()) { struct.request.write(oprot); } @@ -30651,25 +31606,30 @@ public class ClientHandlers { @Override public void read(org.apache.thrift.protocol.TProtocol prot, RequestHandler_GetResourceRequestHandler_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(5); + java.util.BitSet incoming = iprot.readBitSet(6); if (incoming.get(0)) { struct.bid = iprot.readI32(); struct.setBidIsSet(true); } if (incoming.get(1)) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } + if (incoming.get(2)) { struct.request = new com.jetbrains.cef.remote.thrift_codegen.RObject(); struct.request.read(iprot); struct.setRequestIsSet(true); } - if (incoming.get(2)) { + if (incoming.get(3)) { struct.isNavigation = iprot.readBool(); struct.setIsNavigationIsSet(true); } - if (incoming.get(3)) { + if (incoming.get(4)) { struct.isDownload = iprot.readBool(); struct.setIsDownloadIsSet(true); } - if (incoming.get(4)) { + if (incoming.get(5)) { struct.requestInitiator = iprot.readString(); struct.setRequestInitiatorIsSet(true); } @@ -31444,20 +32404,23 @@ public class ClientHandlers { private static final org.apache.thrift.protocol.TField RR_HANDLER_FIELD_DESC = new org.apache.thrift.protocol.TField("rrHandler", org.apache.thrift.protocol.TType.I32, (short)1); private static final org.apache.thrift.protocol.TField BID_FIELD_DESC = new org.apache.thrift.protocol.TField("bid", org.apache.thrift.protocol.TType.I32, (short)2); - private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)3); + private static final org.apache.thrift.protocol.TField FRAME_FIELD_DESC = new org.apache.thrift.protocol.TField("frame", org.apache.thrift.protocol.TType.STRUCT, (short)3); + private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)4); private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ResourceRequestHandler_GetCookieAccessFilter_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ResourceRequestHandler_GetCookieAccessFilter_argsTupleSchemeFactory(); public int rrHandler; // required public int bid; // required + public @org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame; // required public @org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject request; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { RR_HANDLER((short)1, "rrHandler"), BID((short)2, "bid"), - REQUEST((short)3, "request"); + FRAME((short)3, "frame"), + REQUEST((short)4, "request"); private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>(); @@ -31477,7 +32440,9 @@ public class ClientHandlers { return RR_HANDLER; case 2: // BID return BID; - case 3: // REQUEST + case 3: // FRAME + return FRAME; + case 4: // REQUEST return REQUEST; default: return null; @@ -31532,6 +32497,8 @@ public class ClientHandlers { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); tmpMap.put(_Fields.BID, new org.apache.thrift.meta_data.FieldMetaData("bid", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.FRAME, new org.apache.thrift.meta_data.FieldMetaData("frame", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.jetbrains.cef.remote.thrift_codegen.RObject.class))); tmpMap.put(_Fields.REQUEST, new org.apache.thrift.meta_data.FieldMetaData("request", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.jetbrains.cef.remote.thrift_codegen.RObject.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); @@ -31544,6 +32511,7 @@ public class ClientHandlers { public ResourceRequestHandler_GetCookieAccessFilter_args( int rrHandler, int bid, + com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request) { this(); @@ -31551,6 +32519,7 @@ public class ClientHandlers { setRrHandlerIsSet(true); this.bid = bid; setBidIsSet(true); + this.frame = frame; this.request = request; } @@ -31561,6 +32530,9 @@ public class ClientHandlers { __isset_bitfield = other.__isset_bitfield; this.rrHandler = other.rrHandler; this.bid = other.bid; + if (other.isSetFrame()) { + this.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(other.frame); + } if (other.isSetRequest()) { this.request = new com.jetbrains.cef.remote.thrift_codegen.RObject(other.request); } @@ -31577,6 +32549,7 @@ public class ClientHandlers { this.rrHandler = 0; setBidIsSet(false); this.bid = 0; + this.frame = null; this.request = null; } @@ -31627,6 +32600,31 @@ public class ClientHandlers { } @org.apache.thrift.annotation.Nullable + public com.jetbrains.cef.remote.thrift_codegen.RObject getFrame() { + return this.frame; + } + + public ResourceRequestHandler_GetCookieAccessFilter_args setFrame(@org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame) { + this.frame = frame; + return this; + } + + public void unsetFrame() { + this.frame = null; + } + + /** Returns true if field frame is set (has been assigned a value) and false otherwise */ + public boolean isSetFrame() { + return this.frame != null; + } + + public void setFrameIsSet(boolean value) { + if (!value) { + this.frame = null; + } + } + + @org.apache.thrift.annotation.Nullable public com.jetbrains.cef.remote.thrift_codegen.RObject getRequest() { return this.request; } @@ -31670,6 +32668,14 @@ public class ClientHandlers { } break; + case FRAME: + if (value == null) { + unsetFrame(); + } else { + setFrame((com.jetbrains.cef.remote.thrift_codegen.RObject)value); + } + break; + case REQUEST: if (value == null) { unsetRequest(); @@ -31691,6 +32697,9 @@ public class ClientHandlers { case BID: return getBid(); + case FRAME: + return getFrame(); + case REQUEST: return getRequest(); @@ -31710,6 +32719,8 @@ public class ClientHandlers { return isSetRrHandler(); case BID: return isSetBid(); + case FRAME: + return isSetFrame(); case REQUEST: return isSetRequest(); } @@ -31747,6 +32758,15 @@ public class ClientHandlers { return false; } + boolean this_present_frame = true && this.isSetFrame(); + boolean that_present_frame = true && that.isSetFrame(); + if (this_present_frame || that_present_frame) { + if (!(this_present_frame && that_present_frame)) + return false; + if (!this.frame.equals(that.frame)) + return false; + } + boolean this_present_request = true && this.isSetRequest(); boolean that_present_request = true && that.isSetRequest(); if (this_present_request || that_present_request) { @@ -31767,6 +32787,10 @@ public class ClientHandlers { hashCode = hashCode * 8191 + bid; + hashCode = hashCode * 8191 + ((isSetFrame()) ? 131071 : 524287); + if (isSetFrame()) + hashCode = hashCode * 8191 + frame.hashCode(); + hashCode = hashCode * 8191 + ((isSetRequest()) ? 131071 : 524287); if (isSetRequest()) hashCode = hashCode * 8191 + request.hashCode(); @@ -31802,6 +32826,16 @@ public class ClientHandlers { return lastComparison; } } + lastComparison = java.lang.Boolean.compare(isSetFrame(), other.isSetFrame()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetFrame()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.frame, other.frame); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = java.lang.Boolean.compare(isSetRequest(), other.isSetRequest()); if (lastComparison != 0) { return lastComparison; @@ -31844,6 +32878,14 @@ public class ClientHandlers { sb.append(this.bid); first = false; if (!first) sb.append(", "); + sb.append("frame:"); + if (this.frame == null) { + sb.append("null"); + } else { + sb.append(this.frame); + } + first = false; + if (!first) sb.append(", "); sb.append("request:"); if (this.request == null) { sb.append("null"); @@ -31858,6 +32900,9 @@ public class ClientHandlers { public void validate() throws org.apache.thrift.TException { // check for required fields // check for sub-struct validity + if (frame != null) { + frame.validate(); + } if (request != null) { request.validate(); } @@ -31917,7 +32962,16 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // REQUEST + case 3: // FRAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 4: // REQUEST if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { struct.request = new com.jetbrains.cef.remote.thrift_codegen.RObject(); struct.request.read(iprot); @@ -31948,6 +33002,11 @@ public class ClientHandlers { oprot.writeFieldBegin(BID_FIELD_DESC); oprot.writeI32(struct.bid); oprot.writeFieldEnd(); + if (struct.frame != null) { + oprot.writeFieldBegin(FRAME_FIELD_DESC); + struct.frame.write(oprot); + oprot.writeFieldEnd(); + } if (struct.request != null) { oprot.writeFieldBegin(REQUEST_FIELD_DESC); struct.request.write(oprot); @@ -31978,16 +33037,22 @@ public class ClientHandlers { if (struct.isSetBid()) { optionals.set(1); } - if (struct.isSetRequest()) { + if (struct.isSetFrame()) { optionals.set(2); } - oprot.writeBitSet(optionals, 3); + if (struct.isSetRequest()) { + optionals.set(3); + } + oprot.writeBitSet(optionals, 4); if (struct.isSetRrHandler()) { oprot.writeI32(struct.rrHandler); } if (struct.isSetBid()) { oprot.writeI32(struct.bid); } + if (struct.isSetFrame()) { + struct.frame.write(oprot); + } if (struct.isSetRequest()) { struct.request.write(oprot); } @@ -31996,7 +33061,7 @@ public class ClientHandlers { @Override public void read(org.apache.thrift.protocol.TProtocol prot, ResourceRequestHandler_GetCookieAccessFilter_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(3); + java.util.BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { struct.rrHandler = iprot.readI32(); struct.setRrHandlerIsSet(true); @@ -32006,6 +33071,11 @@ public class ClientHandlers { struct.setBidIsSet(true); } if (incoming.get(2)) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } + if (incoming.get(3)) { struct.request = new com.jetbrains.cef.remote.thrift_codegen.RObject(); struct.request.read(iprot); struct.setRequestIsSet(true); @@ -32781,14 +33851,16 @@ public class ClientHandlers { private static final org.apache.thrift.protocol.TField FILTER_FIELD_DESC = new org.apache.thrift.protocol.TField("filter", org.apache.thrift.protocol.TType.I32, (short)1); private static final org.apache.thrift.protocol.TField BID_FIELD_DESC = new org.apache.thrift.protocol.TField("bid", org.apache.thrift.protocol.TType.I32, (short)2); - private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)3); - private static final org.apache.thrift.protocol.TField COOKIE_FIELD_DESC = new org.apache.thrift.protocol.TField("cookie", org.apache.thrift.protocol.TType.LIST, (short)4); + private static final org.apache.thrift.protocol.TField FRAME_FIELD_DESC = new org.apache.thrift.protocol.TField("frame", org.apache.thrift.protocol.TType.STRUCT, (short)3); + private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)4); + private static final org.apache.thrift.protocol.TField COOKIE_FIELD_DESC = new org.apache.thrift.protocol.TField("cookie", org.apache.thrift.protocol.TType.LIST, (short)5); private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new CookieAccessFilter_CanSendCookie_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new CookieAccessFilter_CanSendCookie_argsTupleSchemeFactory(); public int filter; // required public int bid; // required + public @org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame; // required public @org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject request; // required public @org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> cookie; // required @@ -32796,8 +33868,9 @@ public class ClientHandlers { public enum _Fields implements org.apache.thrift.TFieldIdEnum { FILTER((short)1, "filter"), BID((short)2, "bid"), - REQUEST((short)3, "request"), - COOKIE((short)4, "cookie"); + FRAME((short)3, "frame"), + REQUEST((short)4, "request"), + COOKIE((short)5, "cookie"); private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>(); @@ -32817,9 +33890,11 @@ public class ClientHandlers { return FILTER; case 2: // BID return BID; - case 3: // REQUEST + case 3: // FRAME + return FRAME; + case 4: // REQUEST return REQUEST; - case 4: // COOKIE + case 5: // COOKIE return COOKIE; default: return null; @@ -32874,6 +33949,8 @@ public class ClientHandlers { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); tmpMap.put(_Fields.BID, new org.apache.thrift.meta_data.FieldMetaData("bid", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.FRAME, new org.apache.thrift.meta_data.FieldMetaData("frame", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.jetbrains.cef.remote.thrift_codegen.RObject.class))); tmpMap.put(_Fields.REQUEST, new org.apache.thrift.meta_data.FieldMetaData("request", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.jetbrains.cef.remote.thrift_codegen.RObject.class))); tmpMap.put(_Fields.COOKIE, new org.apache.thrift.meta_data.FieldMetaData("cookie", org.apache.thrift.TFieldRequirementType.DEFAULT, @@ -32889,6 +33966,7 @@ public class ClientHandlers { public CookieAccessFilter_CanSendCookie_args( int filter, int bid, + com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, java.util.List<java.lang.String> cookie) { @@ -32897,6 +33975,7 @@ public class ClientHandlers { setFilterIsSet(true); this.bid = bid; setBidIsSet(true); + this.frame = frame; this.request = request; this.cookie = cookie; } @@ -32908,6 +33987,9 @@ public class ClientHandlers { __isset_bitfield = other.__isset_bitfield; this.filter = other.filter; this.bid = other.bid; + if (other.isSetFrame()) { + this.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(other.frame); + } if (other.isSetRequest()) { this.request = new com.jetbrains.cef.remote.thrift_codegen.RObject(other.request); } @@ -32928,6 +34010,7 @@ public class ClientHandlers { this.filter = 0; setBidIsSet(false); this.bid = 0; + this.frame = null; this.request = null; this.cookie = null; } @@ -32979,6 +34062,31 @@ public class ClientHandlers { } @org.apache.thrift.annotation.Nullable + public com.jetbrains.cef.remote.thrift_codegen.RObject getFrame() { + return this.frame; + } + + public CookieAccessFilter_CanSendCookie_args setFrame(@org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame) { + this.frame = frame; + return this; + } + + public void unsetFrame() { + this.frame = null; + } + + /** Returns true if field frame is set (has been assigned a value) and false otherwise */ + public boolean isSetFrame() { + return this.frame != null; + } + + public void setFrameIsSet(boolean value) { + if (!value) { + this.frame = null; + } + } + + @org.apache.thrift.annotation.Nullable public com.jetbrains.cef.remote.thrift_codegen.RObject getRequest() { return this.request; } @@ -33063,6 +34171,14 @@ public class ClientHandlers { } break; + case FRAME: + if (value == null) { + unsetFrame(); + } else { + setFrame((com.jetbrains.cef.remote.thrift_codegen.RObject)value); + } + break; + case REQUEST: if (value == null) { unsetRequest(); @@ -33092,6 +34208,9 @@ public class ClientHandlers { case BID: return getBid(); + case FRAME: + return getFrame(); + case REQUEST: return getRequest(); @@ -33114,6 +34233,8 @@ public class ClientHandlers { return isSetFilter(); case BID: return isSetBid(); + case FRAME: + return isSetFrame(); case REQUEST: return isSetRequest(); case COOKIE: @@ -33153,6 +34274,15 @@ public class ClientHandlers { return false; } + boolean this_present_frame = true && this.isSetFrame(); + boolean that_present_frame = true && that.isSetFrame(); + if (this_present_frame || that_present_frame) { + if (!(this_present_frame && that_present_frame)) + return false; + if (!this.frame.equals(that.frame)) + return false; + } + boolean this_present_request = true && this.isSetRequest(); boolean that_present_request = true && that.isSetRequest(); if (this_present_request || that_present_request) { @@ -33182,6 +34312,10 @@ public class ClientHandlers { hashCode = hashCode * 8191 + bid; + hashCode = hashCode * 8191 + ((isSetFrame()) ? 131071 : 524287); + if (isSetFrame()) + hashCode = hashCode * 8191 + frame.hashCode(); + hashCode = hashCode * 8191 + ((isSetRequest()) ? 131071 : 524287); if (isSetRequest()) hashCode = hashCode * 8191 + request.hashCode(); @@ -33221,6 +34355,16 @@ public class ClientHandlers { return lastComparison; } } + lastComparison = java.lang.Boolean.compare(isSetFrame(), other.isSetFrame()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetFrame()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.frame, other.frame); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = java.lang.Boolean.compare(isSetRequest(), other.isSetRequest()); if (lastComparison != 0) { return lastComparison; @@ -33273,6 +34417,14 @@ public class ClientHandlers { sb.append(this.bid); first = false; if (!first) sb.append(", "); + sb.append("frame:"); + if (this.frame == null) { + sb.append("null"); + } else { + sb.append(this.frame); + } + first = false; + if (!first) sb.append(", "); sb.append("request:"); if (this.request == null) { sb.append("null"); @@ -33295,6 +34447,9 @@ public class ClientHandlers { public void validate() throws org.apache.thrift.TException { // check for required fields // check for sub-struct validity + if (frame != null) { + frame.validate(); + } if (request != null) { request.validate(); } @@ -33354,7 +34509,16 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // REQUEST + case 3: // FRAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 4: // REQUEST if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { struct.request = new com.jetbrains.cef.remote.thrift_codegen.RObject(); struct.request.read(iprot); @@ -33363,7 +34527,7 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // COOKIE + case 5: // COOKIE if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list0 = iprot.readListBegin(); @@ -33403,6 +34567,11 @@ public class ClientHandlers { oprot.writeFieldBegin(BID_FIELD_DESC); oprot.writeI32(struct.bid); oprot.writeFieldEnd(); + if (struct.frame != null) { + oprot.writeFieldBegin(FRAME_FIELD_DESC); + struct.frame.write(oprot); + oprot.writeFieldEnd(); + } if (struct.request != null) { oprot.writeFieldBegin(REQUEST_FIELD_DESC); struct.request.write(oprot); @@ -33445,19 +34614,25 @@ public class ClientHandlers { if (struct.isSetBid()) { optionals.set(1); } - if (struct.isSetRequest()) { + if (struct.isSetFrame()) { optionals.set(2); } - if (struct.isSetCookie()) { + if (struct.isSetRequest()) { optionals.set(3); } - oprot.writeBitSet(optionals, 4); + if (struct.isSetCookie()) { + optionals.set(4); + } + oprot.writeBitSet(optionals, 5); if (struct.isSetFilter()) { oprot.writeI32(struct.filter); } if (struct.isSetBid()) { oprot.writeI32(struct.bid); } + if (struct.isSetFrame()) { + struct.frame.write(oprot); + } if (struct.isSetRequest()) { struct.request.write(oprot); } @@ -33475,7 +34650,7 @@ public class ClientHandlers { @Override public void read(org.apache.thrift.protocol.TProtocol prot, CookieAccessFilter_CanSendCookie_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(4); + java.util.BitSet incoming = iprot.readBitSet(5); if (incoming.get(0)) { struct.filter = iprot.readI32(); struct.setFilterIsSet(true); @@ -33485,11 +34660,16 @@ public class ClientHandlers { struct.setBidIsSet(true); } if (incoming.get(2)) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } + if (incoming.get(3)) { struct.request = new com.jetbrains.cef.remote.thrift_codegen.RObject(); struct.request.read(iprot); struct.setRequestIsSet(true); } - if (incoming.get(3)) { + if (incoming.get(4)) { { org.apache.thrift.protocol.TList _list5 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING); struct.cookie = new java.util.ArrayList<java.lang.String>(_list5.size); @@ -33891,15 +35071,17 @@ public class ClientHandlers { private static final org.apache.thrift.protocol.TField FILTER_FIELD_DESC = new org.apache.thrift.protocol.TField("filter", org.apache.thrift.protocol.TType.I32, (short)1); private static final org.apache.thrift.protocol.TField BID_FIELD_DESC = new org.apache.thrift.protocol.TField("bid", org.apache.thrift.protocol.TType.I32, (short)2); - private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)3); - private static final org.apache.thrift.protocol.TField RESPONSE_FIELD_DESC = new org.apache.thrift.protocol.TField("response", org.apache.thrift.protocol.TType.STRUCT, (short)4); - private static final org.apache.thrift.protocol.TField COOKIE_FIELD_DESC = new org.apache.thrift.protocol.TField("cookie", org.apache.thrift.protocol.TType.LIST, (short)5); + private static final org.apache.thrift.protocol.TField FRAME_FIELD_DESC = new org.apache.thrift.protocol.TField("frame", org.apache.thrift.protocol.TType.STRUCT, (short)3); + private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)4); + private static final org.apache.thrift.protocol.TField RESPONSE_FIELD_DESC = new org.apache.thrift.protocol.TField("response", org.apache.thrift.protocol.TType.STRUCT, (short)5); + private static final org.apache.thrift.protocol.TField COOKIE_FIELD_DESC = new org.apache.thrift.protocol.TField("cookie", org.apache.thrift.protocol.TType.LIST, (short)6); private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new CookieAccessFilter_CanSaveCookie_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new CookieAccessFilter_CanSaveCookie_argsTupleSchemeFactory(); public int filter; // required public int bid; // required + public @org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame; // required public @org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject request; // required public @org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject response; // required public @org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> cookie; // required @@ -33908,9 +35090,10 @@ public class ClientHandlers { public enum _Fields implements org.apache.thrift.TFieldIdEnum { FILTER((short)1, "filter"), BID((short)2, "bid"), - REQUEST((short)3, "request"), - RESPONSE((short)4, "response"), - COOKIE((short)5, "cookie"); + FRAME((short)3, "frame"), + REQUEST((short)4, "request"), + RESPONSE((short)5, "response"), + COOKIE((short)6, "cookie"); private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>(); @@ -33930,11 +35113,13 @@ public class ClientHandlers { return FILTER; case 2: // BID return BID; - case 3: // REQUEST + case 3: // FRAME + return FRAME; + case 4: // REQUEST return REQUEST; - case 4: // RESPONSE + case 5: // RESPONSE return RESPONSE; - case 5: // COOKIE + case 6: // COOKIE return COOKIE; default: return null; @@ -33989,6 +35174,8 @@ public class ClientHandlers { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); tmpMap.put(_Fields.BID, new org.apache.thrift.meta_data.FieldMetaData("bid", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.FRAME, new org.apache.thrift.meta_data.FieldMetaData("frame", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.jetbrains.cef.remote.thrift_codegen.RObject.class))); tmpMap.put(_Fields.REQUEST, new org.apache.thrift.meta_data.FieldMetaData("request", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.jetbrains.cef.remote.thrift_codegen.RObject.class))); tmpMap.put(_Fields.RESPONSE, new org.apache.thrift.meta_data.FieldMetaData("response", org.apache.thrift.TFieldRequirementType.DEFAULT, @@ -34006,6 +35193,7 @@ public class ClientHandlers { public CookieAccessFilter_CanSaveCookie_args( int filter, int bid, + com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, java.util.List<java.lang.String> cookie) @@ -34015,6 +35203,7 @@ public class ClientHandlers { setFilterIsSet(true); this.bid = bid; setBidIsSet(true); + this.frame = frame; this.request = request; this.response = response; this.cookie = cookie; @@ -34027,6 +35216,9 @@ public class ClientHandlers { __isset_bitfield = other.__isset_bitfield; this.filter = other.filter; this.bid = other.bid; + if (other.isSetFrame()) { + this.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(other.frame); + } if (other.isSetRequest()) { this.request = new com.jetbrains.cef.remote.thrift_codegen.RObject(other.request); } @@ -34050,6 +35242,7 @@ public class ClientHandlers { this.filter = 0; setBidIsSet(false); this.bid = 0; + this.frame = null; this.request = null; this.response = null; this.cookie = null; @@ -34102,6 +35295,31 @@ public class ClientHandlers { } @org.apache.thrift.annotation.Nullable + public com.jetbrains.cef.remote.thrift_codegen.RObject getFrame() { + return this.frame; + } + + public CookieAccessFilter_CanSaveCookie_args setFrame(@org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame) { + this.frame = frame; + return this; + } + + public void unsetFrame() { + this.frame = null; + } + + /** Returns true if field frame is set (has been assigned a value) and false otherwise */ + public boolean isSetFrame() { + return this.frame != null; + } + + public void setFrameIsSet(boolean value) { + if (!value) { + this.frame = null; + } + } + + @org.apache.thrift.annotation.Nullable public com.jetbrains.cef.remote.thrift_codegen.RObject getRequest() { return this.request; } @@ -34211,6 +35429,14 @@ public class ClientHandlers { } break; + case FRAME: + if (value == null) { + unsetFrame(); + } else { + setFrame((com.jetbrains.cef.remote.thrift_codegen.RObject)value); + } + break; + case REQUEST: if (value == null) { unsetRequest(); @@ -34248,6 +35474,9 @@ public class ClientHandlers { case BID: return getBid(); + case FRAME: + return getFrame(); + case REQUEST: return getRequest(); @@ -34273,6 +35502,8 @@ public class ClientHandlers { return isSetFilter(); case BID: return isSetBid(); + case FRAME: + return isSetFrame(); case REQUEST: return isSetRequest(); case RESPONSE: @@ -34314,6 +35545,15 @@ public class ClientHandlers { return false; } + boolean this_present_frame = true && this.isSetFrame(); + boolean that_present_frame = true && that.isSetFrame(); + if (this_present_frame || that_present_frame) { + if (!(this_present_frame && that_present_frame)) + return false; + if (!this.frame.equals(that.frame)) + return false; + } + boolean this_present_request = true && this.isSetRequest(); boolean that_present_request = true && that.isSetRequest(); if (this_present_request || that_present_request) { @@ -34352,6 +35592,10 @@ public class ClientHandlers { hashCode = hashCode * 8191 + bid; + hashCode = hashCode * 8191 + ((isSetFrame()) ? 131071 : 524287); + if (isSetFrame()) + hashCode = hashCode * 8191 + frame.hashCode(); + hashCode = hashCode * 8191 + ((isSetRequest()) ? 131071 : 524287); if (isSetRequest()) hashCode = hashCode * 8191 + request.hashCode(); @@ -34395,6 +35639,16 @@ public class ClientHandlers { return lastComparison; } } + lastComparison = java.lang.Boolean.compare(isSetFrame(), other.isSetFrame()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetFrame()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.frame, other.frame); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = java.lang.Boolean.compare(isSetRequest(), other.isSetRequest()); if (lastComparison != 0) { return lastComparison; @@ -34457,6 +35711,14 @@ public class ClientHandlers { sb.append(this.bid); first = false; if (!first) sb.append(", "); + sb.append("frame:"); + if (this.frame == null) { + sb.append("null"); + } else { + sb.append(this.frame); + } + first = false; + if (!first) sb.append(", "); sb.append("request:"); if (this.request == null) { sb.append("null"); @@ -34487,6 +35749,9 @@ public class ClientHandlers { public void validate() throws org.apache.thrift.TException { // check for required fields // check for sub-struct validity + if (frame != null) { + frame.validate(); + } if (request != null) { request.validate(); } @@ -34549,7 +35814,16 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // REQUEST + case 3: // FRAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 4: // REQUEST if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { struct.request = new com.jetbrains.cef.remote.thrift_codegen.RObject(); struct.request.read(iprot); @@ -34558,7 +35832,7 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // RESPONSE + case 5: // RESPONSE if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { struct.response = new com.jetbrains.cef.remote.thrift_codegen.RObject(); struct.response.read(iprot); @@ -34567,7 +35841,7 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 5: // COOKIE + case 6: // COOKIE if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list8 = iprot.readListBegin(); @@ -34607,6 +35881,11 @@ public class ClientHandlers { oprot.writeFieldBegin(BID_FIELD_DESC); oprot.writeI32(struct.bid); oprot.writeFieldEnd(); + if (struct.frame != null) { + oprot.writeFieldBegin(FRAME_FIELD_DESC); + struct.frame.write(oprot); + oprot.writeFieldEnd(); + } if (struct.request != null) { oprot.writeFieldBegin(REQUEST_FIELD_DESC); struct.request.write(oprot); @@ -34654,22 +35933,28 @@ public class ClientHandlers { if (struct.isSetBid()) { optionals.set(1); } - if (struct.isSetRequest()) { + if (struct.isSetFrame()) { optionals.set(2); } - if (struct.isSetResponse()) { + if (struct.isSetRequest()) { optionals.set(3); } - if (struct.isSetCookie()) { + if (struct.isSetResponse()) { optionals.set(4); } - oprot.writeBitSet(optionals, 5); + if (struct.isSetCookie()) { + optionals.set(5); + } + oprot.writeBitSet(optionals, 6); if (struct.isSetFilter()) { oprot.writeI32(struct.filter); } if (struct.isSetBid()) { oprot.writeI32(struct.bid); } + if (struct.isSetFrame()) { + struct.frame.write(oprot); + } if (struct.isSetRequest()) { struct.request.write(oprot); } @@ -34690,7 +35975,7 @@ public class ClientHandlers { @Override public void read(org.apache.thrift.protocol.TProtocol prot, CookieAccessFilter_CanSaveCookie_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(5); + java.util.BitSet incoming = iprot.readBitSet(6); if (incoming.get(0)) { struct.filter = iprot.readI32(); struct.setFilterIsSet(true); @@ -34700,16 +35985,21 @@ public class ClientHandlers { struct.setBidIsSet(true); } if (incoming.get(2)) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } + if (incoming.get(3)) { struct.request = new com.jetbrains.cef.remote.thrift_codegen.RObject(); struct.request.read(iprot); struct.setRequestIsSet(true); } - if (incoming.get(3)) { + if (incoming.get(4)) { struct.response = new com.jetbrains.cef.remote.thrift_codegen.RObject(); struct.response.read(iprot); struct.setResponseIsSet(true); } - if (incoming.get(4)) { + if (incoming.get(5)) { { org.apache.thrift.protocol.TList _list13 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING); struct.cookie = new java.util.ArrayList<java.lang.String>(_list13.size); @@ -35111,20 +36401,23 @@ public class ClientHandlers { private static final org.apache.thrift.protocol.TField RR_HANDLER_FIELD_DESC = new org.apache.thrift.protocol.TField("rrHandler", org.apache.thrift.protocol.TType.I32, (short)1); private static final org.apache.thrift.protocol.TField BID_FIELD_DESC = new org.apache.thrift.protocol.TField("bid", org.apache.thrift.protocol.TType.I32, (short)2); - private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)3); + private static final org.apache.thrift.protocol.TField FRAME_FIELD_DESC = new org.apache.thrift.protocol.TField("frame", org.apache.thrift.protocol.TType.STRUCT, (short)3); + private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)4); private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ResourceRequestHandler_OnBeforeResourceLoad_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ResourceRequestHandler_OnBeforeResourceLoad_argsTupleSchemeFactory(); public int rrHandler; // required public int bid; // required + public @org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame; // required public @org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject request; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { RR_HANDLER((short)1, "rrHandler"), BID((short)2, "bid"), - REQUEST((short)3, "request"); + FRAME((short)3, "frame"), + REQUEST((short)4, "request"); private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>(); @@ -35144,7 +36437,9 @@ public class ClientHandlers { return RR_HANDLER; case 2: // BID return BID; - case 3: // REQUEST + case 3: // FRAME + return FRAME; + case 4: // REQUEST return REQUEST; default: return null; @@ -35199,6 +36494,8 @@ public class ClientHandlers { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); tmpMap.put(_Fields.BID, new org.apache.thrift.meta_data.FieldMetaData("bid", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.FRAME, new org.apache.thrift.meta_data.FieldMetaData("frame", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.jetbrains.cef.remote.thrift_codegen.RObject.class))); tmpMap.put(_Fields.REQUEST, new org.apache.thrift.meta_data.FieldMetaData("request", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.jetbrains.cef.remote.thrift_codegen.RObject.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); @@ -35211,6 +36508,7 @@ public class ClientHandlers { public ResourceRequestHandler_OnBeforeResourceLoad_args( int rrHandler, int bid, + com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request) { this(); @@ -35218,6 +36516,7 @@ public class ClientHandlers { setRrHandlerIsSet(true); this.bid = bid; setBidIsSet(true); + this.frame = frame; this.request = request; } @@ -35228,6 +36527,9 @@ public class ClientHandlers { __isset_bitfield = other.__isset_bitfield; this.rrHandler = other.rrHandler; this.bid = other.bid; + if (other.isSetFrame()) { + this.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(other.frame); + } if (other.isSetRequest()) { this.request = new com.jetbrains.cef.remote.thrift_codegen.RObject(other.request); } @@ -35244,6 +36546,7 @@ public class ClientHandlers { this.rrHandler = 0; setBidIsSet(false); this.bid = 0; + this.frame = null; this.request = null; } @@ -35294,6 +36597,31 @@ public class ClientHandlers { } @org.apache.thrift.annotation.Nullable + public com.jetbrains.cef.remote.thrift_codegen.RObject getFrame() { + return this.frame; + } + + public ResourceRequestHandler_OnBeforeResourceLoad_args setFrame(@org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame) { + this.frame = frame; + return this; + } + + public void unsetFrame() { + this.frame = null; + } + + /** Returns true if field frame is set (has been assigned a value) and false otherwise */ + public boolean isSetFrame() { + return this.frame != null; + } + + public void setFrameIsSet(boolean value) { + if (!value) { + this.frame = null; + } + } + + @org.apache.thrift.annotation.Nullable public com.jetbrains.cef.remote.thrift_codegen.RObject getRequest() { return this.request; } @@ -35337,6 +36665,14 @@ public class ClientHandlers { } break; + case FRAME: + if (value == null) { + unsetFrame(); + } else { + setFrame((com.jetbrains.cef.remote.thrift_codegen.RObject)value); + } + break; + case REQUEST: if (value == null) { unsetRequest(); @@ -35358,6 +36694,9 @@ public class ClientHandlers { case BID: return getBid(); + case FRAME: + return getFrame(); + case REQUEST: return getRequest(); @@ -35377,6 +36716,8 @@ public class ClientHandlers { return isSetRrHandler(); case BID: return isSetBid(); + case FRAME: + return isSetFrame(); case REQUEST: return isSetRequest(); } @@ -35414,6 +36755,15 @@ public class ClientHandlers { return false; } + boolean this_present_frame = true && this.isSetFrame(); + boolean that_present_frame = true && that.isSetFrame(); + if (this_present_frame || that_present_frame) { + if (!(this_present_frame && that_present_frame)) + return false; + if (!this.frame.equals(that.frame)) + return false; + } + boolean this_present_request = true && this.isSetRequest(); boolean that_present_request = true && that.isSetRequest(); if (this_present_request || that_present_request) { @@ -35434,6 +36784,10 @@ public class ClientHandlers { hashCode = hashCode * 8191 + bid; + hashCode = hashCode * 8191 + ((isSetFrame()) ? 131071 : 524287); + if (isSetFrame()) + hashCode = hashCode * 8191 + frame.hashCode(); + hashCode = hashCode * 8191 + ((isSetRequest()) ? 131071 : 524287); if (isSetRequest()) hashCode = hashCode * 8191 + request.hashCode(); @@ -35469,6 +36823,16 @@ public class ClientHandlers { return lastComparison; } } + lastComparison = java.lang.Boolean.compare(isSetFrame(), other.isSetFrame()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetFrame()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.frame, other.frame); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = java.lang.Boolean.compare(isSetRequest(), other.isSetRequest()); if (lastComparison != 0) { return lastComparison; @@ -35511,6 +36875,14 @@ public class ClientHandlers { sb.append(this.bid); first = false; if (!first) sb.append(", "); + sb.append("frame:"); + if (this.frame == null) { + sb.append("null"); + } else { + sb.append(this.frame); + } + first = false; + if (!first) sb.append(", "); sb.append("request:"); if (this.request == null) { sb.append("null"); @@ -35525,6 +36897,9 @@ public class ClientHandlers { public void validate() throws org.apache.thrift.TException { // check for required fields // check for sub-struct validity + if (frame != null) { + frame.validate(); + } if (request != null) { request.validate(); } @@ -35584,7 +36959,16 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // REQUEST + case 3: // FRAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 4: // REQUEST if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { struct.request = new com.jetbrains.cef.remote.thrift_codegen.RObject(); struct.request.read(iprot); @@ -35615,6 +36999,11 @@ public class ClientHandlers { oprot.writeFieldBegin(BID_FIELD_DESC); oprot.writeI32(struct.bid); oprot.writeFieldEnd(); + if (struct.frame != null) { + oprot.writeFieldBegin(FRAME_FIELD_DESC); + struct.frame.write(oprot); + oprot.writeFieldEnd(); + } if (struct.request != null) { oprot.writeFieldBegin(REQUEST_FIELD_DESC); struct.request.write(oprot); @@ -35645,16 +37034,22 @@ public class ClientHandlers { if (struct.isSetBid()) { optionals.set(1); } - if (struct.isSetRequest()) { + if (struct.isSetFrame()) { optionals.set(2); } - oprot.writeBitSet(optionals, 3); + if (struct.isSetRequest()) { + optionals.set(3); + } + oprot.writeBitSet(optionals, 4); if (struct.isSetRrHandler()) { oprot.writeI32(struct.rrHandler); } if (struct.isSetBid()) { oprot.writeI32(struct.bid); } + if (struct.isSetFrame()) { + struct.frame.write(oprot); + } if (struct.isSetRequest()) { struct.request.write(oprot); } @@ -35663,7 +37058,7 @@ public class ClientHandlers { @Override public void read(org.apache.thrift.protocol.TProtocol prot, ResourceRequestHandler_OnBeforeResourceLoad_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(3); + java.util.BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { struct.rrHandler = iprot.readI32(); struct.setRrHandlerIsSet(true); @@ -35673,6 +37068,11 @@ public class ClientHandlers { struct.setBidIsSet(true); } if (incoming.get(2)) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } + if (incoming.get(3)) { struct.request = new com.jetbrains.cef.remote.thrift_codegen.RObject(); struct.request.read(iprot); struct.setRequestIsSet(true); @@ -36066,20 +37466,23 @@ public class ClientHandlers { private static final org.apache.thrift.protocol.TField RR_HANDLER_FIELD_DESC = new org.apache.thrift.protocol.TField("rrHandler", org.apache.thrift.protocol.TType.I32, (short)1); private static final org.apache.thrift.protocol.TField BID_FIELD_DESC = new org.apache.thrift.protocol.TField("bid", org.apache.thrift.protocol.TType.I32, (short)2); - private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)3); + private static final org.apache.thrift.protocol.TField FRAME_FIELD_DESC = new org.apache.thrift.protocol.TField("frame", org.apache.thrift.protocol.TType.STRUCT, (short)3); + private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)4); private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ResourceRequestHandler_GetResourceHandler_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ResourceRequestHandler_GetResourceHandler_argsTupleSchemeFactory(); public int rrHandler; // required public int bid; // required + public @org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame; // required public @org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject request; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { RR_HANDLER((short)1, "rrHandler"), BID((short)2, "bid"), - REQUEST((short)3, "request"); + FRAME((short)3, "frame"), + REQUEST((short)4, "request"); private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>(); @@ -36099,7 +37502,9 @@ public class ClientHandlers { return RR_HANDLER; case 2: // BID return BID; - case 3: // REQUEST + case 3: // FRAME + return FRAME; + case 4: // REQUEST return REQUEST; default: return null; @@ -36154,6 +37559,8 @@ public class ClientHandlers { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); tmpMap.put(_Fields.BID, new org.apache.thrift.meta_data.FieldMetaData("bid", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.FRAME, new org.apache.thrift.meta_data.FieldMetaData("frame", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.jetbrains.cef.remote.thrift_codegen.RObject.class))); tmpMap.put(_Fields.REQUEST, new org.apache.thrift.meta_data.FieldMetaData("request", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.jetbrains.cef.remote.thrift_codegen.RObject.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); @@ -36166,6 +37573,7 @@ public class ClientHandlers { public ResourceRequestHandler_GetResourceHandler_args( int rrHandler, int bid, + com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request) { this(); @@ -36173,6 +37581,7 @@ public class ClientHandlers { setRrHandlerIsSet(true); this.bid = bid; setBidIsSet(true); + this.frame = frame; this.request = request; } @@ -36183,6 +37592,9 @@ public class ClientHandlers { __isset_bitfield = other.__isset_bitfield; this.rrHandler = other.rrHandler; this.bid = other.bid; + if (other.isSetFrame()) { + this.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(other.frame); + } if (other.isSetRequest()) { this.request = new com.jetbrains.cef.remote.thrift_codegen.RObject(other.request); } @@ -36199,6 +37611,7 @@ public class ClientHandlers { this.rrHandler = 0; setBidIsSet(false); this.bid = 0; + this.frame = null; this.request = null; } @@ -36249,6 +37662,31 @@ public class ClientHandlers { } @org.apache.thrift.annotation.Nullable + public com.jetbrains.cef.remote.thrift_codegen.RObject getFrame() { + return this.frame; + } + + public ResourceRequestHandler_GetResourceHandler_args setFrame(@org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame) { + this.frame = frame; + return this; + } + + public void unsetFrame() { + this.frame = null; + } + + /** Returns true if field frame is set (has been assigned a value) and false otherwise */ + public boolean isSetFrame() { + return this.frame != null; + } + + public void setFrameIsSet(boolean value) { + if (!value) { + this.frame = null; + } + } + + @org.apache.thrift.annotation.Nullable public com.jetbrains.cef.remote.thrift_codegen.RObject getRequest() { return this.request; } @@ -36292,6 +37730,14 @@ public class ClientHandlers { } break; + case FRAME: + if (value == null) { + unsetFrame(); + } else { + setFrame((com.jetbrains.cef.remote.thrift_codegen.RObject)value); + } + break; + case REQUEST: if (value == null) { unsetRequest(); @@ -36313,6 +37759,9 @@ public class ClientHandlers { case BID: return getBid(); + case FRAME: + return getFrame(); + case REQUEST: return getRequest(); @@ -36332,6 +37781,8 @@ public class ClientHandlers { return isSetRrHandler(); case BID: return isSetBid(); + case FRAME: + return isSetFrame(); case REQUEST: return isSetRequest(); } @@ -36369,6 +37820,15 @@ public class ClientHandlers { return false; } + boolean this_present_frame = true && this.isSetFrame(); + boolean that_present_frame = true && that.isSetFrame(); + if (this_present_frame || that_present_frame) { + if (!(this_present_frame && that_present_frame)) + return false; + if (!this.frame.equals(that.frame)) + return false; + } + boolean this_present_request = true && this.isSetRequest(); boolean that_present_request = true && that.isSetRequest(); if (this_present_request || that_present_request) { @@ -36389,6 +37849,10 @@ public class ClientHandlers { hashCode = hashCode * 8191 + bid; + hashCode = hashCode * 8191 + ((isSetFrame()) ? 131071 : 524287); + if (isSetFrame()) + hashCode = hashCode * 8191 + frame.hashCode(); + hashCode = hashCode * 8191 + ((isSetRequest()) ? 131071 : 524287); if (isSetRequest()) hashCode = hashCode * 8191 + request.hashCode(); @@ -36424,6 +37888,16 @@ public class ClientHandlers { return lastComparison; } } + lastComparison = java.lang.Boolean.compare(isSetFrame(), other.isSetFrame()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetFrame()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.frame, other.frame); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = java.lang.Boolean.compare(isSetRequest(), other.isSetRequest()); if (lastComparison != 0) { return lastComparison; @@ -36466,6 +37940,14 @@ public class ClientHandlers { sb.append(this.bid); first = false; if (!first) sb.append(", "); + sb.append("frame:"); + if (this.frame == null) { + sb.append("null"); + } else { + sb.append(this.frame); + } + first = false; + if (!first) sb.append(", "); sb.append("request:"); if (this.request == null) { sb.append("null"); @@ -36480,6 +37962,9 @@ public class ClientHandlers { public void validate() throws org.apache.thrift.TException { // check for required fields // check for sub-struct validity + if (frame != null) { + frame.validate(); + } if (request != null) { request.validate(); } @@ -36539,7 +38024,16 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // REQUEST + case 3: // FRAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 4: // REQUEST if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { struct.request = new com.jetbrains.cef.remote.thrift_codegen.RObject(); struct.request.read(iprot); @@ -36570,6 +38064,11 @@ public class ClientHandlers { oprot.writeFieldBegin(BID_FIELD_DESC); oprot.writeI32(struct.bid); oprot.writeFieldEnd(); + if (struct.frame != null) { + oprot.writeFieldBegin(FRAME_FIELD_DESC); + struct.frame.write(oprot); + oprot.writeFieldEnd(); + } if (struct.request != null) { oprot.writeFieldBegin(REQUEST_FIELD_DESC); struct.request.write(oprot); @@ -36600,16 +38099,22 @@ public class ClientHandlers { if (struct.isSetBid()) { optionals.set(1); } - if (struct.isSetRequest()) { + if (struct.isSetFrame()) { optionals.set(2); } - oprot.writeBitSet(optionals, 3); + if (struct.isSetRequest()) { + optionals.set(3); + } + oprot.writeBitSet(optionals, 4); if (struct.isSetRrHandler()) { oprot.writeI32(struct.rrHandler); } if (struct.isSetBid()) { oprot.writeI32(struct.bid); } + if (struct.isSetFrame()) { + struct.frame.write(oprot); + } if (struct.isSetRequest()) { struct.request.write(oprot); } @@ -36618,7 +38123,7 @@ public class ClientHandlers { @Override public void read(org.apache.thrift.protocol.TProtocol prot, ResourceRequestHandler_GetResourceHandler_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(3); + java.util.BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { struct.rrHandler = iprot.readI32(); struct.setRrHandlerIsSet(true); @@ -36628,6 +38133,11 @@ public class ClientHandlers { struct.setBidIsSet(true); } if (incoming.get(2)) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } + if (incoming.get(3)) { struct.request = new com.jetbrains.cef.remote.thrift_codegen.RObject(); struct.request.read(iprot); struct.setRequestIsSet(true); @@ -40576,15 +42086,17 @@ public class ClientHandlers { private static final org.apache.thrift.protocol.TField RR_HANDLER_FIELD_DESC = new org.apache.thrift.protocol.TField("rrHandler", org.apache.thrift.protocol.TType.I32, (short)1); private static final org.apache.thrift.protocol.TField BID_FIELD_DESC = new org.apache.thrift.protocol.TField("bid", org.apache.thrift.protocol.TType.I32, (short)2); - private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)3); - private static final org.apache.thrift.protocol.TField RESPONSE_FIELD_DESC = new org.apache.thrift.protocol.TField("response", org.apache.thrift.protocol.TType.STRUCT, (short)4); - private static final org.apache.thrift.protocol.TField NEW_URL_FIELD_DESC = new org.apache.thrift.protocol.TField("new_url", org.apache.thrift.protocol.TType.STRING, (short)5); + private static final org.apache.thrift.protocol.TField FRAME_FIELD_DESC = new org.apache.thrift.protocol.TField("frame", org.apache.thrift.protocol.TType.STRUCT, (short)3); + private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)4); + private static final org.apache.thrift.protocol.TField RESPONSE_FIELD_DESC = new org.apache.thrift.protocol.TField("response", org.apache.thrift.protocol.TType.STRUCT, (short)5); + private static final org.apache.thrift.protocol.TField NEW_URL_FIELD_DESC = new org.apache.thrift.protocol.TField("new_url", org.apache.thrift.protocol.TType.STRING, (short)6); private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ResourceRequestHandler_OnResourceRedirect_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ResourceRequestHandler_OnResourceRedirect_argsTupleSchemeFactory(); public int rrHandler; // required public int bid; // required + public @org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame; // required public @org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject request; // required public @org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject response; // required public @org.apache.thrift.annotation.Nullable java.lang.String new_url; // required @@ -40593,9 +42105,10 @@ public class ClientHandlers { public enum _Fields implements org.apache.thrift.TFieldIdEnum { RR_HANDLER((short)1, "rrHandler"), BID((short)2, "bid"), - REQUEST((short)3, "request"), - RESPONSE((short)4, "response"), - NEW_URL((short)5, "new_url"); + FRAME((short)3, "frame"), + REQUEST((short)4, "request"), + RESPONSE((short)5, "response"), + NEW_URL((short)6, "new_url"); private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>(); @@ -40615,11 +42128,13 @@ public class ClientHandlers { return RR_HANDLER; case 2: // BID return BID; - case 3: // REQUEST + case 3: // FRAME + return FRAME; + case 4: // REQUEST return REQUEST; - case 4: // RESPONSE + case 5: // RESPONSE return RESPONSE; - case 5: // NEW_URL + case 6: // NEW_URL return NEW_URL; default: return null; @@ -40674,6 +42189,8 @@ public class ClientHandlers { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); tmpMap.put(_Fields.BID, new org.apache.thrift.meta_data.FieldMetaData("bid", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.FRAME, new org.apache.thrift.meta_data.FieldMetaData("frame", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.jetbrains.cef.remote.thrift_codegen.RObject.class))); tmpMap.put(_Fields.REQUEST, new org.apache.thrift.meta_data.FieldMetaData("request", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.jetbrains.cef.remote.thrift_codegen.RObject.class))); tmpMap.put(_Fields.RESPONSE, new org.apache.thrift.meta_data.FieldMetaData("response", org.apache.thrift.TFieldRequirementType.DEFAULT, @@ -40690,6 +42207,7 @@ public class ClientHandlers { public ResourceRequestHandler_OnResourceRedirect_args( int rrHandler, int bid, + com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, java.lang.String new_url) @@ -40699,6 +42217,7 @@ public class ClientHandlers { setRrHandlerIsSet(true); this.bid = bid; setBidIsSet(true); + this.frame = frame; this.request = request; this.response = response; this.new_url = new_url; @@ -40711,6 +42230,9 @@ public class ClientHandlers { __isset_bitfield = other.__isset_bitfield; this.rrHandler = other.rrHandler; this.bid = other.bid; + if (other.isSetFrame()) { + this.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(other.frame); + } if (other.isSetRequest()) { this.request = new com.jetbrains.cef.remote.thrift_codegen.RObject(other.request); } @@ -40733,6 +42255,7 @@ public class ClientHandlers { this.rrHandler = 0; setBidIsSet(false); this.bid = 0; + this.frame = null; this.request = null; this.response = null; this.new_url = null; @@ -40785,6 +42308,31 @@ public class ClientHandlers { } @org.apache.thrift.annotation.Nullable + public com.jetbrains.cef.remote.thrift_codegen.RObject getFrame() { + return this.frame; + } + + public ResourceRequestHandler_OnResourceRedirect_args setFrame(@org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame) { + this.frame = frame; + return this; + } + + public void unsetFrame() { + this.frame = null; + } + + /** Returns true if field frame is set (has been assigned a value) and false otherwise */ + public boolean isSetFrame() { + return this.frame != null; + } + + public void setFrameIsSet(boolean value) { + if (!value) { + this.frame = null; + } + } + + @org.apache.thrift.annotation.Nullable public com.jetbrains.cef.remote.thrift_codegen.RObject getRequest() { return this.request; } @@ -40878,6 +42426,14 @@ public class ClientHandlers { } break; + case FRAME: + if (value == null) { + unsetFrame(); + } else { + setFrame((com.jetbrains.cef.remote.thrift_codegen.RObject)value); + } + break; + case REQUEST: if (value == null) { unsetRequest(); @@ -40915,6 +42471,9 @@ public class ClientHandlers { case BID: return getBid(); + case FRAME: + return getFrame(); + case REQUEST: return getRequest(); @@ -40940,6 +42499,8 @@ public class ClientHandlers { return isSetRrHandler(); case BID: return isSetBid(); + case FRAME: + return isSetFrame(); case REQUEST: return isSetRequest(); case RESPONSE: @@ -40981,6 +42542,15 @@ public class ClientHandlers { return false; } + boolean this_present_frame = true && this.isSetFrame(); + boolean that_present_frame = true && that.isSetFrame(); + if (this_present_frame || that_present_frame) { + if (!(this_present_frame && that_present_frame)) + return false; + if (!this.frame.equals(that.frame)) + return false; + } + boolean this_present_request = true && this.isSetRequest(); boolean that_present_request = true && that.isSetRequest(); if (this_present_request || that_present_request) { @@ -41019,6 +42589,10 @@ public class ClientHandlers { hashCode = hashCode * 8191 + bid; + hashCode = hashCode * 8191 + ((isSetFrame()) ? 131071 : 524287); + if (isSetFrame()) + hashCode = hashCode * 8191 + frame.hashCode(); + hashCode = hashCode * 8191 + ((isSetRequest()) ? 131071 : 524287); if (isSetRequest()) hashCode = hashCode * 8191 + request.hashCode(); @@ -41062,6 +42636,16 @@ public class ClientHandlers { return lastComparison; } } + lastComparison = java.lang.Boolean.compare(isSetFrame(), other.isSetFrame()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetFrame()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.frame, other.frame); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = java.lang.Boolean.compare(isSetRequest(), other.isSetRequest()); if (lastComparison != 0) { return lastComparison; @@ -41124,6 +42708,14 @@ public class ClientHandlers { sb.append(this.bid); first = false; if (!first) sb.append(", "); + sb.append("frame:"); + if (this.frame == null) { + sb.append("null"); + } else { + sb.append(this.frame); + } + first = false; + if (!first) sb.append(", "); sb.append("request:"); if (this.request == null) { sb.append("null"); @@ -41154,6 +42746,9 @@ public class ClientHandlers { public void validate() throws org.apache.thrift.TException { // check for required fields // check for sub-struct validity + if (frame != null) { + frame.validate(); + } if (request != null) { request.validate(); } @@ -41216,7 +42811,16 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // REQUEST + case 3: // FRAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 4: // REQUEST if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { struct.request = new com.jetbrains.cef.remote.thrift_codegen.RObject(); struct.request.read(iprot); @@ -41225,7 +42829,7 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // RESPONSE + case 5: // RESPONSE if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { struct.response = new com.jetbrains.cef.remote.thrift_codegen.RObject(); struct.response.read(iprot); @@ -41234,7 +42838,7 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 5: // NEW_URL + case 6: // NEW_URL if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.new_url = iprot.readString(); struct.setNew_urlIsSet(true); @@ -41264,6 +42868,11 @@ public class ClientHandlers { oprot.writeFieldBegin(BID_FIELD_DESC); oprot.writeI32(struct.bid); oprot.writeFieldEnd(); + if (struct.frame != null) { + oprot.writeFieldBegin(FRAME_FIELD_DESC); + struct.frame.write(oprot); + oprot.writeFieldEnd(); + } if (struct.request != null) { oprot.writeFieldBegin(REQUEST_FIELD_DESC); struct.request.write(oprot); @@ -41304,22 +42913,28 @@ public class ClientHandlers { if (struct.isSetBid()) { optionals.set(1); } - if (struct.isSetRequest()) { + if (struct.isSetFrame()) { optionals.set(2); } - if (struct.isSetResponse()) { + if (struct.isSetRequest()) { optionals.set(3); } - if (struct.isSetNew_url()) { + if (struct.isSetResponse()) { optionals.set(4); } - oprot.writeBitSet(optionals, 5); + if (struct.isSetNew_url()) { + optionals.set(5); + } + oprot.writeBitSet(optionals, 6); if (struct.isSetRrHandler()) { oprot.writeI32(struct.rrHandler); } if (struct.isSetBid()) { oprot.writeI32(struct.bid); } + if (struct.isSetFrame()) { + struct.frame.write(oprot); + } if (struct.isSetRequest()) { struct.request.write(oprot); } @@ -41334,7 +42949,7 @@ public class ClientHandlers { @Override public void read(org.apache.thrift.protocol.TProtocol prot, ResourceRequestHandler_OnResourceRedirect_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(5); + java.util.BitSet incoming = iprot.readBitSet(6); if (incoming.get(0)) { struct.rrHandler = iprot.readI32(); struct.setRrHandlerIsSet(true); @@ -41344,16 +42959,21 @@ public class ClientHandlers { struct.setBidIsSet(true); } if (incoming.get(2)) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } + if (incoming.get(3)) { struct.request = new com.jetbrains.cef.remote.thrift_codegen.RObject(); struct.request.read(iprot); struct.setRequestIsSet(true); } - if (incoming.get(3)) { + if (incoming.get(4)) { struct.response = new com.jetbrains.cef.remote.thrift_codegen.RObject(); struct.response.read(iprot); struct.setResponseIsSet(true); } - if (incoming.get(4)) { + if (incoming.get(5)) { struct.new_url = iprot.readString(); struct.setNew_urlIsSet(true); } @@ -41749,14 +43369,16 @@ public class ClientHandlers { private static final org.apache.thrift.protocol.TField RR_HANDLER_FIELD_DESC = new org.apache.thrift.protocol.TField("rrHandler", org.apache.thrift.protocol.TType.I32, (short)1); private static final org.apache.thrift.protocol.TField BID_FIELD_DESC = new org.apache.thrift.protocol.TField("bid", org.apache.thrift.protocol.TType.I32, (short)2); - private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)3); - private static final org.apache.thrift.protocol.TField RESPONSE_FIELD_DESC = new org.apache.thrift.protocol.TField("response", org.apache.thrift.protocol.TType.STRUCT, (short)4); + private static final org.apache.thrift.protocol.TField FRAME_FIELD_DESC = new org.apache.thrift.protocol.TField("frame", org.apache.thrift.protocol.TType.STRUCT, (short)3); + private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)4); + private static final org.apache.thrift.protocol.TField RESPONSE_FIELD_DESC = new org.apache.thrift.protocol.TField("response", org.apache.thrift.protocol.TType.STRUCT, (short)5); private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ResourceRequestHandler_OnResourceResponse_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ResourceRequestHandler_OnResourceResponse_argsTupleSchemeFactory(); public int rrHandler; // required public int bid; // required + public @org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame; // required public @org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject request; // required public @org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject response; // required @@ -41764,8 +43386,9 @@ public class ClientHandlers { public enum _Fields implements org.apache.thrift.TFieldIdEnum { RR_HANDLER((short)1, "rrHandler"), BID((short)2, "bid"), - REQUEST((short)3, "request"), - RESPONSE((short)4, "response"); + FRAME((short)3, "frame"), + REQUEST((short)4, "request"), + RESPONSE((short)5, "response"); private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>(); @@ -41785,9 +43408,11 @@ public class ClientHandlers { return RR_HANDLER; case 2: // BID return BID; - case 3: // REQUEST + case 3: // FRAME + return FRAME; + case 4: // REQUEST return REQUEST; - case 4: // RESPONSE + case 5: // RESPONSE return RESPONSE; default: return null; @@ -41842,6 +43467,8 @@ public class ClientHandlers { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); tmpMap.put(_Fields.BID, new org.apache.thrift.meta_data.FieldMetaData("bid", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.FRAME, new org.apache.thrift.meta_data.FieldMetaData("frame", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.jetbrains.cef.remote.thrift_codegen.RObject.class))); tmpMap.put(_Fields.REQUEST, new org.apache.thrift.meta_data.FieldMetaData("request", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.jetbrains.cef.remote.thrift_codegen.RObject.class))); tmpMap.put(_Fields.RESPONSE, new org.apache.thrift.meta_data.FieldMetaData("response", org.apache.thrift.TFieldRequirementType.DEFAULT, @@ -41856,6 +43483,7 @@ public class ClientHandlers { public ResourceRequestHandler_OnResourceResponse_args( int rrHandler, int bid, + com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response) { @@ -41864,6 +43492,7 @@ public class ClientHandlers { setRrHandlerIsSet(true); this.bid = bid; setBidIsSet(true); + this.frame = frame; this.request = request; this.response = response; } @@ -41875,6 +43504,9 @@ public class ClientHandlers { __isset_bitfield = other.__isset_bitfield; this.rrHandler = other.rrHandler; this.bid = other.bid; + if (other.isSetFrame()) { + this.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(other.frame); + } if (other.isSetRequest()) { this.request = new com.jetbrains.cef.remote.thrift_codegen.RObject(other.request); } @@ -41894,6 +43526,7 @@ public class ClientHandlers { this.rrHandler = 0; setBidIsSet(false); this.bid = 0; + this.frame = null; this.request = null; this.response = null; } @@ -41945,6 +43578,31 @@ public class ClientHandlers { } @org.apache.thrift.annotation.Nullable + public com.jetbrains.cef.remote.thrift_codegen.RObject getFrame() { + return this.frame; + } + + public ResourceRequestHandler_OnResourceResponse_args setFrame(@org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame) { + this.frame = frame; + return this; + } + + public void unsetFrame() { + this.frame = null; + } + + /** Returns true if field frame is set (has been assigned a value) and false otherwise */ + public boolean isSetFrame() { + return this.frame != null; + } + + public void setFrameIsSet(boolean value) { + if (!value) { + this.frame = null; + } + } + + @org.apache.thrift.annotation.Nullable public com.jetbrains.cef.remote.thrift_codegen.RObject getRequest() { return this.request; } @@ -42013,6 +43671,14 @@ public class ClientHandlers { } break; + case FRAME: + if (value == null) { + unsetFrame(); + } else { + setFrame((com.jetbrains.cef.remote.thrift_codegen.RObject)value); + } + break; + case REQUEST: if (value == null) { unsetRequest(); @@ -42042,6 +43708,9 @@ public class ClientHandlers { case BID: return getBid(); + case FRAME: + return getFrame(); + case REQUEST: return getRequest(); @@ -42064,6 +43733,8 @@ public class ClientHandlers { return isSetRrHandler(); case BID: return isSetBid(); + case FRAME: + return isSetFrame(); case REQUEST: return isSetRequest(); case RESPONSE: @@ -42103,6 +43774,15 @@ public class ClientHandlers { return false; } + boolean this_present_frame = true && this.isSetFrame(); + boolean that_present_frame = true && that.isSetFrame(); + if (this_present_frame || that_present_frame) { + if (!(this_present_frame && that_present_frame)) + return false; + if (!this.frame.equals(that.frame)) + return false; + } + boolean this_present_request = true && this.isSetRequest(); boolean that_present_request = true && that.isSetRequest(); if (this_present_request || that_present_request) { @@ -42132,6 +43812,10 @@ public class ClientHandlers { hashCode = hashCode * 8191 + bid; + hashCode = hashCode * 8191 + ((isSetFrame()) ? 131071 : 524287); + if (isSetFrame()) + hashCode = hashCode * 8191 + frame.hashCode(); + hashCode = hashCode * 8191 + ((isSetRequest()) ? 131071 : 524287); if (isSetRequest()) hashCode = hashCode * 8191 + request.hashCode(); @@ -42171,6 +43855,16 @@ public class ClientHandlers { return lastComparison; } } + lastComparison = java.lang.Boolean.compare(isSetFrame(), other.isSetFrame()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetFrame()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.frame, other.frame); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = java.lang.Boolean.compare(isSetRequest(), other.isSetRequest()); if (lastComparison != 0) { return lastComparison; @@ -42223,6 +43917,14 @@ public class ClientHandlers { sb.append(this.bid); first = false; if (!first) sb.append(", "); + sb.append("frame:"); + if (this.frame == null) { + sb.append("null"); + } else { + sb.append(this.frame); + } + first = false; + if (!first) sb.append(", "); sb.append("request:"); if (this.request == null) { sb.append("null"); @@ -42245,6 +43947,9 @@ public class ClientHandlers { public void validate() throws org.apache.thrift.TException { // check for required fields // check for sub-struct validity + if (frame != null) { + frame.validate(); + } if (request != null) { request.validate(); } @@ -42307,7 +44012,16 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // REQUEST + case 3: // FRAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 4: // REQUEST if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { struct.request = new com.jetbrains.cef.remote.thrift_codegen.RObject(); struct.request.read(iprot); @@ -42316,7 +44030,7 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // RESPONSE + case 5: // RESPONSE if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { struct.response = new com.jetbrains.cef.remote.thrift_codegen.RObject(); struct.response.read(iprot); @@ -42347,6 +44061,11 @@ public class ClientHandlers { oprot.writeFieldBegin(BID_FIELD_DESC); oprot.writeI32(struct.bid); oprot.writeFieldEnd(); + if (struct.frame != null) { + oprot.writeFieldBegin(FRAME_FIELD_DESC); + struct.frame.write(oprot); + oprot.writeFieldEnd(); + } if (struct.request != null) { oprot.writeFieldBegin(REQUEST_FIELD_DESC); struct.request.write(oprot); @@ -42382,19 +44101,25 @@ public class ClientHandlers { if (struct.isSetBid()) { optionals.set(1); } - if (struct.isSetRequest()) { + if (struct.isSetFrame()) { optionals.set(2); } - if (struct.isSetResponse()) { + if (struct.isSetRequest()) { optionals.set(3); } - oprot.writeBitSet(optionals, 4); + if (struct.isSetResponse()) { + optionals.set(4); + } + oprot.writeBitSet(optionals, 5); if (struct.isSetRrHandler()) { oprot.writeI32(struct.rrHandler); } if (struct.isSetBid()) { oprot.writeI32(struct.bid); } + if (struct.isSetFrame()) { + struct.frame.write(oprot); + } if (struct.isSetRequest()) { struct.request.write(oprot); } @@ -42406,7 +44131,7 @@ public class ClientHandlers { @Override public void read(org.apache.thrift.protocol.TProtocol prot, ResourceRequestHandler_OnResourceResponse_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(4); + java.util.BitSet incoming = iprot.readBitSet(5); if (incoming.get(0)) { struct.rrHandler = iprot.readI32(); struct.setRrHandlerIsSet(true); @@ -42416,11 +44141,16 @@ public class ClientHandlers { struct.setBidIsSet(true); } if (incoming.get(2)) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } + if (incoming.get(3)) { struct.request = new com.jetbrains.cef.remote.thrift_codegen.RObject(); struct.request.read(iprot); struct.setRequestIsSet(true); } - if (incoming.get(3)) { + if (incoming.get(4)) { struct.response = new com.jetbrains.cef.remote.thrift_codegen.RObject(); struct.response.read(iprot); struct.setResponseIsSet(true); @@ -42814,16 +44544,18 @@ public class ClientHandlers { private static final org.apache.thrift.protocol.TField RR_HANDLER_FIELD_DESC = new org.apache.thrift.protocol.TField("rrHandler", org.apache.thrift.protocol.TType.I32, (short)1); private static final org.apache.thrift.protocol.TField BID_FIELD_DESC = new org.apache.thrift.protocol.TField("bid", org.apache.thrift.protocol.TType.I32, (short)2); - private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)3); - private static final org.apache.thrift.protocol.TField RESPONSE_FIELD_DESC = new org.apache.thrift.protocol.TField("response", org.apache.thrift.protocol.TType.STRUCT, (short)4); - private static final org.apache.thrift.protocol.TField STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("status", org.apache.thrift.protocol.TType.STRING, (short)5); - private static final org.apache.thrift.protocol.TField RECEIVED_CONTENT_LENGTH_FIELD_DESC = new org.apache.thrift.protocol.TField("receivedContentLength", org.apache.thrift.protocol.TType.I64, (short)6); + private static final org.apache.thrift.protocol.TField FRAME_FIELD_DESC = new org.apache.thrift.protocol.TField("frame", org.apache.thrift.protocol.TType.STRUCT, (short)3); + private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)4); + private static final org.apache.thrift.protocol.TField RESPONSE_FIELD_DESC = new org.apache.thrift.protocol.TField("response", org.apache.thrift.protocol.TType.STRUCT, (short)5); + private static final org.apache.thrift.protocol.TField STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("status", org.apache.thrift.protocol.TType.STRING, (short)6); + private static final org.apache.thrift.protocol.TField RECEIVED_CONTENT_LENGTH_FIELD_DESC = new org.apache.thrift.protocol.TField("receivedContentLength", org.apache.thrift.protocol.TType.I64, (short)7); private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ResourceRequestHandler_OnResourceLoadComplete_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ResourceRequestHandler_OnResourceLoadComplete_argsTupleSchemeFactory(); public int rrHandler; // required public int bid; // required + public @org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame; // required public @org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject request; // required public @org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject response; // required public @org.apache.thrift.annotation.Nullable java.lang.String status; // required @@ -42833,10 +44565,11 @@ public class ClientHandlers { public enum _Fields implements org.apache.thrift.TFieldIdEnum { RR_HANDLER((short)1, "rrHandler"), BID((short)2, "bid"), - REQUEST((short)3, "request"), - RESPONSE((short)4, "response"), - STATUS((short)5, "status"), - RECEIVED_CONTENT_LENGTH((short)6, "receivedContentLength"); + FRAME((short)3, "frame"), + REQUEST((short)4, "request"), + RESPONSE((short)5, "response"), + STATUS((short)6, "status"), + RECEIVED_CONTENT_LENGTH((short)7, "receivedContentLength"); private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>(); @@ -42856,13 +44589,15 @@ public class ClientHandlers { return RR_HANDLER; case 2: // BID return BID; - case 3: // REQUEST + case 3: // FRAME + return FRAME; + case 4: // REQUEST return REQUEST; - case 4: // RESPONSE + case 5: // RESPONSE return RESPONSE; - case 5: // STATUS + case 6: // STATUS return STATUS; - case 6: // RECEIVED_CONTENT_LENGTH + case 7: // RECEIVED_CONTENT_LENGTH return RECEIVED_CONTENT_LENGTH; default: return null; @@ -42918,6 +44653,8 @@ public class ClientHandlers { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); tmpMap.put(_Fields.BID, new org.apache.thrift.meta_data.FieldMetaData("bid", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.FRAME, new org.apache.thrift.meta_data.FieldMetaData("frame", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.jetbrains.cef.remote.thrift_codegen.RObject.class))); tmpMap.put(_Fields.REQUEST, new org.apache.thrift.meta_data.FieldMetaData("request", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.jetbrains.cef.remote.thrift_codegen.RObject.class))); tmpMap.put(_Fields.RESPONSE, new org.apache.thrift.meta_data.FieldMetaData("response", org.apache.thrift.TFieldRequirementType.DEFAULT, @@ -42936,6 +44673,7 @@ public class ClientHandlers { public ResourceRequestHandler_OnResourceLoadComplete_args( int rrHandler, int bid, + com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, com.jetbrains.cef.remote.thrift_codegen.RObject response, java.lang.String status, @@ -42946,6 +44684,7 @@ public class ClientHandlers { setRrHandlerIsSet(true); this.bid = bid; setBidIsSet(true); + this.frame = frame; this.request = request; this.response = response; this.status = status; @@ -42960,6 +44699,9 @@ public class ClientHandlers { __isset_bitfield = other.__isset_bitfield; this.rrHandler = other.rrHandler; this.bid = other.bid; + if (other.isSetFrame()) { + this.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(other.frame); + } if (other.isSetRequest()) { this.request = new com.jetbrains.cef.remote.thrift_codegen.RObject(other.request); } @@ -42983,6 +44725,7 @@ public class ClientHandlers { this.rrHandler = 0; setBidIsSet(false); this.bid = 0; + this.frame = null; this.request = null; this.response = null; this.status = null; @@ -43037,6 +44780,31 @@ public class ClientHandlers { } @org.apache.thrift.annotation.Nullable + public com.jetbrains.cef.remote.thrift_codegen.RObject getFrame() { + return this.frame; + } + + public ResourceRequestHandler_OnResourceLoadComplete_args setFrame(@org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame) { + this.frame = frame; + return this; + } + + public void unsetFrame() { + this.frame = null; + } + + /** Returns true if field frame is set (has been assigned a value) and false otherwise */ + public boolean isSetFrame() { + return this.frame != null; + } + + public void setFrameIsSet(boolean value) { + if (!value) { + this.frame = null; + } + } + + @org.apache.thrift.annotation.Nullable public com.jetbrains.cef.remote.thrift_codegen.RObject getRequest() { return this.request; } @@ -43153,6 +44921,14 @@ public class ClientHandlers { } break; + case FRAME: + if (value == null) { + unsetFrame(); + } else { + setFrame((com.jetbrains.cef.remote.thrift_codegen.RObject)value); + } + break; + case REQUEST: if (value == null) { unsetRequest(); @@ -43198,6 +44974,9 @@ public class ClientHandlers { case BID: return getBid(); + case FRAME: + return getFrame(); + case REQUEST: return getRequest(); @@ -43226,6 +45005,8 @@ public class ClientHandlers { return isSetRrHandler(); case BID: return isSetBid(); + case FRAME: + return isSetFrame(); case REQUEST: return isSetRequest(); case RESPONSE: @@ -43269,6 +45050,15 @@ public class ClientHandlers { return false; } + boolean this_present_frame = true && this.isSetFrame(); + boolean that_present_frame = true && that.isSetFrame(); + if (this_present_frame || that_present_frame) { + if (!(this_present_frame && that_present_frame)) + return false; + if (!this.frame.equals(that.frame)) + return false; + } + boolean this_present_request = true && this.isSetRequest(); boolean that_present_request = true && that.isSetRequest(); if (this_present_request || that_present_request) { @@ -43316,6 +45106,10 @@ public class ClientHandlers { hashCode = hashCode * 8191 + bid; + hashCode = hashCode * 8191 + ((isSetFrame()) ? 131071 : 524287); + if (isSetFrame()) + hashCode = hashCode * 8191 + frame.hashCode(); + hashCode = hashCode * 8191 + ((isSetRequest()) ? 131071 : 524287); if (isSetRequest()) hashCode = hashCode * 8191 + request.hashCode(); @@ -43361,6 +45155,16 @@ public class ClientHandlers { return lastComparison; } } + lastComparison = java.lang.Boolean.compare(isSetFrame(), other.isSetFrame()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetFrame()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.frame, other.frame); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = java.lang.Boolean.compare(isSetRequest(), other.isSetRequest()); if (lastComparison != 0) { return lastComparison; @@ -43433,6 +45237,14 @@ public class ClientHandlers { sb.append(this.bid); first = false; if (!first) sb.append(", "); + sb.append("frame:"); + if (this.frame == null) { + sb.append("null"); + } else { + sb.append(this.frame); + } + first = false; + if (!first) sb.append(", "); sb.append("request:"); if (this.request == null) { sb.append("null"); @@ -43467,6 +45279,9 @@ public class ClientHandlers { public void validate() throws org.apache.thrift.TException { // check for required fields // check for sub-struct validity + if (frame != null) { + frame.validate(); + } if (request != null) { request.validate(); } @@ -43529,7 +45344,16 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // REQUEST + case 3: // FRAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 4: // REQUEST if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { struct.request = new com.jetbrains.cef.remote.thrift_codegen.RObject(); struct.request.read(iprot); @@ -43538,7 +45362,7 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // RESPONSE + case 5: // RESPONSE if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { struct.response = new com.jetbrains.cef.remote.thrift_codegen.RObject(); struct.response.read(iprot); @@ -43547,7 +45371,7 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 5: // STATUS + case 6: // STATUS if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.status = iprot.readString(); struct.setStatusIsSet(true); @@ -43555,7 +45379,7 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 6: // RECEIVED_CONTENT_LENGTH + case 7: // RECEIVED_CONTENT_LENGTH if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.receivedContentLength = iprot.readI64(); struct.setReceivedContentLengthIsSet(true); @@ -43585,6 +45409,11 @@ public class ClientHandlers { oprot.writeFieldBegin(BID_FIELD_DESC); oprot.writeI32(struct.bid); oprot.writeFieldEnd(); + if (struct.frame != null) { + oprot.writeFieldBegin(FRAME_FIELD_DESC); + struct.frame.write(oprot); + oprot.writeFieldEnd(); + } if (struct.request != null) { oprot.writeFieldBegin(REQUEST_FIELD_DESC); struct.request.write(oprot); @@ -43628,25 +45457,31 @@ public class ClientHandlers { if (struct.isSetBid()) { optionals.set(1); } - if (struct.isSetRequest()) { + if (struct.isSetFrame()) { optionals.set(2); } - if (struct.isSetResponse()) { + if (struct.isSetRequest()) { optionals.set(3); } - if (struct.isSetStatus()) { + if (struct.isSetResponse()) { optionals.set(4); } - if (struct.isSetReceivedContentLength()) { + if (struct.isSetStatus()) { optionals.set(5); } - oprot.writeBitSet(optionals, 6); + if (struct.isSetReceivedContentLength()) { + optionals.set(6); + } + oprot.writeBitSet(optionals, 7); if (struct.isSetRrHandler()) { oprot.writeI32(struct.rrHandler); } if (struct.isSetBid()) { oprot.writeI32(struct.bid); } + if (struct.isSetFrame()) { + struct.frame.write(oprot); + } if (struct.isSetRequest()) { struct.request.write(oprot); } @@ -43664,7 +45499,7 @@ public class ClientHandlers { @Override public void read(org.apache.thrift.protocol.TProtocol prot, ResourceRequestHandler_OnResourceLoadComplete_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(6); + java.util.BitSet incoming = iprot.readBitSet(7); if (incoming.get(0)) { struct.rrHandler = iprot.readI32(); struct.setRrHandlerIsSet(true); @@ -43674,20 +45509,25 @@ public class ClientHandlers { struct.setBidIsSet(true); } if (incoming.get(2)) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } + if (incoming.get(3)) { struct.request = new com.jetbrains.cef.remote.thrift_codegen.RObject(); struct.request.read(iprot); struct.setRequestIsSet(true); } - if (incoming.get(3)) { + if (incoming.get(4)) { struct.response = new com.jetbrains.cef.remote.thrift_codegen.RObject(); struct.response.read(iprot); struct.setResponseIsSet(true); } - if (incoming.get(4)) { + if (incoming.get(5)) { struct.status = iprot.readString(); struct.setStatusIsSet(true); } - if (incoming.get(5)) { + if (incoming.get(6)) { struct.receivedContentLength = iprot.readI64(); struct.setReceivedContentLengthIsSet(true); } @@ -43970,14 +45810,16 @@ public class ClientHandlers { private static final org.apache.thrift.protocol.TField RR_HANDLER_FIELD_DESC = new org.apache.thrift.protocol.TField("rrHandler", org.apache.thrift.protocol.TType.I32, (short)1); private static final org.apache.thrift.protocol.TField BID_FIELD_DESC = new org.apache.thrift.protocol.TField("bid", org.apache.thrift.protocol.TType.I32, (short)2); - private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)3); - private static final org.apache.thrift.protocol.TField ALLOW_OS_EXECUTION_FIELD_DESC = new org.apache.thrift.protocol.TField("allowOsExecution", org.apache.thrift.protocol.TType.BOOL, (short)4); + private static final org.apache.thrift.protocol.TField FRAME_FIELD_DESC = new org.apache.thrift.protocol.TField("frame", org.apache.thrift.protocol.TType.STRUCT, (short)3); + private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)4); + private static final org.apache.thrift.protocol.TField ALLOW_OS_EXECUTION_FIELD_DESC = new org.apache.thrift.protocol.TField("allowOsExecution", org.apache.thrift.protocol.TType.BOOL, (short)5); private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ResourceRequestHandler_OnProtocolExecution_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ResourceRequestHandler_OnProtocolExecution_argsTupleSchemeFactory(); public int rrHandler; // required public int bid; // required + public @org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame; // required public @org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject request; // required public boolean allowOsExecution; // required @@ -43985,8 +45827,9 @@ public class ClientHandlers { public enum _Fields implements org.apache.thrift.TFieldIdEnum { RR_HANDLER((short)1, "rrHandler"), BID((short)2, "bid"), - REQUEST((short)3, "request"), - ALLOW_OS_EXECUTION((short)4, "allowOsExecution"); + FRAME((short)3, "frame"), + REQUEST((short)4, "request"), + ALLOW_OS_EXECUTION((short)5, "allowOsExecution"); private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>(); @@ -44006,9 +45849,11 @@ public class ClientHandlers { return RR_HANDLER; case 2: // BID return BID; - case 3: // REQUEST + case 3: // FRAME + return FRAME; + case 4: // REQUEST return REQUEST; - case 4: // ALLOW_OS_EXECUTION + case 5: // ALLOW_OS_EXECUTION return ALLOW_OS_EXECUTION; default: return null; @@ -44064,6 +45909,8 @@ public class ClientHandlers { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); tmpMap.put(_Fields.BID, new org.apache.thrift.meta_data.FieldMetaData("bid", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.FRAME, new org.apache.thrift.meta_data.FieldMetaData("frame", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.jetbrains.cef.remote.thrift_codegen.RObject.class))); tmpMap.put(_Fields.REQUEST, new org.apache.thrift.meta_data.FieldMetaData("request", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.jetbrains.cef.remote.thrift_codegen.RObject.class))); tmpMap.put(_Fields.ALLOW_OS_EXECUTION, new org.apache.thrift.meta_data.FieldMetaData("allowOsExecution", org.apache.thrift.TFieldRequirementType.DEFAULT, @@ -44078,6 +45925,7 @@ public class ClientHandlers { public ResourceRequestHandler_OnProtocolExecution_args( int rrHandler, int bid, + com.jetbrains.cef.remote.thrift_codegen.RObject frame, com.jetbrains.cef.remote.thrift_codegen.RObject request, boolean allowOsExecution) { @@ -44086,6 +45934,7 @@ public class ClientHandlers { setRrHandlerIsSet(true); this.bid = bid; setBidIsSet(true); + this.frame = frame; this.request = request; this.allowOsExecution = allowOsExecution; setAllowOsExecutionIsSet(true); @@ -44098,6 +45947,9 @@ public class ClientHandlers { __isset_bitfield = other.__isset_bitfield; this.rrHandler = other.rrHandler; this.bid = other.bid; + if (other.isSetFrame()) { + this.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(other.frame); + } if (other.isSetRequest()) { this.request = new com.jetbrains.cef.remote.thrift_codegen.RObject(other.request); } @@ -44115,6 +45967,7 @@ public class ClientHandlers { this.rrHandler = 0; setBidIsSet(false); this.bid = 0; + this.frame = null; this.request = null; setAllowOsExecutionIsSet(false); this.allowOsExecution = false; @@ -44167,6 +46020,31 @@ public class ClientHandlers { } @org.apache.thrift.annotation.Nullable + public com.jetbrains.cef.remote.thrift_codegen.RObject getFrame() { + return this.frame; + } + + public ResourceRequestHandler_OnProtocolExecution_args setFrame(@org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame) { + this.frame = frame; + return this; + } + + public void unsetFrame() { + this.frame = null; + } + + /** Returns true if field frame is set (has been assigned a value) and false otherwise */ + public boolean isSetFrame() { + return this.frame != null; + } + + public void setFrameIsSet(boolean value) { + if (!value) { + this.frame = null; + } + } + + @org.apache.thrift.annotation.Nullable public com.jetbrains.cef.remote.thrift_codegen.RObject getRequest() { return this.request; } @@ -44233,6 +46111,14 @@ public class ClientHandlers { } break; + case FRAME: + if (value == null) { + unsetFrame(); + } else { + setFrame((com.jetbrains.cef.remote.thrift_codegen.RObject)value); + } + break; + case REQUEST: if (value == null) { unsetRequest(); @@ -44262,6 +46148,9 @@ public class ClientHandlers { case BID: return getBid(); + case FRAME: + return getFrame(); + case REQUEST: return getRequest(); @@ -44284,6 +46173,8 @@ public class ClientHandlers { return isSetRrHandler(); case BID: return isSetBid(); + case FRAME: + return isSetFrame(); case REQUEST: return isSetRequest(); case ALLOW_OS_EXECUTION: @@ -44323,6 +46214,15 @@ public class ClientHandlers { return false; } + boolean this_present_frame = true && this.isSetFrame(); + boolean that_present_frame = true && that.isSetFrame(); + if (this_present_frame || that_present_frame) { + if (!(this_present_frame && that_present_frame)) + return false; + if (!this.frame.equals(that.frame)) + return false; + } + boolean this_present_request = true && this.isSetRequest(); boolean that_present_request = true && that.isSetRequest(); if (this_present_request || that_present_request) { @@ -44352,6 +46252,10 @@ public class ClientHandlers { hashCode = hashCode * 8191 + bid; + hashCode = hashCode * 8191 + ((isSetFrame()) ? 131071 : 524287); + if (isSetFrame()) + hashCode = hashCode * 8191 + frame.hashCode(); + hashCode = hashCode * 8191 + ((isSetRequest()) ? 131071 : 524287); if (isSetRequest()) hashCode = hashCode * 8191 + request.hashCode(); @@ -44389,6 +46293,16 @@ public class ClientHandlers { return lastComparison; } } + lastComparison = java.lang.Boolean.compare(isSetFrame(), other.isSetFrame()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetFrame()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.frame, other.frame); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = java.lang.Boolean.compare(isSetRequest(), other.isSetRequest()); if (lastComparison != 0) { return lastComparison; @@ -44441,6 +46355,14 @@ public class ClientHandlers { sb.append(this.bid); first = false; if (!first) sb.append(", "); + sb.append("frame:"); + if (this.frame == null) { + sb.append("null"); + } else { + sb.append(this.frame); + } + first = false; + if (!first) sb.append(", "); sb.append("request:"); if (this.request == null) { sb.append("null"); @@ -44459,6 +46381,9 @@ public class ClientHandlers { public void validate() throws org.apache.thrift.TException { // check for required fields // check for sub-struct validity + if (frame != null) { + frame.validate(); + } if (request != null) { request.validate(); } @@ -44518,7 +46443,16 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // REQUEST + case 3: // FRAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 4: // REQUEST if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { struct.request = new com.jetbrains.cef.remote.thrift_codegen.RObject(); struct.request.read(iprot); @@ -44527,7 +46461,7 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // ALLOW_OS_EXECUTION + case 5: // ALLOW_OS_EXECUTION if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.allowOsExecution = iprot.readBool(); struct.setAllowOsExecutionIsSet(true); @@ -44557,6 +46491,11 @@ public class ClientHandlers { oprot.writeFieldBegin(BID_FIELD_DESC); oprot.writeI32(struct.bid); oprot.writeFieldEnd(); + if (struct.frame != null) { + oprot.writeFieldBegin(FRAME_FIELD_DESC); + struct.frame.write(oprot); + oprot.writeFieldEnd(); + } if (struct.request != null) { oprot.writeFieldBegin(REQUEST_FIELD_DESC); struct.request.write(oprot); @@ -44590,19 +46529,25 @@ public class ClientHandlers { if (struct.isSetBid()) { optionals.set(1); } - if (struct.isSetRequest()) { + if (struct.isSetFrame()) { optionals.set(2); } - if (struct.isSetAllowOsExecution()) { + if (struct.isSetRequest()) { optionals.set(3); } - oprot.writeBitSet(optionals, 4); + if (struct.isSetAllowOsExecution()) { + optionals.set(4); + } + oprot.writeBitSet(optionals, 5); if (struct.isSetRrHandler()) { oprot.writeI32(struct.rrHandler); } if (struct.isSetBid()) { oprot.writeI32(struct.bid); } + if (struct.isSetFrame()) { + struct.frame.write(oprot); + } if (struct.isSetRequest()) { struct.request.write(oprot); } @@ -44614,7 +46559,7 @@ public class ClientHandlers { @Override public void read(org.apache.thrift.protocol.TProtocol prot, ResourceRequestHandler_OnProtocolExecution_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(4); + java.util.BitSet incoming = iprot.readBitSet(5); if (incoming.get(0)) { struct.rrHandler = iprot.readI32(); struct.setRrHandlerIsSet(true); @@ -44624,11 +46569,16 @@ public class ClientHandlers { struct.setBidIsSet(true); } if (incoming.get(2)) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } + if (incoming.get(3)) { struct.request = new com.jetbrains.cef.remote.thrift_codegen.RObject(); struct.request.read(iprot); struct.setRequestIsSet(true); } - if (incoming.get(3)) { + if (incoming.get(4)) { struct.allowOsExecution = iprot.readBool(); struct.setAllowOsExecutionIsSet(true); } @@ -45021,16 +46971,18 @@ public class ClientHandlers { private static final org.apache.thrift.protocol.TField HANDLER_FIELD_DESC = new org.apache.thrift.protocol.TField("handler", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField BID_FIELD_DESC = new org.apache.thrift.protocol.TField("bid", org.apache.thrift.protocol.TType.I32, (short)2); - private static final org.apache.thrift.protocol.TField QUERY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("queryId", org.apache.thrift.protocol.TType.I64, (short)3); - private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRING, (short)4); - private static final org.apache.thrift.protocol.TField PERSISTENT_FIELD_DESC = new org.apache.thrift.protocol.TField("persistent", org.apache.thrift.protocol.TType.BOOL, (short)5); - private static final org.apache.thrift.protocol.TField QUERY_CALLBACK_FIELD_DESC = new org.apache.thrift.protocol.TField("queryCallback", org.apache.thrift.protocol.TType.STRUCT, (short)6); + private static final org.apache.thrift.protocol.TField FRAME_FIELD_DESC = new org.apache.thrift.protocol.TField("frame", org.apache.thrift.protocol.TType.STRUCT, (short)3); + private static final org.apache.thrift.protocol.TField QUERY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("queryId", org.apache.thrift.protocol.TType.I64, (short)4); + private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRING, (short)5); + private static final org.apache.thrift.protocol.TField PERSISTENT_FIELD_DESC = new org.apache.thrift.protocol.TField("persistent", org.apache.thrift.protocol.TType.BOOL, (short)6); + private static final org.apache.thrift.protocol.TField QUERY_CALLBACK_FIELD_DESC = new org.apache.thrift.protocol.TField("queryCallback", org.apache.thrift.protocol.TType.STRUCT, (short)7); private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new MessageRouterHandler_onQuery_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new MessageRouterHandler_onQuery_argsTupleSchemeFactory(); public @org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject handler; // required public int bid; // required + public @org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame; // required public long queryId; // required public @org.apache.thrift.annotation.Nullable java.lang.String request; // required public boolean persistent; // required @@ -45040,10 +46992,11 @@ public class ClientHandlers { public enum _Fields implements org.apache.thrift.TFieldIdEnum { HANDLER((short)1, "handler"), BID((short)2, "bid"), - QUERY_ID((short)3, "queryId"), - REQUEST((short)4, "request"), - PERSISTENT((short)5, "persistent"), - QUERY_CALLBACK((short)6, "queryCallback"); + FRAME((short)3, "frame"), + QUERY_ID((short)4, "queryId"), + REQUEST((short)5, "request"), + PERSISTENT((short)6, "persistent"), + QUERY_CALLBACK((short)7, "queryCallback"); private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>(); @@ -45063,13 +47016,15 @@ public class ClientHandlers { return HANDLER; case 2: // BID return BID; - case 3: // QUERY_ID + case 3: // FRAME + return FRAME; + case 4: // QUERY_ID return QUERY_ID; - case 4: // REQUEST + case 5: // REQUEST return REQUEST; - case 5: // PERSISTENT + case 6: // PERSISTENT return PERSISTENT; - case 6: // QUERY_CALLBACK + case 7: // QUERY_CALLBACK return QUERY_CALLBACK; default: return null; @@ -45125,6 +47080,8 @@ public class ClientHandlers { new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.jetbrains.cef.remote.thrift_codegen.RObject.class))); tmpMap.put(_Fields.BID, new org.apache.thrift.meta_data.FieldMetaData("bid", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.FRAME, new org.apache.thrift.meta_data.FieldMetaData("frame", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.jetbrains.cef.remote.thrift_codegen.RObject.class))); tmpMap.put(_Fields.QUERY_ID, new org.apache.thrift.meta_data.FieldMetaData("queryId", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); tmpMap.put(_Fields.REQUEST, new org.apache.thrift.meta_data.FieldMetaData("request", org.apache.thrift.TFieldRequirementType.DEFAULT, @@ -45143,6 +47100,7 @@ public class ClientHandlers { public MessageRouterHandler_onQuery_args( com.jetbrains.cef.remote.thrift_codegen.RObject handler, int bid, + com.jetbrains.cef.remote.thrift_codegen.RObject frame, long queryId, java.lang.String request, boolean persistent, @@ -45152,6 +47110,7 @@ public class ClientHandlers { this.handler = handler; this.bid = bid; setBidIsSet(true); + this.frame = frame; this.queryId = queryId; setQueryIdIsSet(true); this.request = request; @@ -45169,6 +47128,9 @@ public class ClientHandlers { this.handler = new com.jetbrains.cef.remote.thrift_codegen.RObject(other.handler); } this.bid = other.bid; + if (other.isSetFrame()) { + this.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(other.frame); + } this.queryId = other.queryId; if (other.isSetRequest()) { this.request = other.request; @@ -45189,6 +47151,7 @@ public class ClientHandlers { this.handler = null; setBidIsSet(false); this.bid = 0; + this.frame = null; setQueryIdIsSet(false); this.queryId = 0; this.request = null; @@ -45245,6 +47208,31 @@ public class ClientHandlers { __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __BID_ISSET_ID, value); } + @org.apache.thrift.annotation.Nullable + public com.jetbrains.cef.remote.thrift_codegen.RObject getFrame() { + return this.frame; + } + + public MessageRouterHandler_onQuery_args setFrame(@org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame) { + this.frame = frame; + return this; + } + + public void unsetFrame() { + this.frame = null; + } + + /** Returns true if field frame is set (has been assigned a value) and false otherwise */ + public boolean isSetFrame() { + return this.frame != null; + } + + public void setFrameIsSet(boolean value) { + if (!value) { + this.frame = null; + } + } + public long getQueryId() { return this.queryId; } @@ -45360,6 +47348,14 @@ public class ClientHandlers { } break; + case FRAME: + if (value == null) { + unsetFrame(); + } else { + setFrame((com.jetbrains.cef.remote.thrift_codegen.RObject)value); + } + break; + case QUERY_ID: if (value == null) { unsetQueryId(); @@ -45405,6 +47401,9 @@ public class ClientHandlers { case BID: return getBid(); + case FRAME: + return getFrame(); + case QUERY_ID: return getQueryId(); @@ -45433,6 +47432,8 @@ public class ClientHandlers { return isSetHandler(); case BID: return isSetBid(); + case FRAME: + return isSetFrame(); case QUERY_ID: return isSetQueryId(); case REQUEST: @@ -45476,6 +47477,15 @@ public class ClientHandlers { return false; } + boolean this_present_frame = true && this.isSetFrame(); + boolean that_present_frame = true && that.isSetFrame(); + if (this_present_frame || that_present_frame) { + if (!(this_present_frame && that_present_frame)) + return false; + if (!this.frame.equals(that.frame)) + return false; + } + boolean this_present_queryId = true; boolean that_present_queryId = true; if (this_present_queryId || that_present_queryId) { @@ -45525,6 +47535,10 @@ public class ClientHandlers { hashCode = hashCode * 8191 + bid; + hashCode = hashCode * 8191 + ((isSetFrame()) ? 131071 : 524287); + if (isSetFrame()) + hashCode = hashCode * 8191 + frame.hashCode(); + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(queryId); hashCode = hashCode * 8191 + ((isSetRequest()) ? 131071 : 524287); @@ -45568,6 +47582,16 @@ public class ClientHandlers { return lastComparison; } } + lastComparison = java.lang.Boolean.compare(isSetFrame(), other.isSetFrame()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetFrame()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.frame, other.frame); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = java.lang.Boolean.compare(isSetQueryId(), other.isSetQueryId()); if (lastComparison != 0) { return lastComparison; @@ -45644,6 +47668,14 @@ public class ClientHandlers { sb.append(this.bid); first = false; if (!first) sb.append(", "); + sb.append("frame:"); + if (this.frame == null) { + sb.append("null"); + } else { + sb.append(this.frame); + } + first = false; + if (!first) sb.append(", "); sb.append("queryId:"); sb.append(this.queryId); first = false; @@ -45677,6 +47709,9 @@ public class ClientHandlers { if (handler != null) { handler.validate(); } + if (frame != null) { + frame.validate(); + } if (queryCallback != null) { queryCallback.validate(); } @@ -45737,7 +47772,16 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // QUERY_ID + case 3: // FRAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 4: // QUERY_ID if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.queryId = iprot.readI64(); struct.setQueryIdIsSet(true); @@ -45745,7 +47789,7 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // REQUEST + case 5: // REQUEST if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.request = iprot.readString(); struct.setRequestIsSet(true); @@ -45753,7 +47797,7 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 5: // PERSISTENT + case 6: // PERSISTENT if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.persistent = iprot.readBool(); struct.setPersistentIsSet(true); @@ -45761,7 +47805,7 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 6: // QUERY_CALLBACK + case 7: // QUERY_CALLBACK if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { struct.queryCallback = new com.jetbrains.cef.remote.thrift_codegen.RObject(); struct.queryCallback.read(iprot); @@ -45794,6 +47838,11 @@ public class ClientHandlers { oprot.writeFieldBegin(BID_FIELD_DESC); oprot.writeI32(struct.bid); oprot.writeFieldEnd(); + if (struct.frame != null) { + oprot.writeFieldBegin(FRAME_FIELD_DESC); + struct.frame.write(oprot); + oprot.writeFieldEnd(); + } oprot.writeFieldBegin(QUERY_ID_FIELD_DESC); oprot.writeI64(struct.queryId); oprot.writeFieldEnd(); @@ -45835,25 +47884,31 @@ public class ClientHandlers { if (struct.isSetBid()) { optionals.set(1); } - if (struct.isSetQueryId()) { + if (struct.isSetFrame()) { optionals.set(2); } - if (struct.isSetRequest()) { + if (struct.isSetQueryId()) { optionals.set(3); } - if (struct.isSetPersistent()) { + if (struct.isSetRequest()) { optionals.set(4); } - if (struct.isSetQueryCallback()) { + if (struct.isSetPersistent()) { optionals.set(5); } - oprot.writeBitSet(optionals, 6); + if (struct.isSetQueryCallback()) { + optionals.set(6); + } + oprot.writeBitSet(optionals, 7); if (struct.isSetHandler()) { struct.handler.write(oprot); } if (struct.isSetBid()) { oprot.writeI32(struct.bid); } + if (struct.isSetFrame()) { + struct.frame.write(oprot); + } if (struct.isSetQueryId()) { oprot.writeI64(struct.queryId); } @@ -45871,7 +47926,7 @@ public class ClientHandlers { @Override public void read(org.apache.thrift.protocol.TProtocol prot, MessageRouterHandler_onQuery_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(6); + java.util.BitSet incoming = iprot.readBitSet(7); if (incoming.get(0)) { struct.handler = new com.jetbrains.cef.remote.thrift_codegen.RObject(); struct.handler.read(iprot); @@ -45882,18 +47937,23 @@ public class ClientHandlers { struct.setBidIsSet(true); } if (incoming.get(2)) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } + if (incoming.get(3)) { struct.queryId = iprot.readI64(); struct.setQueryIdIsSet(true); } - if (incoming.get(3)) { + if (incoming.get(4)) { struct.request = iprot.readString(); struct.setRequestIsSet(true); } - if (incoming.get(4)) { + if (incoming.get(5)) { struct.persistent = iprot.readBool(); struct.setPersistentIsSet(true); } - if (incoming.get(5)) { + if (incoming.get(6)) { struct.queryCallback = new com.jetbrains.cef.remote.thrift_codegen.RObject(); struct.queryCallback.read(iprot); struct.setQueryCallbackIsSet(true); @@ -46287,20 +48347,23 @@ public class ClientHandlers { private static final org.apache.thrift.protocol.TField HANDLER_FIELD_DESC = new org.apache.thrift.protocol.TField("handler", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField BID_FIELD_DESC = new org.apache.thrift.protocol.TField("bid", org.apache.thrift.protocol.TType.I32, (short)2); - private static final org.apache.thrift.protocol.TField QUERY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("queryId", org.apache.thrift.protocol.TType.I64, (short)3); + private static final org.apache.thrift.protocol.TField FRAME_FIELD_DESC = new org.apache.thrift.protocol.TField("frame", org.apache.thrift.protocol.TType.STRUCT, (short)3); + private static final org.apache.thrift.protocol.TField QUERY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("queryId", org.apache.thrift.protocol.TType.I64, (short)4); private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new MessageRouterHandler_onQueryCanceled_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new MessageRouterHandler_onQueryCanceled_argsTupleSchemeFactory(); public @org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject handler; // required public int bid; // required + public @org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame; // required public long queryId; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { HANDLER((short)1, "handler"), BID((short)2, "bid"), - QUERY_ID((short)3, "queryId"); + FRAME((short)3, "frame"), + QUERY_ID((short)4, "queryId"); private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>(); @@ -46320,7 +48383,9 @@ public class ClientHandlers { return HANDLER; case 2: // BID return BID; - case 3: // QUERY_ID + case 3: // FRAME + return FRAME; + case 4: // QUERY_ID return QUERY_ID; default: return null; @@ -46375,6 +48440,8 @@ public class ClientHandlers { new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.jetbrains.cef.remote.thrift_codegen.RObject.class))); tmpMap.put(_Fields.BID, new org.apache.thrift.meta_data.FieldMetaData("bid", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.FRAME, new org.apache.thrift.meta_data.FieldMetaData("frame", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.jetbrains.cef.remote.thrift_codegen.RObject.class))); tmpMap.put(_Fields.QUERY_ID, new org.apache.thrift.meta_data.FieldMetaData("queryId", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); @@ -46387,12 +48454,14 @@ public class ClientHandlers { public MessageRouterHandler_onQueryCanceled_args( com.jetbrains.cef.remote.thrift_codegen.RObject handler, int bid, + com.jetbrains.cef.remote.thrift_codegen.RObject frame, long queryId) { this(); this.handler = handler; this.bid = bid; setBidIsSet(true); + this.frame = frame; this.queryId = queryId; setQueryIdIsSet(true); } @@ -46406,6 +48475,9 @@ public class ClientHandlers { this.handler = new com.jetbrains.cef.remote.thrift_codegen.RObject(other.handler); } this.bid = other.bid; + if (other.isSetFrame()) { + this.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(other.frame); + } this.queryId = other.queryId; } @@ -46419,6 +48491,7 @@ public class ClientHandlers { this.handler = null; setBidIsSet(false); this.bid = 0; + this.frame = null; setQueryIdIsSet(false); this.queryId = 0; } @@ -46471,6 +48544,31 @@ public class ClientHandlers { __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __BID_ISSET_ID, value); } + @org.apache.thrift.annotation.Nullable + public com.jetbrains.cef.remote.thrift_codegen.RObject getFrame() { + return this.frame; + } + + public MessageRouterHandler_onQueryCanceled_args setFrame(@org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame) { + this.frame = frame; + return this; + } + + public void unsetFrame() { + this.frame = null; + } + + /** Returns true if field frame is set (has been assigned a value) and false otherwise */ + public boolean isSetFrame() { + return this.frame != null; + } + + public void setFrameIsSet(boolean value) { + if (!value) { + this.frame = null; + } + } + public long getQueryId() { return this.queryId; } @@ -46513,6 +48611,14 @@ public class ClientHandlers { } break; + case FRAME: + if (value == null) { + unsetFrame(); + } else { + setFrame((com.jetbrains.cef.remote.thrift_codegen.RObject)value); + } + break; + case QUERY_ID: if (value == null) { unsetQueryId(); @@ -46534,6 +48640,9 @@ public class ClientHandlers { case BID: return getBid(); + case FRAME: + return getFrame(); + case QUERY_ID: return getQueryId(); @@ -46553,6 +48662,8 @@ public class ClientHandlers { return isSetHandler(); case BID: return isSetBid(); + case FRAME: + return isSetFrame(); case QUERY_ID: return isSetQueryId(); } @@ -46590,6 +48701,15 @@ public class ClientHandlers { return false; } + boolean this_present_frame = true && this.isSetFrame(); + boolean that_present_frame = true && that.isSetFrame(); + if (this_present_frame || that_present_frame) { + if (!(this_present_frame && that_present_frame)) + return false; + if (!this.frame.equals(that.frame)) + return false; + } + boolean this_present_queryId = true; boolean that_present_queryId = true; if (this_present_queryId || that_present_queryId) { @@ -46612,6 +48732,10 @@ public class ClientHandlers { hashCode = hashCode * 8191 + bid; + hashCode = hashCode * 8191 + ((isSetFrame()) ? 131071 : 524287); + if (isSetFrame()) + hashCode = hashCode * 8191 + frame.hashCode(); + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(queryId); return hashCode; @@ -46645,6 +48769,16 @@ public class ClientHandlers { return lastComparison; } } + lastComparison = java.lang.Boolean.compare(isSetFrame(), other.isSetFrame()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetFrame()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.frame, other.frame); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = java.lang.Boolean.compare(isSetQueryId(), other.isSetQueryId()); if (lastComparison != 0) { return lastComparison; @@ -46691,6 +48825,14 @@ public class ClientHandlers { sb.append(this.bid); first = false; if (!first) sb.append(", "); + sb.append("frame:"); + if (this.frame == null) { + sb.append("null"); + } else { + sb.append(this.frame); + } + first = false; + if (!first) sb.append(", "); sb.append("queryId:"); sb.append(this.queryId); first = false; @@ -46704,6 +48846,9 @@ public class ClientHandlers { if (handler != null) { handler.validate(); } + if (frame != null) { + frame.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -46761,7 +48906,16 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // QUERY_ID + case 3: // FRAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 4: // QUERY_ID if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.queryId = iprot.readI64(); struct.setQueryIdIsSet(true); @@ -46793,6 +48947,11 @@ public class ClientHandlers { oprot.writeFieldBegin(BID_FIELD_DESC); oprot.writeI32(struct.bid); oprot.writeFieldEnd(); + if (struct.frame != null) { + oprot.writeFieldBegin(FRAME_FIELD_DESC); + struct.frame.write(oprot); + oprot.writeFieldEnd(); + } oprot.writeFieldBegin(QUERY_ID_FIELD_DESC); oprot.writeI64(struct.queryId); oprot.writeFieldEnd(); @@ -46821,16 +48980,22 @@ public class ClientHandlers { if (struct.isSetBid()) { optionals.set(1); } - if (struct.isSetQueryId()) { + if (struct.isSetFrame()) { optionals.set(2); } - oprot.writeBitSet(optionals, 3); + if (struct.isSetQueryId()) { + optionals.set(3); + } + oprot.writeBitSet(optionals, 4); if (struct.isSetHandler()) { struct.handler.write(oprot); } if (struct.isSetBid()) { oprot.writeI32(struct.bid); } + if (struct.isSetFrame()) { + struct.frame.write(oprot); + } if (struct.isSetQueryId()) { oprot.writeI64(struct.queryId); } @@ -46839,7 +49004,7 @@ public class ClientHandlers { @Override public void read(org.apache.thrift.protocol.TProtocol prot, MessageRouterHandler_onQueryCanceled_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(3); + java.util.BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { struct.handler = new com.jetbrains.cef.remote.thrift_codegen.RObject(); struct.handler.read(iprot); @@ -46850,6 +49015,11 @@ public class ClientHandlers { struct.setBidIsSet(true); } if (incoming.get(2)) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } + if (incoming.get(3)) { struct.queryId = iprot.readI64(); struct.setQueryIdIsSet(true); } @@ -47241,14 +49411,16 @@ public class ClientHandlers { private static final org.apache.thrift.protocol.TField SCHEME_HANDLER_FACTORY_FIELD_DESC = new org.apache.thrift.protocol.TField("schemeHandlerFactory", org.apache.thrift.protocol.TType.I32, (short)1); private static final org.apache.thrift.protocol.TField BID_FIELD_DESC = new org.apache.thrift.protocol.TField("bid", org.apache.thrift.protocol.TType.I32, (short)2); - private static final org.apache.thrift.protocol.TField SCHEME_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("scheme_name", org.apache.thrift.protocol.TType.STRING, (short)3); - private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)4); + private static final org.apache.thrift.protocol.TField FRAME_FIELD_DESC = new org.apache.thrift.protocol.TField("frame", org.apache.thrift.protocol.TType.STRUCT, (short)3); + private static final org.apache.thrift.protocol.TField SCHEME_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("scheme_name", org.apache.thrift.protocol.TType.STRING, (short)4); + private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)5); private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SchemeHandlerFactory_CreateHandler_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SchemeHandlerFactory_CreateHandler_argsTupleSchemeFactory(); public int schemeHandlerFactory; // required public int bid; // required + public @org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame; // required public @org.apache.thrift.annotation.Nullable java.lang.String scheme_name; // required public @org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject request; // required @@ -47256,8 +49428,9 @@ public class ClientHandlers { public enum _Fields implements org.apache.thrift.TFieldIdEnum { SCHEME_HANDLER_FACTORY((short)1, "schemeHandlerFactory"), BID((short)2, "bid"), - SCHEME_NAME((short)3, "scheme_name"), - REQUEST((short)4, "request"); + FRAME((short)3, "frame"), + SCHEME_NAME((short)4, "scheme_name"), + REQUEST((short)5, "request"); private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>(); @@ -47277,9 +49450,11 @@ public class ClientHandlers { return SCHEME_HANDLER_FACTORY; case 2: // BID return BID; - case 3: // SCHEME_NAME + case 3: // FRAME + return FRAME; + case 4: // SCHEME_NAME return SCHEME_NAME; - case 4: // REQUEST + case 5: // REQUEST return REQUEST; default: return null; @@ -47334,6 +49509,8 @@ public class ClientHandlers { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); tmpMap.put(_Fields.BID, new org.apache.thrift.meta_data.FieldMetaData("bid", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.FRAME, new org.apache.thrift.meta_data.FieldMetaData("frame", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.jetbrains.cef.remote.thrift_codegen.RObject.class))); tmpMap.put(_Fields.SCHEME_NAME, new org.apache.thrift.meta_data.FieldMetaData("scheme_name", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.REQUEST, new org.apache.thrift.meta_data.FieldMetaData("request", org.apache.thrift.TFieldRequirementType.DEFAULT, @@ -47348,6 +49525,7 @@ public class ClientHandlers { public SchemeHandlerFactory_CreateHandler_args( int schemeHandlerFactory, int bid, + com.jetbrains.cef.remote.thrift_codegen.RObject frame, java.lang.String scheme_name, com.jetbrains.cef.remote.thrift_codegen.RObject request) { @@ -47356,6 +49534,7 @@ public class ClientHandlers { setSchemeHandlerFactoryIsSet(true); this.bid = bid; setBidIsSet(true); + this.frame = frame; this.scheme_name = scheme_name; this.request = request; } @@ -47367,6 +49546,9 @@ public class ClientHandlers { __isset_bitfield = other.__isset_bitfield; this.schemeHandlerFactory = other.schemeHandlerFactory; this.bid = other.bid; + if (other.isSetFrame()) { + this.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(other.frame); + } if (other.isSetScheme_name()) { this.scheme_name = other.scheme_name; } @@ -47386,6 +49568,7 @@ public class ClientHandlers { this.schemeHandlerFactory = 0; setBidIsSet(false); this.bid = 0; + this.frame = null; this.scheme_name = null; this.request = null; } @@ -47437,6 +49620,31 @@ public class ClientHandlers { } @org.apache.thrift.annotation.Nullable + public com.jetbrains.cef.remote.thrift_codegen.RObject getFrame() { + return this.frame; + } + + public SchemeHandlerFactory_CreateHandler_args setFrame(@org.apache.thrift.annotation.Nullable com.jetbrains.cef.remote.thrift_codegen.RObject frame) { + this.frame = frame; + return this; + } + + public void unsetFrame() { + this.frame = null; + } + + /** Returns true if field frame is set (has been assigned a value) and false otherwise */ + public boolean isSetFrame() { + return this.frame != null; + } + + public void setFrameIsSet(boolean value) { + if (!value) { + this.frame = null; + } + } + + @org.apache.thrift.annotation.Nullable public java.lang.String getScheme_name() { return this.scheme_name; } @@ -47505,6 +49713,14 @@ public class ClientHandlers { } break; + case FRAME: + if (value == null) { + unsetFrame(); + } else { + setFrame((com.jetbrains.cef.remote.thrift_codegen.RObject)value); + } + break; + case SCHEME_NAME: if (value == null) { unsetScheme_name(); @@ -47534,6 +49750,9 @@ public class ClientHandlers { case BID: return getBid(); + case FRAME: + return getFrame(); + case SCHEME_NAME: return getScheme_name(); @@ -47556,6 +49775,8 @@ public class ClientHandlers { return isSetSchemeHandlerFactory(); case BID: return isSetBid(); + case FRAME: + return isSetFrame(); case SCHEME_NAME: return isSetScheme_name(); case REQUEST: @@ -47595,6 +49816,15 @@ public class ClientHandlers { return false; } + boolean this_present_frame = true && this.isSetFrame(); + boolean that_present_frame = true && that.isSetFrame(); + if (this_present_frame || that_present_frame) { + if (!(this_present_frame && that_present_frame)) + return false; + if (!this.frame.equals(that.frame)) + return false; + } + boolean this_present_scheme_name = true && this.isSetScheme_name(); boolean that_present_scheme_name = true && that.isSetScheme_name(); if (this_present_scheme_name || that_present_scheme_name) { @@ -47624,6 +49854,10 @@ public class ClientHandlers { hashCode = hashCode * 8191 + bid; + hashCode = hashCode * 8191 + ((isSetFrame()) ? 131071 : 524287); + if (isSetFrame()) + hashCode = hashCode * 8191 + frame.hashCode(); + hashCode = hashCode * 8191 + ((isSetScheme_name()) ? 131071 : 524287); if (isSetScheme_name()) hashCode = hashCode * 8191 + scheme_name.hashCode(); @@ -47663,6 +49897,16 @@ public class ClientHandlers { return lastComparison; } } + lastComparison = java.lang.Boolean.compare(isSetFrame(), other.isSetFrame()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetFrame()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.frame, other.frame); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = java.lang.Boolean.compare(isSetScheme_name(), other.isSetScheme_name()); if (lastComparison != 0) { return lastComparison; @@ -47715,6 +49959,14 @@ public class ClientHandlers { sb.append(this.bid); first = false; if (!first) sb.append(", "); + sb.append("frame:"); + if (this.frame == null) { + sb.append("null"); + } else { + sb.append(this.frame); + } + first = false; + if (!first) sb.append(", "); sb.append("scheme_name:"); if (this.scheme_name == null) { sb.append("null"); @@ -47737,6 +49989,9 @@ public class ClientHandlers { public void validate() throws org.apache.thrift.TException { // check for required fields // check for sub-struct validity + if (frame != null) { + frame.validate(); + } if (request != null) { request.validate(); } @@ -47796,7 +50051,16 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // SCHEME_NAME + case 3: // FRAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 4: // SCHEME_NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.scheme_name = iprot.readString(); struct.setScheme_nameIsSet(true); @@ -47804,7 +50068,7 @@ public class ClientHandlers { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // REQUEST + case 5: // REQUEST if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { struct.request = new com.jetbrains.cef.remote.thrift_codegen.RObject(); struct.request.read(iprot); @@ -47835,6 +50099,11 @@ public class ClientHandlers { oprot.writeFieldBegin(BID_FIELD_DESC); oprot.writeI32(struct.bid); oprot.writeFieldEnd(); + if (struct.frame != null) { + oprot.writeFieldBegin(FRAME_FIELD_DESC); + struct.frame.write(oprot); + oprot.writeFieldEnd(); + } if (struct.scheme_name != null) { oprot.writeFieldBegin(SCHEME_NAME_FIELD_DESC); oprot.writeString(struct.scheme_name); @@ -47870,19 +50139,25 @@ public class ClientHandlers { if (struct.isSetBid()) { optionals.set(1); } - if (struct.isSetScheme_name()) { + if (struct.isSetFrame()) { optionals.set(2); } - if (struct.isSetRequest()) { + if (struct.isSetScheme_name()) { optionals.set(3); } - oprot.writeBitSet(optionals, 4); + if (struct.isSetRequest()) { + optionals.set(4); + } + oprot.writeBitSet(optionals, 5); if (struct.isSetSchemeHandlerFactory()) { oprot.writeI32(struct.schemeHandlerFactory); } if (struct.isSetBid()) { oprot.writeI32(struct.bid); } + if (struct.isSetFrame()) { + struct.frame.write(oprot); + } if (struct.isSetScheme_name()) { oprot.writeString(struct.scheme_name); } @@ -47894,7 +50169,7 @@ public class ClientHandlers { @Override public void read(org.apache.thrift.protocol.TProtocol prot, SchemeHandlerFactory_CreateHandler_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(4); + java.util.BitSet incoming = iprot.readBitSet(5); if (incoming.get(0)) { struct.schemeHandlerFactory = iprot.readI32(); struct.setSchemeHandlerFactoryIsSet(true); @@ -47904,10 +50179,15 @@ public class ClientHandlers { struct.setBidIsSet(true); } if (incoming.get(2)) { + struct.frame = new com.jetbrains.cef.remote.thrift_codegen.RObject(); + struct.frame.read(iprot); + struct.setFrameIsSet(true); + } + if (incoming.get(3)) { struct.scheme_name = iprot.readString(); struct.setScheme_nameIsSet(true); } - if (incoming.get(3)) { + if (incoming.get(4)) { struct.request = new com.jetbrains.cef.remote.thrift_codegen.RObject(); struct.request.read(iprot); struct.setRequestIsSet(true); diff --git a/java/com/jetbrains/cef/remote/thrift_codegen/Server.java b/java/com/jetbrains/cef/remote/thrift_codegen/Server.java index 0731ac2..9cc7ed8 100644 --- a/java/com/jetbrains/cef/remote/thrift_codegen/Server.java +++ b/java/com/jetbrains/cef/remote/thrift_codegen/Server.java @@ -91,6 +91,8 @@ public class Server { public void Browser_SetFrameRate(int bid, int val) throws org.apache.thrift.TException; + public void Frame_ExecuteJavaScript(int frameId, java.lang.String code, java.lang.String url, int line) throws org.apache.thrift.TException; + public void Request_Update(com.jetbrains.cef.remote.thrift_codegen.RObject request) throws org.apache.thrift.TException; public com.jetbrains.cef.remote.thrift_codegen.PostData Request_GetPostData(com.jetbrains.cef.remote.thrift_codegen.RObject request) throws org.apache.thrift.TException; @@ -237,6 +239,8 @@ public class Server { public void Browser_SetFrameRate(int bid, int val, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException; + public void Frame_ExecuteJavaScript(int frameId, java.lang.String code, java.lang.String url, int line, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException; + public void Request_Update(com.jetbrains.cef.remote.thrift_codegen.RObject request, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException; public void Request_GetPostData(com.jetbrains.cef.remote.thrift_codegen.RObject request, org.apache.thrift.async.AsyncMethodCallback<com.jetbrains.cef.remote.thrift_codegen.PostData> resultHandler) throws org.apache.thrift.TException; @@ -1032,6 +1036,22 @@ public class Server { } @Override + public void Frame_ExecuteJavaScript(int frameId, java.lang.String code, java.lang.String url, int line) throws org.apache.thrift.TException + { + send_Frame_ExecuteJavaScript(frameId, code, url, line); + } + + public void send_Frame_ExecuteJavaScript(int frameId, java.lang.String code, java.lang.String url, int line) throws org.apache.thrift.TException + { + Frame_ExecuteJavaScript_args args = new Frame_ExecuteJavaScript_args(); + args.setFrameId(frameId); + args.setCode(code); + args.setUrl(url); + args.setLine(line); + sendBaseOneway("Frame_ExecuteJavaScript", args); + } + + @Override public void Request_Update(com.jetbrains.cef.remote.thrift_codegen.RObject request) throws org.apache.thrift.TException { send_Request_Update(request); @@ -3155,6 +3175,50 @@ public class Server { } @Override + public void Frame_ExecuteJavaScript(int frameId, java.lang.String code, java.lang.String url, int line, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException { + checkReady(); + Frame_ExecuteJavaScript_call method_call = new Frame_ExecuteJavaScript_call(frameId, code, url, line, resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); + } + + public static class Frame_ExecuteJavaScript_call extends org.apache.thrift.async.TAsyncMethodCall<Void> { + private int frameId; + private java.lang.String code; + private java.lang.String url; + private int line; + public Frame_ExecuteJavaScript_call(int frameId, java.lang.String code, java.lang.String url, int line, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + super(client, protocolFactory, transport, resultHandler, true); + this.frameId = frameId; + this.code = code; + this.url = url; + this.line = line; + } + + @Override + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("Frame_ExecuteJavaScript", org.apache.thrift.protocol.TMessageType.ONEWAY, 0)); + Frame_ExecuteJavaScript_args args = new Frame_ExecuteJavaScript_args(); + args.setFrameId(frameId); + args.setCode(code); + args.setUrl(url); + args.setLine(line); + args.write(prot); + prot.writeMessageEnd(); + } + + @Override + public Void getResult() throws org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + throw new java.lang.IllegalStateException("Method call not finished!"); + } + org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + return null; + } + } + + @Override public void Request_Update(com.jetbrains.cef.remote.thrift_codegen.RObject request, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException { checkReady(); Request_Update_call method_call = new Request_Update_call(request, resultHandler, this, ___protocolFactory, ___transport); @@ -4392,6 +4456,7 @@ public class Server { processMap.put("Browser_StopFinding", new Browser_StopFinding()); processMap.put("Browser_ReplaceMisspelling", new Browser_ReplaceMisspelling()); processMap.put("Browser_SetFrameRate", new Browser_SetFrameRate()); + processMap.put("Frame_ExecuteJavaScript", new Frame_ExecuteJavaScript()); processMap.put("Request_Update", new Request_Update()); processMap.put("Request_GetPostData", new Request_GetPostData()); processMap.put("Request_SetPostData", new Request_SetPostData()); @@ -5530,6 +5595,33 @@ public class Server { } } + public static class Frame_ExecuteJavaScript<I extends Iface> extends org.apache.thrift.ProcessFunction<I, Frame_ExecuteJavaScript_args> { + public Frame_ExecuteJavaScript() { + super("Frame_ExecuteJavaScript"); + } + + @Override + public Frame_ExecuteJavaScript_args getEmptyArgsInstance() { + return new Frame_ExecuteJavaScript_args(); + } + + @Override + protected boolean isOneway() { + return true; + } + + @Override + protected boolean rethrowUnhandledExceptions() { + return false; + } + + @Override + public org.apache.thrift.TBase getResult(I iface, Frame_ExecuteJavaScript_args args) throws org.apache.thrift.TException { + iface.Frame_ExecuteJavaScript(args.frameId, args.code, args.url, args.line); + return null; + } + } + public static class Request_Update<I extends Iface> extends org.apache.thrift.ProcessFunction<I, Request_Update_args> { public Request_Update() { super("Request_Update"); @@ -6439,6 +6531,7 @@ public class Server { processMap.put("Browser_StopFinding", new Browser_StopFinding()); processMap.put("Browser_ReplaceMisspelling", new Browser_ReplaceMisspelling()); processMap.put("Browser_SetFrameRate", new Browser_SetFrameRate()); + processMap.put("Frame_ExecuteJavaScript", new Frame_ExecuteJavaScript()); processMap.put("Request_Update", new Request_Update()); processMap.put("Request_GetPostData", new Request_GetPostData()); processMap.put("Request_SetPostData", new Request_SetPostData()); @@ -8461,6 +8554,46 @@ public class Server { } } + public static class Frame_ExecuteJavaScript<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, Frame_ExecuteJavaScript_args, Void> { + public Frame_ExecuteJavaScript() { + super("Frame_ExecuteJavaScript"); + } + + @Override + public Frame_ExecuteJavaScript_args getEmptyArgsInstance() { + return new Frame_ExecuteJavaScript_args(); + } + + @Override + public org.apache.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { + final org.apache.thrift.AsyncProcessFunction fcall = this; + return new org.apache.thrift.async.AsyncMethodCallback<Void>() { + @Override + public void onComplete(Void o) { + } + @Override + public void onError(java.lang.Exception e) { + if (e instanceof org.apache.thrift.transport.TTransportException) { + _LOGGER.error("TTransportException inside handler", e); + fb.close(); + } else { + _LOGGER.error("Exception inside oneway handler", e); + } + } + }; + } + + @Override + protected boolean isOneway() { + return true; + } + + @Override + public void start(I iface, Frame_ExecuteJavaScript_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException { + iface.Frame_ExecuteJavaScript(args.frameId, args.code, args.url, args.line,resultHandler); + } + } + public static class Request_Update<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, Request_Update_args, Void> { public Request_Update() { super("Request_Update"); @@ -33764,6 +33897,686 @@ public class Server { } @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) + public static class Frame_ExecuteJavaScript_args implements org.apache.thrift.TBase<Frame_ExecuteJavaScript_args, Frame_ExecuteJavaScript_args._Fields>, java.io.Serializable, Cloneable, Comparable<Frame_ExecuteJavaScript_args> { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Frame_ExecuteJavaScript_args"); + + private static final org.apache.thrift.protocol.TField FRAME_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("frameId", org.apache.thrift.protocol.TType.I32, (short)1); + private static final org.apache.thrift.protocol.TField CODE_FIELD_DESC = new org.apache.thrift.protocol.TField("code", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField URL_FIELD_DESC = new org.apache.thrift.protocol.TField("url", org.apache.thrift.protocol.TType.STRING, (short)3); + private static final org.apache.thrift.protocol.TField LINE_FIELD_DESC = new org.apache.thrift.protocol.TField("line", org.apache.thrift.protocol.TType.I32, (short)4); + + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new Frame_ExecuteJavaScript_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new Frame_ExecuteJavaScript_argsTupleSchemeFactory(); + + public int frameId; // required + public @org.apache.thrift.annotation.Nullable java.lang.String code; // required + public @org.apache.thrift.annotation.Nullable java.lang.String url; // required + public int line; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { + FRAME_ID((short)1, "frameId"), + CODE((short)2, "code"), + URL((short)3, "url"), + LINE((short)4, "line"); + + private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>(); + + static { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + @org.apache.thrift.annotation.Nullable + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { + case 1: // FRAME_ID + return FRAME_ID; + case 2: // CODE + return CODE; + case 3: // URL + return URL; + case 4: // LINE + return LINE; + default: + return null; + } + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { + return byName.get(name); + } + + private final short _thriftId; + private final java.lang.String _fieldName; + + _Fields(short thriftId, java.lang.String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + @Override + public short getThriftFieldId() { + return _thriftId; + } + + @Override + public java.lang.String getFieldName() { + return _fieldName; + } + } + + // isset id assignments + private static final int __FRAMEID_ISSET_ID = 0; + private static final int __LINE_ISSET_ID = 1; + private byte __isset_bitfield = 0; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.FRAME_ID, new org.apache.thrift.meta_data.FieldMetaData("frameId", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.CODE, new org.apache.thrift.meta_data.FieldMetaData("code", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.URL, new org.apache.thrift.meta_data.FieldMetaData("url", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.LINE, new org.apache.thrift.meta_data.FieldMetaData("line", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Frame_ExecuteJavaScript_args.class, metaDataMap); + } + + public Frame_ExecuteJavaScript_args() { + } + + public Frame_ExecuteJavaScript_args( + int frameId, + java.lang.String code, + java.lang.String url, + int line) + { + this(); + this.frameId = frameId; + setFrameIdIsSet(true); + this.code = code; + this.url = url; + this.line = line; + setLineIsSet(true); + } + + /** + * Performs a deep copy on <i>other</i>. + */ + public Frame_ExecuteJavaScript_args(Frame_ExecuteJavaScript_args other) { + __isset_bitfield = other.__isset_bitfield; + this.frameId = other.frameId; + if (other.isSetCode()) { + this.code = other.code; + } + if (other.isSetUrl()) { + this.url = other.url; + } + this.line = other.line; + } + + @Override + public Frame_ExecuteJavaScript_args deepCopy() { + return new Frame_ExecuteJavaScript_args(this); + } + + @Override + public void clear() { + setFrameIdIsSet(false); + this.frameId = 0; + this.code = null; + this.url = null; + setLineIsSet(false); + this.line = 0; + } + + public int getFrameId() { + return this.frameId; + } + + public Frame_ExecuteJavaScript_args setFrameId(int frameId) { + this.frameId = frameId; + setFrameIdIsSet(true); + return this; + } + + public void unsetFrameId() { + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __FRAMEID_ISSET_ID); + } + + /** Returns true if field frameId is set (has been assigned a value) and false otherwise */ + public boolean isSetFrameId() { + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __FRAMEID_ISSET_ID); + } + + public void setFrameIdIsSet(boolean value) { + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __FRAMEID_ISSET_ID, value); + } + + @org.apache.thrift.annotation.Nullable + public java.lang.String getCode() { + return this.code; + } + + public Frame_ExecuteJavaScript_args setCode(@org.apache.thrift.annotation.Nullable java.lang.String code) { + this.code = code; + return this; + } + + public void unsetCode() { + this.code = null; + } + + /** Returns true if field code is set (has been assigned a value) and false otherwise */ + public boolean isSetCode() { + return this.code != null; + } + + public void setCodeIsSet(boolean value) { + if (!value) { + this.code = null; + } + } + + @org.apache.thrift.annotation.Nullable + public java.lang.String getUrl() { + return this.url; + } + + public Frame_ExecuteJavaScript_args setUrl(@org.apache.thrift.annotation.Nullable java.lang.String url) { + this.url = url; + return this; + } + + public void unsetUrl() { + this.url = null; + } + + /** Returns true if field url is set (has been assigned a value) and false otherwise */ + public boolean isSetUrl() { + return this.url != null; + } + + public void setUrlIsSet(boolean value) { + if (!value) { + this.url = null; + } + } + + public int getLine() { + return this.line; + } + + public Frame_ExecuteJavaScript_args setLine(int line) { + this.line = line; + setLineIsSet(true); + return this; + } + + public void unsetLine() { + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __LINE_ISSET_ID); + } + + /** Returns true if field line is set (has been assigned a value) and false otherwise */ + public boolean isSetLine() { + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __LINE_ISSET_ID); + } + + public void setLineIsSet(boolean value) { + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __LINE_ISSET_ID, value); + } + + @Override + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + switch (field) { + case FRAME_ID: + if (value == null) { + unsetFrameId(); + } else { + setFrameId((java.lang.Integer)value); + } + break; + + case CODE: + if (value == null) { + unsetCode(); + } else { + setCode((java.lang.String)value); + } + break; + + case URL: + if (value == null) { + unsetUrl(); + } else { + setUrl((java.lang.String)value); + } + break; + + case LINE: + if (value == null) { + unsetLine(); + } else { + setLine((java.lang.Integer)value); + } + break; + + } + } + + @org.apache.thrift.annotation.Nullable + @Override + public java.lang.Object getFieldValue(_Fields field) { + switch (field) { + case FRAME_ID: + return getFrameId(); + + case CODE: + return getCode(); + + case URL: + return getUrl(); + + case LINE: + return getLine(); + + } + throw new java.lang.IllegalStateException(); + } + + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + @Override + public boolean isSet(_Fields field) { + if (field == null) { + throw new java.lang.IllegalArgumentException(); + } + + switch (field) { + case FRAME_ID: + return isSetFrameId(); + case CODE: + return isSetCode(); + case URL: + return isSetUrl(); + case LINE: + return isSetLine(); + } + throw new java.lang.IllegalStateException(); + } + + @Override + public boolean equals(java.lang.Object that) { + if (that instanceof Frame_ExecuteJavaScript_args) + return this.equals((Frame_ExecuteJavaScript_args)that); + return false; + } + + public boolean equals(Frame_ExecuteJavaScript_args that) { + if (that == null) + return false; + if (this == that) + return true; + + boolean this_present_frameId = true; + boolean that_present_frameId = true; + if (this_present_frameId || that_present_frameId) { + if (!(this_present_frameId && that_present_frameId)) + return false; + if (this.frameId != that.frameId) + return false; + } + + boolean this_present_code = true && this.isSetCode(); + boolean that_present_code = true && that.isSetCode(); + if (this_present_code || that_present_code) { + if (!(this_present_code && that_present_code)) + return false; + if (!this.code.equals(that.code)) + return false; + } + + boolean this_present_url = true && this.isSetUrl(); + boolean that_present_url = true && that.isSetUrl(); + if (this_present_url || that_present_url) { + if (!(this_present_url && that_present_url)) + return false; + if (!this.url.equals(that.url)) + return false; + } + + boolean this_present_line = true; + boolean that_present_line = true; + if (this_present_line || that_present_line) { + if (!(this_present_line && that_present_line)) + return false; + if (this.line != that.line) + return false; + } + + return true; + } + + @Override + public int hashCode() { + int hashCode = 1; + + hashCode = hashCode * 8191 + frameId; + + hashCode = hashCode * 8191 + ((isSetCode()) ? 131071 : 524287); + if (isSetCode()) + hashCode = hashCode * 8191 + code.hashCode(); + + hashCode = hashCode * 8191 + ((isSetUrl()) ? 131071 : 524287); + if (isSetUrl()) + hashCode = hashCode * 8191 + url.hashCode(); + + hashCode = hashCode * 8191 + line; + + return hashCode; + } + + @Override + public int compareTo(Frame_ExecuteJavaScript_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + + lastComparison = java.lang.Boolean.compare(isSetFrameId(), other.isSetFrameId()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetFrameId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.frameId, other.frameId); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = java.lang.Boolean.compare(isSetCode(), other.isSetCode()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetCode()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.code, other.code); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = java.lang.Boolean.compare(isSetUrl(), other.isSetUrl()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetUrl()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.url, other.url); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = java.lang.Boolean.compare(isSetLine(), other.isSetLine()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetLine()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.line, other.line); + if (lastComparison != 0) { + return lastComparison; + } + } + return 0; + } + + @org.apache.thrift.annotation.Nullable + @Override + public _Fields fieldForId(int fieldId) { + return _Fields.findByThriftId(fieldId); + } + + @Override + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + scheme(iprot).read(iprot, this); + } + + @Override + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + scheme(oprot).write(oprot, this); + } + + @Override + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("Frame_ExecuteJavaScript_args("); + boolean first = true; + + sb.append("frameId:"); + sb.append(this.frameId); + first = false; + if (!first) sb.append(", "); + sb.append("code:"); + if (this.code == null) { + sb.append("null"); + } else { + sb.append(this.code); + } + first = false; + if (!first) sb.append(", "); + sb.append("url:"); + if (this.url == null) { + sb.append("null"); + } else { + sb.append(this.url); + } + first = false; + if (!first) sb.append(", "); + sb.append("line:"); + sb.append(this.line); + first = false; + sb.append(")"); + return sb.toString(); + } + + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + try { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { + try { + // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. + __isset_bitfield = 0; + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private static class Frame_ExecuteJavaScript_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + @Override + public Frame_ExecuteJavaScript_argsStandardScheme getScheme() { + return new Frame_ExecuteJavaScript_argsStandardScheme(); + } + } + + private static class Frame_ExecuteJavaScript_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<Frame_ExecuteJavaScript_args> { + + @Override + public void read(org.apache.thrift.protocol.TProtocol iprot, Frame_ExecuteJavaScript_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) + { + schemeField = iprot.readFieldBegin(); + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + break; + } + switch (schemeField.id) { + case 1: // FRAME_ID + if (schemeField.type == org.apache.thrift.protocol.TType.I32) { + struct.frameId = iprot.readI32(); + struct.setFrameIdIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 2: // CODE + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.code = iprot.readString(); + struct.setCodeIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 3: // URL + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.url = iprot.readString(); + struct.setUrlIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 4: // LINE + if (schemeField.type == org.apache.thrift.protocol.TType.I32) { + struct.line = iprot.readI32(); + struct.setLineIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + + // check for required fields of primitive type, which can't be checked in the validate method + struct.validate(); + } + + @Override + public void write(org.apache.thrift.protocol.TProtocol oprot, Frame_ExecuteJavaScript_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + oprot.writeFieldBegin(FRAME_ID_FIELD_DESC); + oprot.writeI32(struct.frameId); + oprot.writeFieldEnd(); + if (struct.code != null) { + oprot.writeFieldBegin(CODE_FIELD_DESC); + oprot.writeString(struct.code); + oprot.writeFieldEnd(); + } + if (struct.url != null) { + oprot.writeFieldBegin(URL_FIELD_DESC); + oprot.writeString(struct.url); + oprot.writeFieldEnd(); + } + oprot.writeFieldBegin(LINE_FIELD_DESC); + oprot.writeI32(struct.line); + oprot.writeFieldEnd(); + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + + private static class Frame_ExecuteJavaScript_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + @Override + public Frame_ExecuteJavaScript_argsTupleScheme getScheme() { + return new Frame_ExecuteJavaScript_argsTupleScheme(); + } + } + + private static class Frame_ExecuteJavaScript_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<Frame_ExecuteJavaScript_args> { + + @Override + public void write(org.apache.thrift.protocol.TProtocol prot, Frame_ExecuteJavaScript_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); + if (struct.isSetFrameId()) { + optionals.set(0); + } + if (struct.isSetCode()) { + optionals.set(1); + } + if (struct.isSetUrl()) { + optionals.set(2); + } + if (struct.isSetLine()) { + optionals.set(3); + } + oprot.writeBitSet(optionals, 4); + if (struct.isSetFrameId()) { + oprot.writeI32(struct.frameId); + } + if (struct.isSetCode()) { + oprot.writeString(struct.code); + } + if (struct.isSetUrl()) { + oprot.writeString(struct.url); + } + if (struct.isSetLine()) { + oprot.writeI32(struct.line); + } + } + + @Override + public void read(org.apache.thrift.protocol.TProtocol prot, Frame_ExecuteJavaScript_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(4); + if (incoming.get(0)) { + struct.frameId = iprot.readI32(); + struct.setFrameIdIsSet(true); + } + if (incoming.get(1)) { + struct.code = iprot.readString(); + struct.setCodeIsSet(true); + } + if (incoming.get(2)) { + struct.url = iprot.readString(); + struct.setUrlIsSet(true); + } + if (incoming.get(3)) { + struct.line = iprot.readI32(); + struct.setLineIsSet(true); + } + } + } + + private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } + } + + @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) public static class Request_Update_args implements org.apache.thrift.TBase<Request_Update_args, Request_Update_args._Fields>, java.io.Serializable, Cloneable, Comparable<Request_Update_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Request_Update_args"); diff --git a/remote/CMakeLists.txt b/remote/CMakeLists.txt index 36caf6c..d4d08fc 100644 --- a/remote/CMakeLists.txt +++ b/remote/CMakeLists.txt @@ -154,6 +154,8 @@ set(SERVER_SOURCES handlers/app/HelperApp.h ServerState.cpp RpcExecutor.cpp + browser/RemoteFrame.cpp + browser/RemoteFrame.h ) if (OS_WINDOWS) diff --git a/remote/ServerHandler.cpp b/remote/ServerHandler.cpp index 36953f7..babb049 100644 --- a/remote/ServerHandler.cpp +++ b/remote/ServerHandler.cpp @@ -6,6 +6,7 @@ #include "network/RemotePostData.h" #include "network/RemoteRequest.h" #include "network/RemoteResponse.h" +#include "browser/RemoteFrame.h" #include "RemoteObjects.h" #include "callback/RemoteAuthCallback.h" @@ -183,6 +184,15 @@ void ServerHandler::Browser_ExecuteJavaScript(const int32_t bid,const std::strin browser->GetMainFrame()->ExecuteJavaScript(code, url, line); } +void ServerHandler::Frame_ExecuteJavaScript(const int32_t frameId, const std::string& code, const std::string& url, const int32_t line) { + LNDCT(); + RemoteFrame * rf = RemoteFrame::get(frameId); + if (rf == nullptr) + return; + + rf->getDelegate().ExecuteJavaScript(code, url, line); +} + void ServerHandler::Browser_WasResized(const int32_t bid) { LNDCT(); GET_BROWSER_OR_RETURN() diff --git a/remote/ServerHandler.h b/remote/ServerHandler.h index 6cee229..425a2da 100644 --- a/remote/ServerHandler.h +++ b/remote/ServerHandler.h @@ -69,6 +69,11 @@ class ServerHandler : public thrift_codegen::ServerIf { void Browser_SetFrameRate(const int32_t bid, int32_t val) override; // + // CefFrame + // + void Frame_ExecuteJavaScript(const int32_t frameId, const std::string& code, const std::string& url, const int32_t line) override; + + // // CefRequest // void Request_Update(const thrift_codegen::RObject & request) override; diff --git a/remote/browser/RemoteFrame.cpp b/remote/browser/RemoteFrame.cpp new file mode 100644 index 0000000..a5f671a --- /dev/null +++ b/remote/browser/RemoteFrame.cpp @@ -0,0 +1,25 @@ +#include "RemoteFrame.h" + +#define GET_BOOL(map, key) \ + if ((*myDelegate).##key()) \ + map[#key] = "true"; \ + else \ + map[#key] = "false"; + +static void setBool(std::map<std::string, std::string> & out, const std::string& key, bool val) { + if (val) + out[key] = "true"; + else + out[key] = "false"; +} + +std::map<std::string, std::string> RemoteFrame::toMapImpl() { + std::map<std::string, std::string> result; + GET_STR(result, Identifier); + GET_STR(result, URL); + GET_STR(result, Name); + setBool(result, "IsMain", myDelegate->IsMain()); + setBool(result, "IsValid", myDelegate->IsValid()); + setBool(result, "IsFocused", myDelegate->IsFocused()); + return result; +} diff --git a/remote/browser/RemoteFrame.h b/remote/browser/RemoteFrame.h new file mode 100644 index 0000000..cd5342a --- /dev/null +++ b/remote/browser/RemoteFrame.h @@ -0,0 +1,21 @@ +#ifndef JCEF_REMOTEFRAME_H +#define JCEF_REMOTEFRAME_H + +#include "../RemoteObjects.h" +#include "../Utils.h" +#include "include/cef_frame.h" + +class RemoteFrame : public virtual CefBaseRefCounted, public RemoteServerObjectUpdatable<RemoteFrame, CefFrame> { + public: + void updateImpl(const std::map<std::string, std::string>& frameInfo) override { + // Nothing to do (CefFrame is read-only object). + } + std::map<std::string, std::string> toMapImpl() override; + + private: + explicit RemoteFrame(CefRefPtr<CefFrame> delegate, int id) : RemoteServerObjectUpdatable(id, delegate) {} + template <class T, class D> friend class ::RemoteServerObjectHolder; + IMPLEMENT_REFCOUNTING(RemoteFrame); +}; + +#endif // JCEF_REMOTEFRAME_H diff --git a/remote/cef_client.thrift b/remote/cef_client.thrift index c82080a..298aa8a 100644 --- a/remote/cef_client.thrift +++ b/remote/cef_client.thrift @@ -50,87 +50,86 @@ service ClientHandlers { // // CefRenderHandler // - Rect RenderHandler_GetViewRect(1: i32 bid), - ScreenInfo RenderHandler_GetScreenInfo(1: i32 bid), - Point RenderHandler_GetScreenPoint(1: i32 bid, 2: i32 viewX, 3: i32 viewY), - void RenderHandler_OnPaint(1: i32 bid, 2: bool popup, 3: i32 dirtyRectsCount, 4: string sharedMemName, 5: i64 sharedMemHandle, 6: i32 width, 7: i32 height), + Rect RenderHandler_GetViewRect(1:i32 bid), + ScreenInfo RenderHandler_GetScreenInfo(1:i32 bid), + Point RenderHandler_GetScreenPoint(1:i32 bid, 2:i32 viewX, 3:i32 viewY), + void RenderHandler_OnPaint(1:i32 bid, 2: bool popup, 3:i32 dirtyRectsCount, 4: string sharedMemName, 5: i64 sharedMemHandle, 6: i32 width, 7: i32 height), // TODO: implement // OnPopupShow(1:i32 bid, bool show) // OnPopupSize(1:i32 bid, const CefRect& rect) // StartDragging(1:i32 bid, CefRefPtr<CefDragData> drag_data, DragOperationsMask allowed_ops, int x, int y) // UpdateDragCursor(1:i32 bid, DragOperation operation) - // - // TODO: support frame argument in all handlers + // // // CefLifeSpanHandler // - bool LifeSpanHandler_OnBeforePopup(1: i32 bid, 2: string url, 3: string frameName, 4: bool gesture), // TODO: add other params - oneway void LifeSpanHandler_OnAfterCreated(1: i32 bid, 2: i32 nativeBrowserIdentifier), - bool LifeSpanHandler_DoClose(1: i32 bid), - oneway void LifeSpanHandler_OnBeforeClose(1: i32 bid), + bool LifeSpanHandler_OnBeforePopup(1:i32 bid, 2:shared.RObject frame, 3:string url, 4:string frameName, 5:bool gesture), // TODO: add other params + oneway void LifeSpanHandler_OnAfterCreated(1:i32 bid, 2:i32 nativeBrowserIdentifier), + bool LifeSpanHandler_DoClose(1:i32 bid), + oneway void LifeSpanHandler_OnBeforeClose(1:i32 bid), // // CefLoadHandler // - oneway void LoadHandler_OnLoadingStateChange(1: i32 bid, 2: bool isLoading, 3: bool canGoBack, 4: bool canGoForward), - oneway void LoadHandler_OnLoadStart(1: i32 bid, 2: i32 transition_type), - oneway void LoadHandler_OnLoadEnd(1: i32 bid, 2: i32 httpStatusCode), - oneway void LoadHandler_OnLoadError(1: i32 bid, 2: i32 errorCode, 3: string errorText, 4: string failedUrl), + oneway void LoadHandler_OnLoadingStateChange(1:i32 bid, 2: bool isLoading, 3:bool canGoBack, 4: bool canGoForward), + oneway void LoadHandler_OnLoadStart(1:i32 bid, 2:shared.RObject frame, 3:i32 transition_type), + oneway void LoadHandler_OnLoadEnd(1:i32 bid, 2:shared.RObject frame, 3:i32 httpStatusCode), + oneway void LoadHandler_OnLoadError(1:i32 bid, 2:shared.RObject frame, 3:i32 errorCode, 4:string errorText, 5:string failedUrl), // // CefDisplayHandler // - oneway void DisplayHandler_OnAddressChange(1: i32 bid, 2: string url), - oneway void DisplayHandler_OnTitleChange(1: i32 bid, 2: string title), - bool DisplayHandler_OnTooltip(1: i32 bid, 2: string text), - oneway void DisplayHandler_OnStatusMessage(1: i32 bid, 2: string value), - bool DisplayHandler_OnConsoleMessage(1: i32 bid, 2: i32 level, 3: string message, 4: string source, 5: i32 line), + oneway void DisplayHandler_OnAddressChange(1:i32 bid, 2:shared.RObject frame, 3:string url), + oneway void DisplayHandler_OnTitleChange(1:i32 bid, 2:string title), + bool DisplayHandler_OnTooltip(1:i32 bid, 2:string text), + oneway void DisplayHandler_OnStatusMessage(1:i32 bid, 2:string value), + bool DisplayHandler_OnConsoleMessage(1:i32 bid, 2:i32 level, 3:string message, 4: string source, 5: i32 line), // // CefKeyboardHandler (will be called on the UI thread). // - bool KeyboardHandler_OnPreKeyEvent(1: i32 bid, 2: shared.KeyEvent event) // TODO: support bool* is_keyboard_shortcut - bool KeyboardHandler_OnKeyEvent(1: i32 bid, 2: shared.KeyEvent event) + bool KeyboardHandler_OnPreKeyEvent(1:i32 bid, 2: shared.KeyEvent event) // TODO: support bool* is_keyboard_shortcut + bool KeyboardHandler_OnKeyEvent(1:i32 bid, 2: shared.KeyEvent event) // // CefFocusHandler (will be called on the UI thread). // - oneway void FocusHandler_OnTakeFocus(1: i32 bid, 2: bool next) - bool FocusHandler_OnSetFocus(1: i32 bid, 2: string source) - oneway void FocusHandler_OnGotFocus(1: i32 bid) + oneway void FocusHandler_OnTakeFocus(1:i32 bid, 2: bool next) + bool FocusHandler_OnSetFocus(1:i32 bid, 2:string source) + oneway void FocusHandler_OnGotFocus(1:i32 bid) // // CefRequestHandler // - bool RequestHandler_OnBeforeBrowse(1: i32 bid, 2: shared.RObject request, 3: bool user_gesture, 4: bool is_redirect), - bool RequestHandler_OnOpenURLFromTab(1: i32 bid, 2: string target_url, 3: bool user_gesture), - bool RequestHandler_GetAuthCredentials(1: i32 bid, 2: string origin_url, 3: bool isProxy, 4: string host, 5: i32 port, 6: string realm, 7: string scheme, 8: shared.RObject authCallback), - bool RequestHandler_OnCertificateError(1: i32 bid, 2: string cert_error, 3: string request_url, 4: binary sslInfo, 5: shared.RObject callback), - oneway void RequestHandler_OnRenderProcessTerminated(1: i32 bid, 2: string status), - shared.RObject RequestHandler_GetResourceRequestHandler(1: i32 bid, 2: shared.RObject request, 3: bool isNavigation, 4: bool isDownload, 5: string requestInitiator), + bool RequestHandler_OnBeforeBrowse(1:i32 bid, 2:shared.RObject frame, 3:shared.RObject request, 4:bool user_gesture, 5:bool is_redirect), + bool RequestHandler_OnOpenURLFromTab(1:i32 bid, 2:shared.RObject frame, 3:string target_url, 4:bool user_gesture), + bool RequestHandler_GetAuthCredentials(1:i32 bid, 2:string origin_url, 3:bool isProxy, 4: string host, 5: i32 port, 6: string realm, 7: string scheme, 8: shared.RObject authCallback), + bool RequestHandler_OnCertificateError(1:i32 bid, 2:string cert_error, 3:string request_url, 4: binary sslInfo, 5: shared.RObject callback), + oneway void RequestHandler_OnRenderProcessTerminated(1:i32 bid, 2:string status), + shared.RObject RequestHandler_GetResourceRequestHandler(1:i32 bid, 2:shared.RObject frame, 3:shared.RObject request, 4:bool isNavigation, 5:bool isDownload, 6:string requestInitiator), oneway void ResourceRequestHandler_Dispose(1: i32 rrHandler), - shared.RObject ResourceRequestHandler_GetCookieAccessFilter(1: i32 rrHandler, 2: i32 bid, 3: shared.RObject request), + shared.RObject ResourceRequestHandler_GetCookieAccessFilter(1: i32 rrHandler, 2:i32 bid, 3:shared.RObject frame, 4:shared.RObject request), oneway void CookieAccessFilter_Dispose(1: i32 filter), - bool CookieAccessFilter_CanSendCookie(1: i32 filter, 2: i32 bid, 3: shared.RObject request, 4: list<string> cookie), - bool CookieAccessFilter_CanSaveCookie(1: i32 filter, 2: i32 bid, 3: shared.RObject request, 4: shared.RObject response, 5: list<string> cookie), - bool ResourceRequestHandler_OnBeforeResourceLoad(1: i32 rrHandler, 2: i32 bid, 3: shared.RObject request), - shared.RObject ResourceRequestHandler_GetResourceHandler(1: i32 rrHandler, 2: i32 bid, 3: shared.RObject request), + bool CookieAccessFilter_CanSendCookie(1: i32 filter, 2:i32 bid, 3:shared.RObject frame, 4:shared.RObject request, 5:list<string> cookie), + bool CookieAccessFilter_CanSaveCookie(1: i32 filter, 2:i32 bid, 3:shared.RObject frame, 4:shared.RObject request, 5:shared.RObject response, 6:list<string> cookie), + bool ResourceRequestHandler_OnBeforeResourceLoad(1: i32 rrHandler, 2:i32 bid, 3:shared.RObject frame, 4:shared.RObject request), + shared.RObject ResourceRequestHandler_GetResourceHandler(1: i32 rrHandler, 2:i32 bid, 3:shared.RObject frame, 4:shared.RObject request), oneway void ResourceHandler_Dispose(1: i32 resourceHandler), bool ResourceHandler_ProcessRequest(1:i32 resourceHandler, 2:shared.RObject request, 3:shared.RObject callback) shared.ResponseHeaders ResourceHandler_GetResponseHeaders(1:i32 resourceHandler, 2:shared.RObject response) shared.ResponseData ResourceHandler_ReadResponse(1:i32 resourceHandler, 2:i32 bytes_to_read, 3:shared.RObject callback) oneway void ResourceHandler_Cancel(1:i32 resourceHandler) - string ResourceRequestHandler_OnResourceRedirect(1: i32 rrHandler, 2: i32 bid, 3: shared.RObject request, 4: shared.RObject response, 5: string new_url), - bool ResourceRequestHandler_OnResourceResponse(1: i32 rrHandler, 2: i32 bid, 3: shared.RObject request, 4: shared.RObject response), - void ResourceRequestHandler_OnResourceLoadComplete(1: i32 rrHandler, 2: i32 bid, 3: shared.RObject request, 4: shared.RObject response, 5: string status, 6: i64 receivedContentLength), - bool ResourceRequestHandler_OnProtocolExecution(1: i32 rrHandler, 2: i32 bid, 3: shared.RObject request, 4: bool allowOsExecution), + string ResourceRequestHandler_OnResourceRedirect(1: i32 rrHandler, 2:i32 bid, 3:shared.RObject frame, 4:shared.RObject request, 5:shared.RObject response, 6:string new_url), + bool ResourceRequestHandler_OnResourceResponse(1: i32 rrHandler, 2:i32 bid, 3:shared.RObject frame, 4:shared.RObject request, 5:shared.RObject response), + void ResourceRequestHandler_OnResourceLoadComplete(1: i32 rrHandler, 2:i32 bid, 3:shared.RObject frame, 4:shared.RObject request, 5:shared.RObject response, 6:string status, 7:i64 receivedContentLength), + bool ResourceRequestHandler_OnProtocolExecution(1: i32 rrHandler, 2:i32 bid, 3:shared.RObject frame, 4:shared.RObject request, 5:bool allowOsExecution), // // CefMessageRouter // - bool MessageRouterHandler_onQuery(1: shared.RObject handler, 2: i32 bid, 3: i64 queryId, 4: string request, 5: bool persistent, 6: shared.RObject queryCallback), - oneway void MessageRouterHandler_onQueryCanceled(1: shared.RObject handler, 2: i32 bid, 3: i64 queryId), + bool MessageRouterHandler_onQuery(1: shared.RObject handler, 2:i32 bid, 3:shared.RObject frame, 4:i64 queryId, 5:string request, 6:bool persistent, 7:shared.RObject queryCallback), + oneway void MessageRouterHandler_onQueryCanceled(1: shared.RObject handler, 2:i32 bid, 3:shared.RObject frame, 4:i64 queryId), oneway void MessageRouterHandler_Dispose(1: i32 handler), // // Custom schemes // - shared.RObject SchemeHandlerFactory_CreateHandler(1:i32 schemeHandlerFactory, 2:i32 bid, 3:string scheme_name, 4:shared.RObject request), + shared.RObject SchemeHandlerFactory_CreateHandler(1:i32 schemeHandlerFactory, 2:i32 bid, 3:shared.RObject frame, 4:string scheme_name, 5:shared.RObject request), oneway void SchemeHandlerFactory_Dispose(1:i32 schemeHandlerFactory) }
\ No newline at end of file diff --git a/remote/cef_server.thrift b/remote/cef_server.thrift index 21c7667..bcf9fa2 100644 --- a/remote/cef_server.thrift +++ b/remote/cef_server.thrift @@ -69,6 +69,11 @@ service Server { oneway void Browser_SetFrameRate(1: i32 bid, 2:i32 val), // + // CefFrame + // + oneway void Frame_ExecuteJavaScript(1:i32 frameId, 2:string code, 3:string url, 4:i32 line), + + // // CefRequest // void Request_Update(1: shared.RObject request), diff --git a/remote/gen-cpp/ClientHandlers.cpp b/remote/gen-cpp/ClientHandlers.cpp index b31b684..35210da 100644 --- a/remote/gen-cpp/ClientHandlers.cpp +++ b/remote/gen-cpp/ClientHandlers.cpp @@ -1191,6 +1191,14 @@ uint32_t ClientHandlers_LifeSpanHandler_OnBeforePopup_args::read(::apache::thrif } break; case 2: + if (ftype == ::apache::thrift::protocol::T_STRUCT) { + xfer += this->frame.read(iprot); + this->__isset.frame = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 3: if (ftype == ::apache::thrift::protocol::T_STRING) { xfer += iprot->readString(this->url); this->__isset.url = true; @@ -1198,7 +1206,7 @@ uint32_t ClientHandlers_LifeSpanHandler_OnBeforePopup_args::read(::apache::thrif xfer += iprot->skip(ftype); } break; - case 3: + case 4: if (ftype == ::apache::thrift::protocol::T_STRING) { xfer += iprot->readString(this->frameName); this->__isset.frameName = true; @@ -1206,7 +1214,7 @@ uint32_t ClientHandlers_LifeSpanHandler_OnBeforePopup_args::read(::apache::thrif xfer += iprot->skip(ftype); } break; - case 4: + case 5: if (ftype == ::apache::thrift::protocol::T_BOOL) { xfer += iprot->readBool(this->gesture); this->__isset.gesture = true; @@ -1235,15 +1243,19 @@ uint32_t ClientHandlers_LifeSpanHandler_OnBeforePopup_args::write(::apache::thri xfer += oprot->writeI32(this->bid); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("url", ::apache::thrift::protocol::T_STRING, 2); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 2); + xfer += this->frame.write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("url", ::apache::thrift::protocol::T_STRING, 3); xfer += oprot->writeString(this->url); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("frameName", ::apache::thrift::protocol::T_STRING, 3); + xfer += oprot->writeFieldBegin("frameName", ::apache::thrift::protocol::T_STRING, 4); xfer += oprot->writeString(this->frameName); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("gesture", ::apache::thrift::protocol::T_BOOL, 4); + xfer += oprot->writeFieldBegin("gesture", ::apache::thrift::protocol::T_BOOL, 5); xfer += oprot->writeBool(this->gesture); xfer += oprot->writeFieldEnd(); @@ -1266,15 +1278,19 @@ uint32_t ClientHandlers_LifeSpanHandler_OnBeforePopup_pargs::write(::apache::thr xfer += oprot->writeI32((*(this->bid))); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("url", ::apache::thrift::protocol::T_STRING, 2); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 2); + xfer += (*(this->frame)).write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("url", ::apache::thrift::protocol::T_STRING, 3); xfer += oprot->writeString((*(this->url))); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("frameName", ::apache::thrift::protocol::T_STRING, 3); + xfer += oprot->writeFieldBegin("frameName", ::apache::thrift::protocol::T_STRING, 4); xfer += oprot->writeString((*(this->frameName))); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("gesture", ::apache::thrift::protocol::T_BOOL, 4); + xfer += oprot->writeFieldBegin("gesture", ::apache::thrift::protocol::T_BOOL, 5); xfer += oprot->writeBool((*(this->gesture))); xfer += oprot->writeFieldEnd(); @@ -1914,6 +1930,14 @@ uint32_t ClientHandlers_LoadHandler_OnLoadStart_args::read(::apache::thrift::pro } break; case 2: + if (ftype == ::apache::thrift::protocol::T_STRUCT) { + xfer += this->frame.read(iprot); + this->__isset.frame = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 3: if (ftype == ::apache::thrift::protocol::T_I32) { xfer += iprot->readI32(this->transition_type); this->__isset.transition_type = true; @@ -1942,7 +1966,11 @@ uint32_t ClientHandlers_LoadHandler_OnLoadStart_args::write(::apache::thrift::pr xfer += oprot->writeI32(this->bid); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("transition_type", ::apache::thrift::protocol::T_I32, 2); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 2); + xfer += this->frame.write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("transition_type", ::apache::thrift::protocol::T_I32, 3); xfer += oprot->writeI32(this->transition_type); xfer += oprot->writeFieldEnd(); @@ -1965,7 +1993,11 @@ uint32_t ClientHandlers_LoadHandler_OnLoadStart_pargs::write(::apache::thrift::p xfer += oprot->writeI32((*(this->bid))); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("transition_type", ::apache::thrift::protocol::T_I32, 2); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 2); + xfer += (*(this->frame)).write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("transition_type", ::apache::thrift::protocol::T_I32, 3); xfer += oprot->writeI32((*(this->transition_type))); xfer += oprot->writeFieldEnd(); @@ -2009,6 +2041,14 @@ uint32_t ClientHandlers_LoadHandler_OnLoadEnd_args::read(::apache::thrift::proto } break; case 2: + if (ftype == ::apache::thrift::protocol::T_STRUCT) { + xfer += this->frame.read(iprot); + this->__isset.frame = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 3: if (ftype == ::apache::thrift::protocol::T_I32) { xfer += iprot->readI32(this->httpStatusCode); this->__isset.httpStatusCode = true; @@ -2037,7 +2077,11 @@ uint32_t ClientHandlers_LoadHandler_OnLoadEnd_args::write(::apache::thrift::prot xfer += oprot->writeI32(this->bid); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("httpStatusCode", ::apache::thrift::protocol::T_I32, 2); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 2); + xfer += this->frame.write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("httpStatusCode", ::apache::thrift::protocol::T_I32, 3); xfer += oprot->writeI32(this->httpStatusCode); xfer += oprot->writeFieldEnd(); @@ -2060,7 +2104,11 @@ uint32_t ClientHandlers_LoadHandler_OnLoadEnd_pargs::write(::apache::thrift::pro xfer += oprot->writeI32((*(this->bid))); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("httpStatusCode", ::apache::thrift::protocol::T_I32, 2); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 2); + xfer += (*(this->frame)).write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("httpStatusCode", ::apache::thrift::protocol::T_I32, 3); xfer += oprot->writeI32((*(this->httpStatusCode))); xfer += oprot->writeFieldEnd(); @@ -2104,6 +2152,14 @@ uint32_t ClientHandlers_LoadHandler_OnLoadError_args::read(::apache::thrift::pro } break; case 2: + if (ftype == ::apache::thrift::protocol::T_STRUCT) { + xfer += this->frame.read(iprot); + this->__isset.frame = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 3: if (ftype == ::apache::thrift::protocol::T_I32) { xfer += iprot->readI32(this->errorCode); this->__isset.errorCode = true; @@ -2111,7 +2167,7 @@ uint32_t ClientHandlers_LoadHandler_OnLoadError_args::read(::apache::thrift::pro xfer += iprot->skip(ftype); } break; - case 3: + case 4: if (ftype == ::apache::thrift::protocol::T_STRING) { xfer += iprot->readString(this->errorText); this->__isset.errorText = true; @@ -2119,7 +2175,7 @@ uint32_t ClientHandlers_LoadHandler_OnLoadError_args::read(::apache::thrift::pro xfer += iprot->skip(ftype); } break; - case 4: + case 5: if (ftype == ::apache::thrift::protocol::T_STRING) { xfer += iprot->readString(this->failedUrl); this->__isset.failedUrl = true; @@ -2148,15 +2204,19 @@ uint32_t ClientHandlers_LoadHandler_OnLoadError_args::write(::apache::thrift::pr xfer += oprot->writeI32(this->bid); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("errorCode", ::apache::thrift::protocol::T_I32, 2); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 2); + xfer += this->frame.write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("errorCode", ::apache::thrift::protocol::T_I32, 3); xfer += oprot->writeI32(this->errorCode); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("errorText", ::apache::thrift::protocol::T_STRING, 3); + xfer += oprot->writeFieldBegin("errorText", ::apache::thrift::protocol::T_STRING, 4); xfer += oprot->writeString(this->errorText); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("failedUrl", ::apache::thrift::protocol::T_STRING, 4); + xfer += oprot->writeFieldBegin("failedUrl", ::apache::thrift::protocol::T_STRING, 5); xfer += oprot->writeString(this->failedUrl); xfer += oprot->writeFieldEnd(); @@ -2179,15 +2239,19 @@ uint32_t ClientHandlers_LoadHandler_OnLoadError_pargs::write(::apache::thrift::p xfer += oprot->writeI32((*(this->bid))); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("errorCode", ::apache::thrift::protocol::T_I32, 2); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 2); + xfer += (*(this->frame)).write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("errorCode", ::apache::thrift::protocol::T_I32, 3); xfer += oprot->writeI32((*(this->errorCode))); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("errorText", ::apache::thrift::protocol::T_STRING, 3); + xfer += oprot->writeFieldBegin("errorText", ::apache::thrift::protocol::T_STRING, 4); xfer += oprot->writeString((*(this->errorText))); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("failedUrl", ::apache::thrift::protocol::T_STRING, 4); + xfer += oprot->writeFieldBegin("failedUrl", ::apache::thrift::protocol::T_STRING, 5); xfer += oprot->writeString((*(this->failedUrl))); xfer += oprot->writeFieldEnd(); @@ -2231,6 +2295,14 @@ uint32_t ClientHandlers_DisplayHandler_OnAddressChange_args::read(::apache::thri } break; case 2: + if (ftype == ::apache::thrift::protocol::T_STRUCT) { + xfer += this->frame.read(iprot); + this->__isset.frame = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 3: if (ftype == ::apache::thrift::protocol::T_STRING) { xfer += iprot->readString(this->url); this->__isset.url = true; @@ -2259,7 +2331,11 @@ uint32_t ClientHandlers_DisplayHandler_OnAddressChange_args::write(::apache::thr xfer += oprot->writeI32(this->bid); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("url", ::apache::thrift::protocol::T_STRING, 2); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 2); + xfer += this->frame.write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("url", ::apache::thrift::protocol::T_STRING, 3); xfer += oprot->writeString(this->url); xfer += oprot->writeFieldEnd(); @@ -2282,7 +2358,11 @@ uint32_t ClientHandlers_DisplayHandler_OnAddressChange_pargs::write(::apache::th xfer += oprot->writeI32((*(this->bid))); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("url", ::apache::thrift::protocol::T_STRING, 2); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 2); + xfer += (*(this->frame)).write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("url", ::apache::thrift::protocol::T_STRING, 3); xfer += oprot->writeString((*(this->url))); xfer += oprot->writeFieldEnd(); @@ -3754,13 +3834,21 @@ uint32_t ClientHandlers_RequestHandler_OnBeforeBrowse_args::read(::apache::thrif break; case 2: if (ftype == ::apache::thrift::protocol::T_STRUCT) { + xfer += this->frame.read(iprot); + this->__isset.frame = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 3: + if (ftype == ::apache::thrift::protocol::T_STRUCT) { xfer += this->request.read(iprot); this->__isset.request = true; } else { xfer += iprot->skip(ftype); } break; - case 3: + case 4: if (ftype == ::apache::thrift::protocol::T_BOOL) { xfer += iprot->readBool(this->user_gesture); this->__isset.user_gesture = true; @@ -3768,7 +3856,7 @@ uint32_t ClientHandlers_RequestHandler_OnBeforeBrowse_args::read(::apache::thrif xfer += iprot->skip(ftype); } break; - case 4: + case 5: if (ftype == ::apache::thrift::protocol::T_BOOL) { xfer += iprot->readBool(this->is_redirect); this->__isset.is_redirect = true; @@ -3797,15 +3885,19 @@ uint32_t ClientHandlers_RequestHandler_OnBeforeBrowse_args::write(::apache::thri xfer += oprot->writeI32(this->bid); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 2); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 2); + xfer += this->frame.write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 3); xfer += this->request.write(oprot); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("user_gesture", ::apache::thrift::protocol::T_BOOL, 3); + xfer += oprot->writeFieldBegin("user_gesture", ::apache::thrift::protocol::T_BOOL, 4); xfer += oprot->writeBool(this->user_gesture); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("is_redirect", ::apache::thrift::protocol::T_BOOL, 4); + xfer += oprot->writeFieldBegin("is_redirect", ::apache::thrift::protocol::T_BOOL, 5); xfer += oprot->writeBool(this->is_redirect); xfer += oprot->writeFieldEnd(); @@ -3828,15 +3920,19 @@ uint32_t ClientHandlers_RequestHandler_OnBeforeBrowse_pargs::write(::apache::thr xfer += oprot->writeI32((*(this->bid))); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 2); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 2); + xfer += (*(this->frame)).write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 3); xfer += (*(this->request)).write(oprot); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("user_gesture", ::apache::thrift::protocol::T_BOOL, 3); + xfer += oprot->writeFieldBegin("user_gesture", ::apache::thrift::protocol::T_BOOL, 4); xfer += oprot->writeBool((*(this->user_gesture))); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("is_redirect", ::apache::thrift::protocol::T_BOOL, 4); + xfer += oprot->writeFieldBegin("is_redirect", ::apache::thrift::protocol::T_BOOL, 5); xfer += oprot->writeBool((*(this->is_redirect))); xfer += oprot->writeFieldEnd(); @@ -3988,6 +4084,14 @@ uint32_t ClientHandlers_RequestHandler_OnOpenURLFromTab_args::read(::apache::thr } break; case 2: + if (ftype == ::apache::thrift::protocol::T_STRUCT) { + xfer += this->frame.read(iprot); + this->__isset.frame = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 3: if (ftype == ::apache::thrift::protocol::T_STRING) { xfer += iprot->readString(this->target_url); this->__isset.target_url = true; @@ -3995,7 +4099,7 @@ uint32_t ClientHandlers_RequestHandler_OnOpenURLFromTab_args::read(::apache::thr xfer += iprot->skip(ftype); } break; - case 3: + case 4: if (ftype == ::apache::thrift::protocol::T_BOOL) { xfer += iprot->readBool(this->user_gesture); this->__isset.user_gesture = true; @@ -4024,11 +4128,15 @@ uint32_t ClientHandlers_RequestHandler_OnOpenURLFromTab_args::write(::apache::th xfer += oprot->writeI32(this->bid); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("target_url", ::apache::thrift::protocol::T_STRING, 2); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 2); + xfer += this->frame.write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("target_url", ::apache::thrift::protocol::T_STRING, 3); xfer += oprot->writeString(this->target_url); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("user_gesture", ::apache::thrift::protocol::T_BOOL, 3); + xfer += oprot->writeFieldBegin("user_gesture", ::apache::thrift::protocol::T_BOOL, 4); xfer += oprot->writeBool(this->user_gesture); xfer += oprot->writeFieldEnd(); @@ -4051,11 +4159,15 @@ uint32_t ClientHandlers_RequestHandler_OnOpenURLFromTab_pargs::write(::apache::t xfer += oprot->writeI32((*(this->bid))); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("target_url", ::apache::thrift::protocol::T_STRING, 2); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 2); + xfer += (*(this->frame)).write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("target_url", ::apache::thrift::protocol::T_STRING, 3); xfer += oprot->writeString((*(this->target_url))); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("user_gesture", ::apache::thrift::protocol::T_BOOL, 3); + xfer += oprot->writeFieldBegin("user_gesture", ::apache::thrift::protocol::T_BOOL, 4); xfer += oprot->writeBool((*(this->user_gesture))); xfer += oprot->writeFieldEnd(); @@ -4853,13 +4965,21 @@ uint32_t ClientHandlers_RequestHandler_GetResourceRequestHandler_args::read(::ap break; case 2: if (ftype == ::apache::thrift::protocol::T_STRUCT) { + xfer += this->frame.read(iprot); + this->__isset.frame = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 3: + if (ftype == ::apache::thrift::protocol::T_STRUCT) { xfer += this->request.read(iprot); this->__isset.request = true; } else { xfer += iprot->skip(ftype); } break; - case 3: + case 4: if (ftype == ::apache::thrift::protocol::T_BOOL) { xfer += iprot->readBool(this->isNavigation); this->__isset.isNavigation = true; @@ -4867,7 +4987,7 @@ uint32_t ClientHandlers_RequestHandler_GetResourceRequestHandler_args::read(::ap xfer += iprot->skip(ftype); } break; - case 4: + case 5: if (ftype == ::apache::thrift::protocol::T_BOOL) { xfer += iprot->readBool(this->isDownload); this->__isset.isDownload = true; @@ -4875,7 +4995,7 @@ uint32_t ClientHandlers_RequestHandler_GetResourceRequestHandler_args::read(::ap xfer += iprot->skip(ftype); } break; - case 5: + case 6: if (ftype == ::apache::thrift::protocol::T_STRING) { xfer += iprot->readString(this->requestInitiator); this->__isset.requestInitiator = true; @@ -4904,19 +5024,23 @@ uint32_t ClientHandlers_RequestHandler_GetResourceRequestHandler_args::write(::a xfer += oprot->writeI32(this->bid); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 2); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 2); + xfer += this->frame.write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 3); xfer += this->request.write(oprot); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("isNavigation", ::apache::thrift::protocol::T_BOOL, 3); + xfer += oprot->writeFieldBegin("isNavigation", ::apache::thrift::protocol::T_BOOL, 4); xfer += oprot->writeBool(this->isNavigation); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("isDownload", ::apache::thrift::protocol::T_BOOL, 4); + xfer += oprot->writeFieldBegin("isDownload", ::apache::thrift::protocol::T_BOOL, 5); xfer += oprot->writeBool(this->isDownload); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("requestInitiator", ::apache::thrift::protocol::T_STRING, 5); + xfer += oprot->writeFieldBegin("requestInitiator", ::apache::thrift::protocol::T_STRING, 6); xfer += oprot->writeString(this->requestInitiator); xfer += oprot->writeFieldEnd(); @@ -4939,19 +5063,23 @@ uint32_t ClientHandlers_RequestHandler_GetResourceRequestHandler_pargs::write(:: xfer += oprot->writeI32((*(this->bid))); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 2); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 2); + xfer += (*(this->frame)).write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 3); xfer += (*(this->request)).write(oprot); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("isNavigation", ::apache::thrift::protocol::T_BOOL, 3); + xfer += oprot->writeFieldBegin("isNavigation", ::apache::thrift::protocol::T_BOOL, 4); xfer += oprot->writeBool((*(this->isNavigation))); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("isDownload", ::apache::thrift::protocol::T_BOOL, 4); + xfer += oprot->writeFieldBegin("isDownload", ::apache::thrift::protocol::T_BOOL, 5); xfer += oprot->writeBool((*(this->isDownload))); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("requestInitiator", ::apache::thrift::protocol::T_STRING, 5); + xfer += oprot->writeFieldBegin("requestInitiator", ::apache::thrift::protocol::T_STRING, 6); xfer += oprot->writeString((*(this->requestInitiator))); xfer += oprot->writeFieldEnd(); @@ -5191,6 +5319,14 @@ uint32_t ClientHandlers_ResourceRequestHandler_GetCookieAccessFilter_args::read( break; case 3: if (ftype == ::apache::thrift::protocol::T_STRUCT) { + xfer += this->frame.read(iprot); + this->__isset.frame = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 4: + if (ftype == ::apache::thrift::protocol::T_STRUCT) { xfer += this->request.read(iprot); this->__isset.request = true; } else { @@ -5222,7 +5358,11 @@ uint32_t ClientHandlers_ResourceRequestHandler_GetCookieAccessFilter_args::write xfer += oprot->writeI32(this->bid); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += this->frame.write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 4); xfer += this->request.write(oprot); xfer += oprot->writeFieldEnd(); @@ -5249,7 +5389,11 @@ uint32_t ClientHandlers_ResourceRequestHandler_GetCookieAccessFilter_pargs::writ xfer += oprot->writeI32((*(this->bid))); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += (*(this->frame)).write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 4); xfer += (*(this->request)).write(oprot); xfer += oprot->writeFieldEnd(); @@ -5489,13 +5633,21 @@ uint32_t ClientHandlers_CookieAccessFilter_CanSendCookie_args::read(::apache::th break; case 3: if (ftype == ::apache::thrift::protocol::T_STRUCT) { + xfer += this->frame.read(iprot); + this->__isset.frame = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 4: + if (ftype == ::apache::thrift::protocol::T_STRUCT) { xfer += this->request.read(iprot); this->__isset.request = true; } else { xfer += iprot->skip(ftype); } break; - case 4: + case 5: if (ftype == ::apache::thrift::protocol::T_LIST) { { this->cookie.clear(); @@ -5540,11 +5692,15 @@ uint32_t ClientHandlers_CookieAccessFilter_CanSendCookie_args::write(::apache::t xfer += oprot->writeI32(this->bid); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += this->frame.write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 4); xfer += this->request.write(oprot); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("cookie", ::apache::thrift::protocol::T_LIST, 4); + xfer += oprot->writeFieldBegin("cookie", ::apache::thrift::protocol::T_LIST, 5); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->cookie.size())); std::vector<std::string> ::const_iterator _iter11; @@ -5579,11 +5735,15 @@ uint32_t ClientHandlers_CookieAccessFilter_CanSendCookie_pargs::write(::apache:: xfer += oprot->writeI32((*(this->bid))); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += (*(this->frame)).write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 4); xfer += (*(this->request)).write(oprot); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("cookie", ::apache::thrift::protocol::T_LIST, 4); + xfer += oprot->writeFieldBegin("cookie", ::apache::thrift::protocol::T_LIST, 5); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>((*(this->cookie)).size())); std::vector<std::string> ::const_iterator _iter12; @@ -5752,13 +5912,21 @@ uint32_t ClientHandlers_CookieAccessFilter_CanSaveCookie_args::read(::apache::th break; case 3: if (ftype == ::apache::thrift::protocol::T_STRUCT) { + xfer += this->frame.read(iprot); + this->__isset.frame = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 4: + if (ftype == ::apache::thrift::protocol::T_STRUCT) { xfer += this->request.read(iprot); this->__isset.request = true; } else { xfer += iprot->skip(ftype); } break; - case 4: + case 5: if (ftype == ::apache::thrift::protocol::T_STRUCT) { xfer += this->response.read(iprot); this->__isset.response = true; @@ -5766,7 +5934,7 @@ uint32_t ClientHandlers_CookieAccessFilter_CanSaveCookie_args::read(::apache::th xfer += iprot->skip(ftype); } break; - case 5: + case 6: if (ftype == ::apache::thrift::protocol::T_LIST) { { this->cookie.clear(); @@ -5811,15 +5979,19 @@ uint32_t ClientHandlers_CookieAccessFilter_CanSaveCookie_args::write(::apache::t xfer += oprot->writeI32(this->bid); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += this->frame.write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 4); xfer += this->request.write(oprot); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("response", ::apache::thrift::protocol::T_STRUCT, 4); + xfer += oprot->writeFieldBegin("response", ::apache::thrift::protocol::T_STRUCT, 5); xfer += this->response.write(oprot); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("cookie", ::apache::thrift::protocol::T_LIST, 5); + xfer += oprot->writeFieldBegin("cookie", ::apache::thrift::protocol::T_LIST, 6); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->cookie.size())); std::vector<std::string> ::const_iterator _iter18; @@ -5854,15 +6026,19 @@ uint32_t ClientHandlers_CookieAccessFilter_CanSaveCookie_pargs::write(::apache:: xfer += oprot->writeI32((*(this->bid))); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += (*(this->frame)).write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 4); xfer += (*(this->request)).write(oprot); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("response", ::apache::thrift::protocol::T_STRUCT, 4); + xfer += oprot->writeFieldBegin("response", ::apache::thrift::protocol::T_STRUCT, 5); xfer += (*(this->response)).write(oprot); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("cookie", ::apache::thrift::protocol::T_LIST, 5); + xfer += oprot->writeFieldBegin("cookie", ::apache::thrift::protocol::T_LIST, 6); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>((*(this->cookie)).size())); std::vector<std::string> ::const_iterator _iter19; @@ -6031,6 +6207,14 @@ uint32_t ClientHandlers_ResourceRequestHandler_OnBeforeResourceLoad_args::read(: break; case 3: if (ftype == ::apache::thrift::protocol::T_STRUCT) { + xfer += this->frame.read(iprot); + this->__isset.frame = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 4: + if (ftype == ::apache::thrift::protocol::T_STRUCT) { xfer += this->request.read(iprot); this->__isset.request = true; } else { @@ -6062,7 +6246,11 @@ uint32_t ClientHandlers_ResourceRequestHandler_OnBeforeResourceLoad_args::write( xfer += oprot->writeI32(this->bid); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += this->frame.write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 4); xfer += this->request.write(oprot); xfer += oprot->writeFieldEnd(); @@ -6089,7 +6277,11 @@ uint32_t ClientHandlers_ResourceRequestHandler_OnBeforeResourceLoad_pargs::write xfer += oprot->writeI32((*(this->bid))); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += (*(this->frame)).write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 4); xfer += (*(this->request)).write(oprot); xfer += oprot->writeFieldEnd(); @@ -6250,6 +6442,14 @@ uint32_t ClientHandlers_ResourceRequestHandler_GetResourceHandler_args::read(::a break; case 3: if (ftype == ::apache::thrift::protocol::T_STRUCT) { + xfer += this->frame.read(iprot); + this->__isset.frame = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 4: + if (ftype == ::apache::thrift::protocol::T_STRUCT) { xfer += this->request.read(iprot); this->__isset.request = true; } else { @@ -6281,7 +6481,11 @@ uint32_t ClientHandlers_ResourceRequestHandler_GetResourceHandler_args::write(:: xfer += oprot->writeI32(this->bid); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += this->frame.write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 4); xfer += this->request.write(oprot); xfer += oprot->writeFieldEnd(); @@ -6308,7 +6512,11 @@ uint32_t ClientHandlers_ResourceRequestHandler_GetResourceHandler_pargs::write(: xfer += oprot->writeI32((*(this->bid))); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += (*(this->frame)).write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 4); xfer += (*(this->request)).write(oprot); xfer += oprot->writeFieldEnd(); @@ -7268,13 +7476,21 @@ uint32_t ClientHandlers_ResourceRequestHandler_OnResourceRedirect_args::read(::a break; case 3: if (ftype == ::apache::thrift::protocol::T_STRUCT) { + xfer += this->frame.read(iprot); + this->__isset.frame = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 4: + if (ftype == ::apache::thrift::protocol::T_STRUCT) { xfer += this->request.read(iprot); this->__isset.request = true; } else { xfer += iprot->skip(ftype); } break; - case 4: + case 5: if (ftype == ::apache::thrift::protocol::T_STRUCT) { xfer += this->response.read(iprot); this->__isset.response = true; @@ -7282,7 +7498,7 @@ uint32_t ClientHandlers_ResourceRequestHandler_OnResourceRedirect_args::read(::a xfer += iprot->skip(ftype); } break; - case 5: + case 6: if (ftype == ::apache::thrift::protocol::T_STRING) { xfer += iprot->readString(this->new_url); this->__isset.new_url = true; @@ -7315,15 +7531,19 @@ uint32_t ClientHandlers_ResourceRequestHandler_OnResourceRedirect_args::write(:: xfer += oprot->writeI32(this->bid); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += this->frame.write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 4); xfer += this->request.write(oprot); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("response", ::apache::thrift::protocol::T_STRUCT, 4); + xfer += oprot->writeFieldBegin("response", ::apache::thrift::protocol::T_STRUCT, 5); xfer += this->response.write(oprot); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("new_url", ::apache::thrift::protocol::T_STRING, 5); + xfer += oprot->writeFieldBegin("new_url", ::apache::thrift::protocol::T_STRING, 6); xfer += oprot->writeString(this->new_url); xfer += oprot->writeFieldEnd(); @@ -7350,15 +7570,19 @@ uint32_t ClientHandlers_ResourceRequestHandler_OnResourceRedirect_pargs::write(: xfer += oprot->writeI32((*(this->bid))); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += (*(this->frame)).write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 4); xfer += (*(this->request)).write(oprot); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("response", ::apache::thrift::protocol::T_STRUCT, 4); + xfer += oprot->writeFieldBegin("response", ::apache::thrift::protocol::T_STRUCT, 5); xfer += (*(this->response)).write(oprot); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("new_url", ::apache::thrift::protocol::T_STRING, 5); + xfer += oprot->writeFieldBegin("new_url", ::apache::thrift::protocol::T_STRING, 6); xfer += oprot->writeString((*(this->new_url))); xfer += oprot->writeFieldEnd(); @@ -7519,13 +7743,21 @@ uint32_t ClientHandlers_ResourceRequestHandler_OnResourceResponse_args::read(::a break; case 3: if (ftype == ::apache::thrift::protocol::T_STRUCT) { + xfer += this->frame.read(iprot); + this->__isset.frame = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 4: + if (ftype == ::apache::thrift::protocol::T_STRUCT) { xfer += this->request.read(iprot); this->__isset.request = true; } else { xfer += iprot->skip(ftype); } break; - case 4: + case 5: if (ftype == ::apache::thrift::protocol::T_STRUCT) { xfer += this->response.read(iprot); this->__isset.response = true; @@ -7558,11 +7790,15 @@ uint32_t ClientHandlers_ResourceRequestHandler_OnResourceResponse_args::write(:: xfer += oprot->writeI32(this->bid); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += this->frame.write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 4); xfer += this->request.write(oprot); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("response", ::apache::thrift::protocol::T_STRUCT, 4); + xfer += oprot->writeFieldBegin("response", ::apache::thrift::protocol::T_STRUCT, 5); xfer += this->response.write(oprot); xfer += oprot->writeFieldEnd(); @@ -7589,11 +7825,15 @@ uint32_t ClientHandlers_ResourceRequestHandler_OnResourceResponse_pargs::write(: xfer += oprot->writeI32((*(this->bid))); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += (*(this->frame)).write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 4); xfer += (*(this->request)).write(oprot); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("response", ::apache::thrift::protocol::T_STRUCT, 4); + xfer += oprot->writeFieldBegin("response", ::apache::thrift::protocol::T_STRUCT, 5); xfer += (*(this->response)).write(oprot); xfer += oprot->writeFieldEnd(); @@ -7754,13 +7994,21 @@ uint32_t ClientHandlers_ResourceRequestHandler_OnResourceLoadComplete_args::read break; case 3: if (ftype == ::apache::thrift::protocol::T_STRUCT) { + xfer += this->frame.read(iprot); + this->__isset.frame = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 4: + if (ftype == ::apache::thrift::protocol::T_STRUCT) { xfer += this->request.read(iprot); this->__isset.request = true; } else { xfer += iprot->skip(ftype); } break; - case 4: + case 5: if (ftype == ::apache::thrift::protocol::T_STRUCT) { xfer += this->response.read(iprot); this->__isset.response = true; @@ -7768,7 +8016,7 @@ uint32_t ClientHandlers_ResourceRequestHandler_OnResourceLoadComplete_args::read xfer += iprot->skip(ftype); } break; - case 5: + case 6: if (ftype == ::apache::thrift::protocol::T_STRING) { xfer += iprot->readString(this->status); this->__isset.status = true; @@ -7776,7 +8024,7 @@ uint32_t ClientHandlers_ResourceRequestHandler_OnResourceLoadComplete_args::read xfer += iprot->skip(ftype); } break; - case 6: + case 7: if (ftype == ::apache::thrift::protocol::T_I64) { xfer += iprot->readI64(this->receivedContentLength); this->__isset.receivedContentLength = true; @@ -7809,19 +8057,23 @@ uint32_t ClientHandlers_ResourceRequestHandler_OnResourceLoadComplete_args::writ xfer += oprot->writeI32(this->bid); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += this->frame.write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 4); xfer += this->request.write(oprot); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("response", ::apache::thrift::protocol::T_STRUCT, 4); + xfer += oprot->writeFieldBegin("response", ::apache::thrift::protocol::T_STRUCT, 5); xfer += this->response.write(oprot); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("status", ::apache::thrift::protocol::T_STRING, 5); + xfer += oprot->writeFieldBegin("status", ::apache::thrift::protocol::T_STRING, 6); xfer += oprot->writeString(this->status); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("receivedContentLength", ::apache::thrift::protocol::T_I64, 6); + xfer += oprot->writeFieldBegin("receivedContentLength", ::apache::thrift::protocol::T_I64, 7); xfer += oprot->writeI64(this->receivedContentLength); xfer += oprot->writeFieldEnd(); @@ -7848,19 +8100,23 @@ uint32_t ClientHandlers_ResourceRequestHandler_OnResourceLoadComplete_pargs::wri xfer += oprot->writeI32((*(this->bid))); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += (*(this->frame)).write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 4); xfer += (*(this->request)).write(oprot); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("response", ::apache::thrift::protocol::T_STRUCT, 4); + xfer += oprot->writeFieldBegin("response", ::apache::thrift::protocol::T_STRUCT, 5); xfer += (*(this->response)).write(oprot); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("status", ::apache::thrift::protocol::T_STRING, 5); + xfer += oprot->writeFieldBegin("status", ::apache::thrift::protocol::T_STRING, 6); xfer += oprot->writeString((*(this->status))); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("receivedContentLength", ::apache::thrift::protocol::T_I64, 6); + xfer += oprot->writeFieldBegin("receivedContentLength", ::apache::thrift::protocol::T_I64, 7); xfer += oprot->writeI64((*(this->receivedContentLength))); xfer += oprot->writeFieldEnd(); @@ -7990,13 +8246,21 @@ uint32_t ClientHandlers_ResourceRequestHandler_OnProtocolExecution_args::read(:: break; case 3: if (ftype == ::apache::thrift::protocol::T_STRUCT) { + xfer += this->frame.read(iprot); + this->__isset.frame = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 4: + if (ftype == ::apache::thrift::protocol::T_STRUCT) { xfer += this->request.read(iprot); this->__isset.request = true; } else { xfer += iprot->skip(ftype); } break; - case 4: + case 5: if (ftype == ::apache::thrift::protocol::T_BOOL) { xfer += iprot->readBool(this->allowOsExecution); this->__isset.allowOsExecution = true; @@ -8029,11 +8293,15 @@ uint32_t ClientHandlers_ResourceRequestHandler_OnProtocolExecution_args::write(: xfer += oprot->writeI32(this->bid); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += this->frame.write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 4); xfer += this->request.write(oprot); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("allowOsExecution", ::apache::thrift::protocol::T_BOOL, 4); + xfer += oprot->writeFieldBegin("allowOsExecution", ::apache::thrift::protocol::T_BOOL, 5); xfer += oprot->writeBool(this->allowOsExecution); xfer += oprot->writeFieldEnd(); @@ -8060,11 +8328,15 @@ uint32_t ClientHandlers_ResourceRequestHandler_OnProtocolExecution_pargs::write( xfer += oprot->writeI32((*(this->bid))); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += (*(this->frame)).write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 4); xfer += (*(this->request)).write(oprot); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("allowOsExecution", ::apache::thrift::protocol::T_BOOL, 4); + xfer += oprot->writeFieldBegin("allowOsExecution", ::apache::thrift::protocol::T_BOOL, 5); xfer += oprot->writeBool((*(this->allowOsExecution))); xfer += oprot->writeFieldEnd(); @@ -8224,6 +8496,14 @@ uint32_t ClientHandlers_MessageRouterHandler_onQuery_args::read(::apache::thrift } break; case 3: + if (ftype == ::apache::thrift::protocol::T_STRUCT) { + xfer += this->frame.read(iprot); + this->__isset.frame = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 4: if (ftype == ::apache::thrift::protocol::T_I64) { xfer += iprot->readI64(this->queryId); this->__isset.queryId = true; @@ -8231,7 +8511,7 @@ uint32_t ClientHandlers_MessageRouterHandler_onQuery_args::read(::apache::thrift xfer += iprot->skip(ftype); } break; - case 4: + case 5: if (ftype == ::apache::thrift::protocol::T_STRING) { xfer += iprot->readString(this->request); this->__isset.request = true; @@ -8239,7 +8519,7 @@ uint32_t ClientHandlers_MessageRouterHandler_onQuery_args::read(::apache::thrift xfer += iprot->skip(ftype); } break; - case 5: + case 6: if (ftype == ::apache::thrift::protocol::T_BOOL) { xfer += iprot->readBool(this->persistent); this->__isset.persistent = true; @@ -8247,7 +8527,7 @@ uint32_t ClientHandlers_MessageRouterHandler_onQuery_args::read(::apache::thrift xfer += iprot->skip(ftype); } break; - case 6: + case 7: if (ftype == ::apache::thrift::protocol::T_STRUCT) { xfer += this->queryCallback.read(iprot); this->__isset.queryCallback = true; @@ -8280,19 +8560,23 @@ uint32_t ClientHandlers_MessageRouterHandler_onQuery_args::write(::apache::thrif xfer += oprot->writeI32(this->bid); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("queryId", ::apache::thrift::protocol::T_I64, 3); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += this->frame.write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("queryId", ::apache::thrift::protocol::T_I64, 4); xfer += oprot->writeI64(this->queryId); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRING, 4); + xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRING, 5); xfer += oprot->writeString(this->request); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("persistent", ::apache::thrift::protocol::T_BOOL, 5); + xfer += oprot->writeFieldBegin("persistent", ::apache::thrift::protocol::T_BOOL, 6); xfer += oprot->writeBool(this->persistent); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("queryCallback", ::apache::thrift::protocol::T_STRUCT, 6); + xfer += oprot->writeFieldBegin("queryCallback", ::apache::thrift::protocol::T_STRUCT, 7); xfer += this->queryCallback.write(oprot); xfer += oprot->writeFieldEnd(); @@ -8319,19 +8603,23 @@ uint32_t ClientHandlers_MessageRouterHandler_onQuery_pargs::write(::apache::thri xfer += oprot->writeI32((*(this->bid))); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("queryId", ::apache::thrift::protocol::T_I64, 3); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += (*(this->frame)).write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("queryId", ::apache::thrift::protocol::T_I64, 4); xfer += oprot->writeI64((*(this->queryId))); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRING, 4); + xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRING, 5); xfer += oprot->writeString((*(this->request))); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("persistent", ::apache::thrift::protocol::T_BOOL, 5); + xfer += oprot->writeFieldBegin("persistent", ::apache::thrift::protocol::T_BOOL, 6); xfer += oprot->writeBool((*(this->persistent))); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("queryCallback", ::apache::thrift::protocol::T_STRUCT, 6); + xfer += oprot->writeFieldBegin("queryCallback", ::apache::thrift::protocol::T_STRUCT, 7); xfer += (*(this->queryCallback)).write(oprot); xfer += oprot->writeFieldEnd(); @@ -8491,6 +8779,14 @@ uint32_t ClientHandlers_MessageRouterHandler_onQueryCanceled_args::read(::apache } break; case 3: + if (ftype == ::apache::thrift::protocol::T_STRUCT) { + xfer += this->frame.read(iprot); + this->__isset.frame = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 4: if (ftype == ::apache::thrift::protocol::T_I64) { xfer += iprot->readI64(this->queryId); this->__isset.queryId = true; @@ -8523,7 +8819,11 @@ uint32_t ClientHandlers_MessageRouterHandler_onQueryCanceled_args::write(::apach xfer += oprot->writeI32(this->bid); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("queryId", ::apache::thrift::protocol::T_I64, 3); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += this->frame.write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("queryId", ::apache::thrift::protocol::T_I64, 4); xfer += oprot->writeI64(this->queryId); xfer += oprot->writeFieldEnd(); @@ -8550,7 +8850,11 @@ uint32_t ClientHandlers_MessageRouterHandler_onQueryCanceled_pargs::write(::apac xfer += oprot->writeI32((*(this->bid))); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("queryId", ::apache::thrift::protocol::T_I64, 3); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += (*(this->frame)).write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("queryId", ::apache::thrift::protocol::T_I64, 4); xfer += oprot->writeI64((*(this->queryId))); xfer += oprot->writeFieldEnd(); @@ -8681,6 +8985,14 @@ uint32_t ClientHandlers_SchemeHandlerFactory_CreateHandler_args::read(::apache:: } break; case 3: + if (ftype == ::apache::thrift::protocol::T_STRUCT) { + xfer += this->frame.read(iprot); + this->__isset.frame = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 4: if (ftype == ::apache::thrift::protocol::T_STRING) { xfer += iprot->readString(this->scheme_name); this->__isset.scheme_name = true; @@ -8688,7 +9000,7 @@ uint32_t ClientHandlers_SchemeHandlerFactory_CreateHandler_args::read(::apache:: xfer += iprot->skip(ftype); } break; - case 4: + case 5: if (ftype == ::apache::thrift::protocol::T_STRUCT) { xfer += this->request.read(iprot); this->__isset.request = true; @@ -8721,11 +9033,15 @@ uint32_t ClientHandlers_SchemeHandlerFactory_CreateHandler_args::write(::apache: xfer += oprot->writeI32(this->bid); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("scheme_name", ::apache::thrift::protocol::T_STRING, 3); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += this->frame.write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("scheme_name", ::apache::thrift::protocol::T_STRING, 4); xfer += oprot->writeString(this->scheme_name); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 4); + xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 5); xfer += this->request.write(oprot); xfer += oprot->writeFieldEnd(); @@ -8752,11 +9068,15 @@ uint32_t ClientHandlers_SchemeHandlerFactory_CreateHandler_pargs::write(::apache xfer += oprot->writeI32((*(this->bid))); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("scheme_name", ::apache::thrift::protocol::T_STRING, 3); + xfer += oprot->writeFieldBegin("frame", ::apache::thrift::protocol::T_STRUCT, 3); + xfer += (*(this->frame)).write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("scheme_name", ::apache::thrift::protocol::T_STRING, 4); xfer += oprot->writeString((*(this->scheme_name))); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 4); + xfer += oprot->writeFieldBegin("request", ::apache::thrift::protocol::T_STRUCT, 5); xfer += (*(this->request)).write(oprot); xfer += oprot->writeFieldEnd(); @@ -9281,19 +9601,20 @@ void ClientHandlersClient::recv_RenderHandler_OnPaint() return; } -bool ClientHandlersClient::LifeSpanHandler_OnBeforePopup(const int32_t bid, const std::string& url, const std::string& frameName, const bool gesture) +bool ClientHandlersClient::LifeSpanHandler_OnBeforePopup(const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& url, const std::string& frameName, const bool gesture) { - send_LifeSpanHandler_OnBeforePopup(bid, url, frameName, gesture); + send_LifeSpanHandler_OnBeforePopup(bid, frame, url, frameName, gesture); return recv_LifeSpanHandler_OnBeforePopup(); } -void ClientHandlersClient::send_LifeSpanHandler_OnBeforePopup(const int32_t bid, const std::string& url, const std::string& frameName, const bool gesture) +void ClientHandlersClient::send_LifeSpanHandler_OnBeforePopup(const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& url, const std::string& frameName, const bool gesture) { int32_t cseqid = 0; oprot_->writeMessageBegin("LifeSpanHandler_OnBeforePopup", ::apache::thrift::protocol::T_CALL, cseqid); ClientHandlers_LifeSpanHandler_OnBeforePopup_pargs args; args.bid = &bid; + args.frame = &frame; args.url = &url; args.frameName = &frameName; args.gesture = &gesture; @@ -9461,18 +9782,19 @@ void ClientHandlersClient::send_LoadHandler_OnLoadingStateChange(const int32_t b oprot_->getTransport()->flush(); } -void ClientHandlersClient::LoadHandler_OnLoadStart(const int32_t bid, const int32_t transition_type) +void ClientHandlersClient::LoadHandler_OnLoadStart(const int32_t bid, const ::thrift_codegen::RObject& frame, const int32_t transition_type) { - send_LoadHandler_OnLoadStart(bid, transition_type); + send_LoadHandler_OnLoadStart(bid, frame, transition_type); } -void ClientHandlersClient::send_LoadHandler_OnLoadStart(const int32_t bid, const int32_t transition_type) +void ClientHandlersClient::send_LoadHandler_OnLoadStart(const int32_t bid, const ::thrift_codegen::RObject& frame, const int32_t transition_type) { int32_t cseqid = 0; oprot_->writeMessageBegin("LoadHandler_OnLoadStart", ::apache::thrift::protocol::T_ONEWAY, cseqid); ClientHandlers_LoadHandler_OnLoadStart_pargs args; args.bid = &bid; + args.frame = &frame; args.transition_type = &transition_type; args.write(oprot_); @@ -9481,18 +9803,19 @@ void ClientHandlersClient::send_LoadHandler_OnLoadStart(const int32_t bid, const oprot_->getTransport()->flush(); } -void ClientHandlersClient::LoadHandler_OnLoadEnd(const int32_t bid, const int32_t httpStatusCode) +void ClientHandlersClient::LoadHandler_OnLoadEnd(const int32_t bid, const ::thrift_codegen::RObject& frame, const int32_t httpStatusCode) { - send_LoadHandler_OnLoadEnd(bid, httpStatusCode); + send_LoadHandler_OnLoadEnd(bid, frame, httpStatusCode); } -void ClientHandlersClient::send_LoadHandler_OnLoadEnd(const int32_t bid, const int32_t httpStatusCode) +void ClientHandlersClient::send_LoadHandler_OnLoadEnd(const int32_t bid, const ::thrift_codegen::RObject& frame, const int32_t httpStatusCode) { int32_t cseqid = 0; oprot_->writeMessageBegin("LoadHandler_OnLoadEnd", ::apache::thrift::protocol::T_ONEWAY, cseqid); ClientHandlers_LoadHandler_OnLoadEnd_pargs args; args.bid = &bid; + args.frame = &frame; args.httpStatusCode = &httpStatusCode; args.write(oprot_); @@ -9501,18 +9824,19 @@ void ClientHandlersClient::send_LoadHandler_OnLoadEnd(const int32_t bid, const i oprot_->getTransport()->flush(); } -void ClientHandlersClient::LoadHandler_OnLoadError(const int32_t bid, const int32_t errorCode, const std::string& errorText, const std::string& failedUrl) +void ClientHandlersClient::LoadHandler_OnLoadError(const int32_t bid, const ::thrift_codegen::RObject& frame, const int32_t errorCode, const std::string& errorText, const std::string& failedUrl) { - send_LoadHandler_OnLoadError(bid, errorCode, errorText, failedUrl); + send_LoadHandler_OnLoadError(bid, frame, errorCode, errorText, failedUrl); } -void ClientHandlersClient::send_LoadHandler_OnLoadError(const int32_t bid, const int32_t errorCode, const std::string& errorText, const std::string& failedUrl) +void ClientHandlersClient::send_LoadHandler_OnLoadError(const int32_t bid, const ::thrift_codegen::RObject& frame, const int32_t errorCode, const std::string& errorText, const std::string& failedUrl) { int32_t cseqid = 0; oprot_->writeMessageBegin("LoadHandler_OnLoadError", ::apache::thrift::protocol::T_ONEWAY, cseqid); ClientHandlers_LoadHandler_OnLoadError_pargs args; args.bid = &bid; + args.frame = &frame; args.errorCode = &errorCode; args.errorText = &errorText; args.failedUrl = &failedUrl; @@ -9523,18 +9847,19 @@ void ClientHandlersClient::send_LoadHandler_OnLoadError(const int32_t bid, const oprot_->getTransport()->flush(); } -void ClientHandlersClient::DisplayHandler_OnAddressChange(const int32_t bid, const std::string& url) +void ClientHandlersClient::DisplayHandler_OnAddressChange(const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& url) { - send_DisplayHandler_OnAddressChange(bid, url); + send_DisplayHandler_OnAddressChange(bid, frame, url); } -void ClientHandlersClient::send_DisplayHandler_OnAddressChange(const int32_t bid, const std::string& url) +void ClientHandlersClient::send_DisplayHandler_OnAddressChange(const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& url) { int32_t cseqid = 0; oprot_->writeMessageBegin("DisplayHandler_OnAddressChange", ::apache::thrift::protocol::T_ONEWAY, cseqid); ClientHandlers_DisplayHandler_OnAddressChange_pargs args; args.bid = &bid; + args.frame = &frame; args.url = &url; args.write(oprot_); @@ -9920,19 +10245,20 @@ void ClientHandlersClient::send_FocusHandler_OnGotFocus(const int32_t bid) oprot_->getTransport()->flush(); } -bool ClientHandlersClient::RequestHandler_OnBeforeBrowse(const int32_t bid, const ::thrift_codegen::RObject& request, const bool user_gesture, const bool is_redirect) +bool ClientHandlersClient::RequestHandler_OnBeforeBrowse(const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const bool user_gesture, const bool is_redirect) { - send_RequestHandler_OnBeforeBrowse(bid, request, user_gesture, is_redirect); + send_RequestHandler_OnBeforeBrowse(bid, frame, request, user_gesture, is_redirect); return recv_RequestHandler_OnBeforeBrowse(); } -void ClientHandlersClient::send_RequestHandler_OnBeforeBrowse(const int32_t bid, const ::thrift_codegen::RObject& request, const bool user_gesture, const bool is_redirect) +void ClientHandlersClient::send_RequestHandler_OnBeforeBrowse(const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const bool user_gesture, const bool is_redirect) { int32_t cseqid = 0; oprot_->writeMessageBegin("RequestHandler_OnBeforeBrowse", ::apache::thrift::protocol::T_CALL, cseqid); ClientHandlers_RequestHandler_OnBeforeBrowse_pargs args; args.bid = &bid; + args.frame = &frame; args.request = &request; args.user_gesture = &user_gesture; args.is_redirect = &is_redirect; @@ -9981,19 +10307,20 @@ bool ClientHandlersClient::recv_RequestHandler_OnBeforeBrowse() throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "RequestHandler_OnBeforeBrowse failed: unknown result"); } -bool ClientHandlersClient::RequestHandler_OnOpenURLFromTab(const int32_t bid, const std::string& target_url, const bool user_gesture) +bool ClientHandlersClient::RequestHandler_OnOpenURLFromTab(const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& target_url, const bool user_gesture) { - send_RequestHandler_OnOpenURLFromTab(bid, target_url, user_gesture); + send_RequestHandler_OnOpenURLFromTab(bid, frame, target_url, user_gesture); return recv_RequestHandler_OnOpenURLFromTab(); } -void ClientHandlersClient::send_RequestHandler_OnOpenURLFromTab(const int32_t bid, const std::string& target_url, const bool user_gesture) +void ClientHandlersClient::send_RequestHandler_OnOpenURLFromTab(const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& target_url, const bool user_gesture) { int32_t cseqid = 0; oprot_->writeMessageBegin("RequestHandler_OnOpenURLFromTab", ::apache::thrift::protocol::T_CALL, cseqid); ClientHandlers_RequestHandler_OnOpenURLFromTab_pargs args; args.bid = &bid; + args.frame = &frame; args.target_url = &target_url; args.user_gesture = &user_gesture; args.write(oprot_); @@ -10188,19 +10515,20 @@ void ClientHandlersClient::send_RequestHandler_OnRenderProcessTerminated(const i oprot_->getTransport()->flush(); } -void ClientHandlersClient::RequestHandler_GetResourceRequestHandler( ::thrift_codegen::RObject& _return, const int32_t bid, const ::thrift_codegen::RObject& request, const bool isNavigation, const bool isDownload, const std::string& requestInitiator) +void ClientHandlersClient::RequestHandler_GetResourceRequestHandler( ::thrift_codegen::RObject& _return, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const bool isNavigation, const bool isDownload, const std::string& requestInitiator) { - send_RequestHandler_GetResourceRequestHandler(bid, request, isNavigation, isDownload, requestInitiator); + send_RequestHandler_GetResourceRequestHandler(bid, frame, request, isNavigation, isDownload, requestInitiator); recv_RequestHandler_GetResourceRequestHandler(_return); } -void ClientHandlersClient::send_RequestHandler_GetResourceRequestHandler(const int32_t bid, const ::thrift_codegen::RObject& request, const bool isNavigation, const bool isDownload, const std::string& requestInitiator) +void ClientHandlersClient::send_RequestHandler_GetResourceRequestHandler(const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const bool isNavigation, const bool isDownload, const std::string& requestInitiator) { int32_t cseqid = 0; oprot_->writeMessageBegin("RequestHandler_GetResourceRequestHandler", ::apache::thrift::protocol::T_CALL, cseqid); ClientHandlers_RequestHandler_GetResourceRequestHandler_pargs args; args.bid = &bid; + args.frame = &frame; args.request = &request; args.isNavigation = &isNavigation; args.isDownload = &isDownload; @@ -10269,13 +10597,13 @@ void ClientHandlersClient::send_ResourceRequestHandler_Dispose(const int32_t rrH oprot_->getTransport()->flush(); } -void ClientHandlersClient::ResourceRequestHandler_GetCookieAccessFilter( ::thrift_codegen::RObject& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request) +void ClientHandlersClient::ResourceRequestHandler_GetCookieAccessFilter( ::thrift_codegen::RObject& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request) { - send_ResourceRequestHandler_GetCookieAccessFilter(rrHandler, bid, request); + send_ResourceRequestHandler_GetCookieAccessFilter(rrHandler, bid, frame, request); recv_ResourceRequestHandler_GetCookieAccessFilter(_return); } -void ClientHandlersClient::send_ResourceRequestHandler_GetCookieAccessFilter(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request) +void ClientHandlersClient::send_ResourceRequestHandler_GetCookieAccessFilter(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request) { int32_t cseqid = 0; oprot_->writeMessageBegin("ResourceRequestHandler_GetCookieAccessFilter", ::apache::thrift::protocol::T_CALL, cseqid); @@ -10283,6 +10611,7 @@ void ClientHandlersClient::send_ResourceRequestHandler_GetCookieAccessFilter(con ClientHandlers_ResourceRequestHandler_GetCookieAccessFilter_pargs args; args.rrHandler = &rrHandler; args.bid = &bid; + args.frame = &frame; args.request = &request; args.write(oprot_); @@ -10348,13 +10677,13 @@ void ClientHandlersClient::send_CookieAccessFilter_Dispose(const int32_t filter) oprot_->getTransport()->flush(); } -bool ClientHandlersClient::CookieAccessFilter_CanSendCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& request, const std::vector<std::string> & cookie) +bool ClientHandlersClient::CookieAccessFilter_CanSendCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const std::vector<std::string> & cookie) { - send_CookieAccessFilter_CanSendCookie(filter, bid, request, cookie); + send_CookieAccessFilter_CanSendCookie(filter, bid, frame, request, cookie); return recv_CookieAccessFilter_CanSendCookie(); } -void ClientHandlersClient::send_CookieAccessFilter_CanSendCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& request, const std::vector<std::string> & cookie) +void ClientHandlersClient::send_CookieAccessFilter_CanSendCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const std::vector<std::string> & cookie) { int32_t cseqid = 0; oprot_->writeMessageBegin("CookieAccessFilter_CanSendCookie", ::apache::thrift::protocol::T_CALL, cseqid); @@ -10362,6 +10691,7 @@ void ClientHandlersClient::send_CookieAccessFilter_CanSendCookie(const int32_t f ClientHandlers_CookieAccessFilter_CanSendCookie_pargs args; args.filter = &filter; args.bid = &bid; + args.frame = &frame; args.request = &request; args.cookie = &cookie; args.write(oprot_); @@ -10409,13 +10739,13 @@ bool ClientHandlersClient::recv_CookieAccessFilter_CanSendCookie() throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "CookieAccessFilter_CanSendCookie failed: unknown result"); } -bool ClientHandlersClient::CookieAccessFilter_CanSaveCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::vector<std::string> & cookie) +bool ClientHandlersClient::CookieAccessFilter_CanSaveCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::vector<std::string> & cookie) { - send_CookieAccessFilter_CanSaveCookie(filter, bid, request, response, cookie); + send_CookieAccessFilter_CanSaveCookie(filter, bid, frame, request, response, cookie); return recv_CookieAccessFilter_CanSaveCookie(); } -void ClientHandlersClient::send_CookieAccessFilter_CanSaveCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::vector<std::string> & cookie) +void ClientHandlersClient::send_CookieAccessFilter_CanSaveCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::vector<std::string> & cookie) { int32_t cseqid = 0; oprot_->writeMessageBegin("CookieAccessFilter_CanSaveCookie", ::apache::thrift::protocol::T_CALL, cseqid); @@ -10423,6 +10753,7 @@ void ClientHandlersClient::send_CookieAccessFilter_CanSaveCookie(const int32_t f ClientHandlers_CookieAccessFilter_CanSaveCookie_pargs args; args.filter = &filter; args.bid = &bid; + args.frame = &frame; args.request = &request; args.response = &response; args.cookie = &cookie; @@ -10471,13 +10802,13 @@ bool ClientHandlersClient::recv_CookieAccessFilter_CanSaveCookie() throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "CookieAccessFilter_CanSaveCookie failed: unknown result"); } -bool ClientHandlersClient::ResourceRequestHandler_OnBeforeResourceLoad(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request) +bool ClientHandlersClient::ResourceRequestHandler_OnBeforeResourceLoad(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request) { - send_ResourceRequestHandler_OnBeforeResourceLoad(rrHandler, bid, request); + send_ResourceRequestHandler_OnBeforeResourceLoad(rrHandler, bid, frame, request); return recv_ResourceRequestHandler_OnBeforeResourceLoad(); } -void ClientHandlersClient::send_ResourceRequestHandler_OnBeforeResourceLoad(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request) +void ClientHandlersClient::send_ResourceRequestHandler_OnBeforeResourceLoad(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request) { int32_t cseqid = 0; oprot_->writeMessageBegin("ResourceRequestHandler_OnBeforeResourceLoad", ::apache::thrift::protocol::T_CALL, cseqid); @@ -10485,6 +10816,7 @@ void ClientHandlersClient::send_ResourceRequestHandler_OnBeforeResourceLoad(cons ClientHandlers_ResourceRequestHandler_OnBeforeResourceLoad_pargs args; args.rrHandler = &rrHandler; args.bid = &bid; + args.frame = &frame; args.request = &request; args.write(oprot_); @@ -10531,13 +10863,13 @@ bool ClientHandlersClient::recv_ResourceRequestHandler_OnBeforeResourceLoad() throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "ResourceRequestHandler_OnBeforeResourceLoad failed: unknown result"); } -void ClientHandlersClient::ResourceRequestHandler_GetResourceHandler( ::thrift_codegen::RObject& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request) +void ClientHandlersClient::ResourceRequestHandler_GetResourceHandler( ::thrift_codegen::RObject& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request) { - send_ResourceRequestHandler_GetResourceHandler(rrHandler, bid, request); + send_ResourceRequestHandler_GetResourceHandler(rrHandler, bid, frame, request); recv_ResourceRequestHandler_GetResourceHandler(_return); } -void ClientHandlersClient::send_ResourceRequestHandler_GetResourceHandler(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request) +void ClientHandlersClient::send_ResourceRequestHandler_GetResourceHandler(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request) { int32_t cseqid = 0; oprot_->writeMessageBegin("ResourceRequestHandler_GetResourceHandler", ::apache::thrift::protocol::T_CALL, cseqid); @@ -10545,6 +10877,7 @@ void ClientHandlersClient::send_ResourceRequestHandler_GetResourceHandler(const ClientHandlers_ResourceRequestHandler_GetResourceHandler_pargs args; args.rrHandler = &rrHandler; args.bid = &bid; + args.frame = &frame; args.request = &request; args.write(oprot_); @@ -10808,13 +11141,13 @@ void ClientHandlersClient::send_ResourceHandler_Cancel(const int32_t resourceHan oprot_->getTransport()->flush(); } -void ClientHandlersClient::ResourceRequestHandler_OnResourceRedirect(std::string& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& new_url) +void ClientHandlersClient::ResourceRequestHandler_OnResourceRedirect(std::string& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& new_url) { - send_ResourceRequestHandler_OnResourceRedirect(rrHandler, bid, request, response, new_url); + send_ResourceRequestHandler_OnResourceRedirect(rrHandler, bid, frame, request, response, new_url); recv_ResourceRequestHandler_OnResourceRedirect(_return); } -void ClientHandlersClient::send_ResourceRequestHandler_OnResourceRedirect(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& new_url) +void ClientHandlersClient::send_ResourceRequestHandler_OnResourceRedirect(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& new_url) { int32_t cseqid = 0; oprot_->writeMessageBegin("ResourceRequestHandler_OnResourceRedirect", ::apache::thrift::protocol::T_CALL, cseqid); @@ -10822,6 +11155,7 @@ void ClientHandlersClient::send_ResourceRequestHandler_OnResourceRedirect(const ClientHandlers_ResourceRequestHandler_OnResourceRedirect_pargs args; args.rrHandler = &rrHandler; args.bid = &bid; + args.frame = &frame; args.request = &request; args.response = &response; args.new_url = &new_url; @@ -10870,13 +11204,13 @@ void ClientHandlersClient::recv_ResourceRequestHandler_OnResourceRedirect(std::s throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "ResourceRequestHandler_OnResourceRedirect failed: unknown result"); } -bool ClientHandlersClient::ResourceRequestHandler_OnResourceResponse(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response) +bool ClientHandlersClient::ResourceRequestHandler_OnResourceResponse(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response) { - send_ResourceRequestHandler_OnResourceResponse(rrHandler, bid, request, response); + send_ResourceRequestHandler_OnResourceResponse(rrHandler, bid, frame, request, response); return recv_ResourceRequestHandler_OnResourceResponse(); } -void ClientHandlersClient::send_ResourceRequestHandler_OnResourceResponse(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response) +void ClientHandlersClient::send_ResourceRequestHandler_OnResourceResponse(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response) { int32_t cseqid = 0; oprot_->writeMessageBegin("ResourceRequestHandler_OnResourceResponse", ::apache::thrift::protocol::T_CALL, cseqid); @@ -10884,6 +11218,7 @@ void ClientHandlersClient::send_ResourceRequestHandler_OnResourceResponse(const ClientHandlers_ResourceRequestHandler_OnResourceResponse_pargs args; args.rrHandler = &rrHandler; args.bid = &bid; + args.frame = &frame; args.request = &request; args.response = &response; args.write(oprot_); @@ -10931,13 +11266,13 @@ bool ClientHandlersClient::recv_ResourceRequestHandler_OnResourceResponse() throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "ResourceRequestHandler_OnResourceResponse failed: unknown result"); } -void ClientHandlersClient::ResourceRequestHandler_OnResourceLoadComplete(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& status, const int64_t receivedContentLength) +void ClientHandlersClient::ResourceRequestHandler_OnResourceLoadComplete(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& status, const int64_t receivedContentLength) { - send_ResourceRequestHandler_OnResourceLoadComplete(rrHandler, bid, request, response, status, receivedContentLength); + send_ResourceRequestHandler_OnResourceLoadComplete(rrHandler, bid, frame, request, response, status, receivedContentLength); recv_ResourceRequestHandler_OnResourceLoadComplete(); } -void ClientHandlersClient::send_ResourceRequestHandler_OnResourceLoadComplete(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& status, const int64_t receivedContentLength) +void ClientHandlersClient::send_ResourceRequestHandler_OnResourceLoadComplete(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& status, const int64_t receivedContentLength) { int32_t cseqid = 0; oprot_->writeMessageBegin("ResourceRequestHandler_OnResourceLoadComplete", ::apache::thrift::protocol::T_CALL, cseqid); @@ -10945,6 +11280,7 @@ void ClientHandlersClient::send_ResourceRequestHandler_OnResourceLoadComplete(co ClientHandlers_ResourceRequestHandler_OnResourceLoadComplete_pargs args; args.rrHandler = &rrHandler; args.bid = &bid; + args.frame = &frame; args.request = &request; args.response = &response; args.status = &status; @@ -10989,13 +11325,13 @@ void ClientHandlersClient::recv_ResourceRequestHandler_OnResourceLoadComplete() return; } -bool ClientHandlersClient::ResourceRequestHandler_OnProtocolExecution(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const bool allowOsExecution) +bool ClientHandlersClient::ResourceRequestHandler_OnProtocolExecution(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const bool allowOsExecution) { - send_ResourceRequestHandler_OnProtocolExecution(rrHandler, bid, request, allowOsExecution); + send_ResourceRequestHandler_OnProtocolExecution(rrHandler, bid, frame, request, allowOsExecution); return recv_ResourceRequestHandler_OnProtocolExecution(); } -void ClientHandlersClient::send_ResourceRequestHandler_OnProtocolExecution(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const bool allowOsExecution) +void ClientHandlersClient::send_ResourceRequestHandler_OnProtocolExecution(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const bool allowOsExecution) { int32_t cseqid = 0; oprot_->writeMessageBegin("ResourceRequestHandler_OnProtocolExecution", ::apache::thrift::protocol::T_CALL, cseqid); @@ -11003,6 +11339,7 @@ void ClientHandlersClient::send_ResourceRequestHandler_OnProtocolExecution(const ClientHandlers_ResourceRequestHandler_OnProtocolExecution_pargs args; args.rrHandler = &rrHandler; args.bid = &bid; + args.frame = &frame; args.request = &request; args.allowOsExecution = &allowOsExecution; args.write(oprot_); @@ -11050,13 +11387,13 @@ bool ClientHandlersClient::recv_ResourceRequestHandler_OnProtocolExecution() throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "ResourceRequestHandler_OnProtocolExecution failed: unknown result"); } -bool ClientHandlersClient::MessageRouterHandler_onQuery(const ::thrift_codegen::RObject& handler, const int32_t bid, const int64_t queryId, const std::string& request, const bool persistent, const ::thrift_codegen::RObject& queryCallback) +bool ClientHandlersClient::MessageRouterHandler_onQuery(const ::thrift_codegen::RObject& handler, const int32_t bid, const ::thrift_codegen::RObject& frame, const int64_t queryId, const std::string& request, const bool persistent, const ::thrift_codegen::RObject& queryCallback) { - send_MessageRouterHandler_onQuery(handler, bid, queryId, request, persistent, queryCallback); + send_MessageRouterHandler_onQuery(handler, bid, frame, queryId, request, persistent, queryCallback); return recv_MessageRouterHandler_onQuery(); } -void ClientHandlersClient::send_MessageRouterHandler_onQuery(const ::thrift_codegen::RObject& handler, const int32_t bid, const int64_t queryId, const std::string& request, const bool persistent, const ::thrift_codegen::RObject& queryCallback) +void ClientHandlersClient::send_MessageRouterHandler_onQuery(const ::thrift_codegen::RObject& handler, const int32_t bid, const ::thrift_codegen::RObject& frame, const int64_t queryId, const std::string& request, const bool persistent, const ::thrift_codegen::RObject& queryCallback) { int32_t cseqid = 0; oprot_->writeMessageBegin("MessageRouterHandler_onQuery", ::apache::thrift::protocol::T_CALL, cseqid); @@ -11064,6 +11401,7 @@ void ClientHandlersClient::send_MessageRouterHandler_onQuery(const ::thrift_cod ClientHandlers_MessageRouterHandler_onQuery_pargs args; args.handler = &handler; args.bid = &bid; + args.frame = &frame; args.queryId = &queryId; args.request = &request; args.persistent = &persistent; @@ -11113,12 +11451,12 @@ bool ClientHandlersClient::recv_MessageRouterHandler_onQuery() throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "MessageRouterHandler_onQuery failed: unknown result"); } -void ClientHandlersClient::MessageRouterHandler_onQueryCanceled(const ::thrift_codegen::RObject& handler, const int32_t bid, const int64_t queryId) +void ClientHandlersClient::MessageRouterHandler_onQueryCanceled(const ::thrift_codegen::RObject& handler, const int32_t bid, const ::thrift_codegen::RObject& frame, const int64_t queryId) { - send_MessageRouterHandler_onQueryCanceled(handler, bid, queryId); + send_MessageRouterHandler_onQueryCanceled(handler, bid, frame, queryId); } -void ClientHandlersClient::send_MessageRouterHandler_onQueryCanceled(const ::thrift_codegen::RObject& handler, const int32_t bid, const int64_t queryId) +void ClientHandlersClient::send_MessageRouterHandler_onQueryCanceled(const ::thrift_codegen::RObject& handler, const int32_t bid, const ::thrift_codegen::RObject& frame, const int64_t queryId) { int32_t cseqid = 0; oprot_->writeMessageBegin("MessageRouterHandler_onQueryCanceled", ::apache::thrift::protocol::T_ONEWAY, cseqid); @@ -11126,6 +11464,7 @@ void ClientHandlersClient::send_MessageRouterHandler_onQueryCanceled(const ::th ClientHandlers_MessageRouterHandler_onQueryCanceled_pargs args; args.handler = &handler; args.bid = &bid; + args.frame = &frame; args.queryId = &queryId; args.write(oprot_); @@ -11153,13 +11492,13 @@ void ClientHandlersClient::send_MessageRouterHandler_Dispose(const int32_t handl oprot_->getTransport()->flush(); } -void ClientHandlersClient::SchemeHandlerFactory_CreateHandler( ::thrift_codegen::RObject& _return, const int32_t schemeHandlerFactory, const int32_t bid, const std::string& scheme_name, const ::thrift_codegen::RObject& request) +void ClientHandlersClient::SchemeHandlerFactory_CreateHandler( ::thrift_codegen::RObject& _return, const int32_t schemeHandlerFactory, const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& scheme_name, const ::thrift_codegen::RObject& request) { - send_SchemeHandlerFactory_CreateHandler(schemeHandlerFactory, bid, scheme_name, request); + send_SchemeHandlerFactory_CreateHandler(schemeHandlerFactory, bid, frame, scheme_name, request); recv_SchemeHandlerFactory_CreateHandler(_return); } -void ClientHandlersClient::send_SchemeHandlerFactory_CreateHandler(const int32_t schemeHandlerFactory, const int32_t bid, const std::string& scheme_name, const ::thrift_codegen::RObject& request) +void ClientHandlersClient::send_SchemeHandlerFactory_CreateHandler(const int32_t schemeHandlerFactory, const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& scheme_name, const ::thrift_codegen::RObject& request) { int32_t cseqid = 0; oprot_->writeMessageBegin("SchemeHandlerFactory_CreateHandler", ::apache::thrift::protocol::T_CALL, cseqid); @@ -11167,6 +11506,7 @@ void ClientHandlersClient::send_SchemeHandlerFactory_CreateHandler(const int32_t ClientHandlers_SchemeHandlerFactory_CreateHandler_pargs args; args.schemeHandlerFactory = &schemeHandlerFactory; args.bid = &bid; + args.frame = &frame; args.scheme_name = &scheme_name; args.request = &request; args.write(oprot_); @@ -11618,7 +11958,7 @@ void ClientHandlersProcessor::process_LifeSpanHandler_OnBeforePopup(int32_t seqi ClientHandlers_LifeSpanHandler_OnBeforePopup_result result; try { - result.success = iface_->LifeSpanHandler_OnBeforePopup(args.bid, args.url, args.frameName, args.gesture); + result.success = iface_->LifeSpanHandler_OnBeforePopup(args.bid, args.frame, args.url, args.frameName, args.gesture); result.__isset.success = true; } catch (const std::exception& e) { if (this->eventHandler_.get() != nullptr) { @@ -11836,7 +12176,7 @@ void ClientHandlersProcessor::process_LoadHandler_OnLoadStart(int32_t, ::apache: } try { - iface_->LoadHandler_OnLoadStart(args.bid, args.transition_type); + iface_->LoadHandler_OnLoadStart(args.bid, args.frame, args.transition_type); } catch (const std::exception&) { if (this->eventHandler_.get() != nullptr) { this->eventHandler_->handlerError(ctx, "ClientHandlers.LoadHandler_OnLoadStart"); @@ -11873,7 +12213,7 @@ void ClientHandlersProcessor::process_LoadHandler_OnLoadEnd(int32_t, ::apache::t } try { - iface_->LoadHandler_OnLoadEnd(args.bid, args.httpStatusCode); + iface_->LoadHandler_OnLoadEnd(args.bid, args.frame, args.httpStatusCode); } catch (const std::exception&) { if (this->eventHandler_.get() != nullptr) { this->eventHandler_->handlerError(ctx, "ClientHandlers.LoadHandler_OnLoadEnd"); @@ -11910,7 +12250,7 @@ void ClientHandlersProcessor::process_LoadHandler_OnLoadError(int32_t, ::apache: } try { - iface_->LoadHandler_OnLoadError(args.bid, args.errorCode, args.errorText, args.failedUrl); + iface_->LoadHandler_OnLoadError(args.bid, args.frame, args.errorCode, args.errorText, args.failedUrl); } catch (const std::exception&) { if (this->eventHandler_.get() != nullptr) { this->eventHandler_->handlerError(ctx, "ClientHandlers.LoadHandler_OnLoadError"); @@ -11947,7 +12287,7 @@ void ClientHandlersProcessor::process_DisplayHandler_OnAddressChange(int32_t, :: } try { - iface_->DisplayHandler_OnAddressChange(args.bid, args.url); + iface_->DisplayHandler_OnAddressChange(args.bid, args.frame, args.url); } catch (const std::exception&) { if (this->eventHandler_.get() != nullptr) { this->eventHandler_->handlerError(ctx, "ClientHandlers.DisplayHandler_OnAddressChange"); @@ -12403,7 +12743,7 @@ void ClientHandlersProcessor::process_RequestHandler_OnBeforeBrowse(int32_t seqi ClientHandlers_RequestHandler_OnBeforeBrowse_result result; try { - result.success = iface_->RequestHandler_OnBeforeBrowse(args.bid, args.request, args.user_gesture, args.is_redirect); + result.success = iface_->RequestHandler_OnBeforeBrowse(args.bid, args.frame, args.request, args.user_gesture, args.is_redirect); result.__isset.success = true; } catch (const std::exception& e) { if (this->eventHandler_.get() != nullptr) { @@ -12457,7 +12797,7 @@ void ClientHandlersProcessor::process_RequestHandler_OnOpenURLFromTab(int32_t se ClientHandlers_RequestHandler_OnOpenURLFromTab_result result; try { - result.success = iface_->RequestHandler_OnOpenURLFromTab(args.bid, args.target_url, args.user_gesture); + result.success = iface_->RequestHandler_OnOpenURLFromTab(args.bid, args.frame, args.target_url, args.user_gesture); result.__isset.success = true; } catch (const std::exception& e) { if (this->eventHandler_.get() != nullptr) { @@ -12656,7 +12996,7 @@ void ClientHandlersProcessor::process_RequestHandler_GetResourceRequestHandler(i ClientHandlers_RequestHandler_GetResourceRequestHandler_result result; try { - iface_->RequestHandler_GetResourceRequestHandler(result.success, args.bid, args.request, args.isNavigation, args.isDownload, args.requestInitiator); + iface_->RequestHandler_GetResourceRequestHandler(result.success, args.bid, args.frame, args.request, args.isNavigation, args.isDownload, args.requestInitiator); result.__isset.success = true; } catch (const std::exception& e) { if (this->eventHandler_.get() != nullptr) { @@ -12747,7 +13087,7 @@ void ClientHandlersProcessor::process_ResourceRequestHandler_GetCookieAccessFilt ClientHandlers_ResourceRequestHandler_GetCookieAccessFilter_result result; try { - iface_->ResourceRequestHandler_GetCookieAccessFilter(result.success, args.rrHandler, args.bid, args.request); + iface_->ResourceRequestHandler_GetCookieAccessFilter(result.success, args.rrHandler, args.bid, args.frame, args.request); result.__isset.success = true; } catch (const std::exception& e) { if (this->eventHandler_.get() != nullptr) { @@ -12838,7 +13178,7 @@ void ClientHandlersProcessor::process_CookieAccessFilter_CanSendCookie(int32_t s ClientHandlers_CookieAccessFilter_CanSendCookie_result result; try { - result.success = iface_->CookieAccessFilter_CanSendCookie(args.filter, args.bid, args.request, args.cookie); + result.success = iface_->CookieAccessFilter_CanSendCookie(args.filter, args.bid, args.frame, args.request, args.cookie); result.__isset.success = true; } catch (const std::exception& e) { if (this->eventHandler_.get() != nullptr) { @@ -12892,7 +13232,7 @@ void ClientHandlersProcessor::process_CookieAccessFilter_CanSaveCookie(int32_t s ClientHandlers_CookieAccessFilter_CanSaveCookie_result result; try { - result.success = iface_->CookieAccessFilter_CanSaveCookie(args.filter, args.bid, args.request, args.response, args.cookie); + result.success = iface_->CookieAccessFilter_CanSaveCookie(args.filter, args.bid, args.frame, args.request, args.response, args.cookie); result.__isset.success = true; } catch (const std::exception& e) { if (this->eventHandler_.get() != nullptr) { @@ -12946,7 +13286,7 @@ void ClientHandlersProcessor::process_ResourceRequestHandler_OnBeforeResourceLoa ClientHandlers_ResourceRequestHandler_OnBeforeResourceLoad_result result; try { - result.success = iface_->ResourceRequestHandler_OnBeforeResourceLoad(args.rrHandler, args.bid, args.request); + result.success = iface_->ResourceRequestHandler_OnBeforeResourceLoad(args.rrHandler, args.bid, args.frame, args.request); result.__isset.success = true; } catch (const std::exception& e) { if (this->eventHandler_.get() != nullptr) { @@ -13000,7 +13340,7 @@ void ClientHandlersProcessor::process_ResourceRequestHandler_GetResourceHandler( ClientHandlers_ResourceRequestHandler_GetResourceHandler_result result; try { - iface_->ResourceRequestHandler_GetResourceHandler(result.success, args.rrHandler, args.bid, args.request); + iface_->ResourceRequestHandler_GetResourceHandler(result.success, args.rrHandler, args.bid, args.frame, args.request); result.__isset.success = true; } catch (const std::exception& e) { if (this->eventHandler_.get() != nullptr) { @@ -13290,7 +13630,7 @@ void ClientHandlersProcessor::process_ResourceRequestHandler_OnResourceRedirect( ClientHandlers_ResourceRequestHandler_OnResourceRedirect_result result; try { - iface_->ResourceRequestHandler_OnResourceRedirect(result.success, args.rrHandler, args.bid, args.request, args.response, args.new_url); + iface_->ResourceRequestHandler_OnResourceRedirect(result.success, args.rrHandler, args.bid, args.frame, args.request, args.response, args.new_url); result.__isset.success = true; } catch (const std::exception& e) { if (this->eventHandler_.get() != nullptr) { @@ -13344,7 +13684,7 @@ void ClientHandlersProcessor::process_ResourceRequestHandler_OnResourceResponse( ClientHandlers_ResourceRequestHandler_OnResourceResponse_result result; try { - result.success = iface_->ResourceRequestHandler_OnResourceResponse(args.rrHandler, args.bid, args.request, args.response); + result.success = iface_->ResourceRequestHandler_OnResourceResponse(args.rrHandler, args.bid, args.frame, args.request, args.response); result.__isset.success = true; } catch (const std::exception& e) { if (this->eventHandler_.get() != nullptr) { @@ -13398,7 +13738,7 @@ void ClientHandlersProcessor::process_ResourceRequestHandler_OnResourceLoadCompl ClientHandlers_ResourceRequestHandler_OnResourceLoadComplete_result result; try { - iface_->ResourceRequestHandler_OnResourceLoadComplete(args.rrHandler, args.bid, args.request, args.response, args.status, args.receivedContentLength); + iface_->ResourceRequestHandler_OnResourceLoadComplete(args.rrHandler, args.bid, args.frame, args.request, args.response, args.status, args.receivedContentLength); } catch (const std::exception& e) { if (this->eventHandler_.get() != nullptr) { this->eventHandler_->handlerError(ctx, "ClientHandlers.ResourceRequestHandler_OnResourceLoadComplete"); @@ -13451,7 +13791,7 @@ void ClientHandlersProcessor::process_ResourceRequestHandler_OnProtocolExecution ClientHandlers_ResourceRequestHandler_OnProtocolExecution_result result; try { - result.success = iface_->ResourceRequestHandler_OnProtocolExecution(args.rrHandler, args.bid, args.request, args.allowOsExecution); + result.success = iface_->ResourceRequestHandler_OnProtocolExecution(args.rrHandler, args.bid, args.frame, args.request, args.allowOsExecution); result.__isset.success = true; } catch (const std::exception& e) { if (this->eventHandler_.get() != nullptr) { @@ -13505,7 +13845,7 @@ void ClientHandlersProcessor::process_MessageRouterHandler_onQuery(int32_t seqid ClientHandlers_MessageRouterHandler_onQuery_result result; try { - result.success = iface_->MessageRouterHandler_onQuery(args.handler, args.bid, args.queryId, args.request, args.persistent, args.queryCallback); + result.success = iface_->MessageRouterHandler_onQuery(args.handler, args.bid, args.frame, args.queryId, args.request, args.persistent, args.queryCallback); result.__isset.success = true; } catch (const std::exception& e) { if (this->eventHandler_.get() != nullptr) { @@ -13558,7 +13898,7 @@ void ClientHandlersProcessor::process_MessageRouterHandler_onQueryCanceled(int32 } try { - iface_->MessageRouterHandler_onQueryCanceled(args.handler, args.bid, args.queryId); + iface_->MessageRouterHandler_onQueryCanceled(args.handler, args.bid, args.frame, args.queryId); } catch (const std::exception&) { if (this->eventHandler_.get() != nullptr) { this->eventHandler_->handlerError(ctx, "ClientHandlers.MessageRouterHandler_onQueryCanceled"); @@ -13633,7 +13973,7 @@ void ClientHandlersProcessor::process_SchemeHandlerFactory_CreateHandler(int32_t ClientHandlers_SchemeHandlerFactory_CreateHandler_result result; try { - iface_->SchemeHandlerFactory_CreateHandler(result.success, args.schemeHandlerFactory, args.bid, args.scheme_name, args.request); + iface_->SchemeHandlerFactory_CreateHandler(result.success, args.schemeHandlerFactory, args.bid, args.frame, args.scheme_name, args.request); result.__isset.success = true; } catch (const std::exception& e) { if (this->eventHandler_.get() != nullptr) { @@ -14172,13 +14512,13 @@ void ClientHandlersConcurrentClient::recv_RenderHandler_OnPaint(const int32_t se } // end while(true) } -bool ClientHandlersConcurrentClient::LifeSpanHandler_OnBeforePopup(const int32_t bid, const std::string& url, const std::string& frameName, const bool gesture) +bool ClientHandlersConcurrentClient::LifeSpanHandler_OnBeforePopup(const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& url, const std::string& frameName, const bool gesture) { - int32_t seqid = send_LifeSpanHandler_OnBeforePopup(bid, url, frameName, gesture); + int32_t seqid = send_LifeSpanHandler_OnBeforePopup(bid, frame, url, frameName, gesture); return recv_LifeSpanHandler_OnBeforePopup(seqid); } -int32_t ClientHandlersConcurrentClient::send_LifeSpanHandler_OnBeforePopup(const int32_t bid, const std::string& url, const std::string& frameName, const bool gesture) +int32_t ClientHandlersConcurrentClient::send_LifeSpanHandler_OnBeforePopup(const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& url, const std::string& frameName, const bool gesture) { int32_t cseqid = this->sync_->generateSeqId(); ::apache::thrift::async::TConcurrentSendSentry sentry(this->sync_.get()); @@ -14186,6 +14526,7 @@ int32_t ClientHandlersConcurrentClient::send_LifeSpanHandler_OnBeforePopup(const ClientHandlers_LifeSpanHandler_OnBeforePopup_pargs args; args.bid = &bid; + args.frame = &frame; args.url = &url; args.frameName = &frameName; args.gesture = &gesture; @@ -14413,12 +14754,12 @@ void ClientHandlersConcurrentClient::send_LoadHandler_OnLoadingStateChange(const sentry.commit(); } -void ClientHandlersConcurrentClient::LoadHandler_OnLoadStart(const int32_t bid, const int32_t transition_type) +void ClientHandlersConcurrentClient::LoadHandler_OnLoadStart(const int32_t bid, const ::thrift_codegen::RObject& frame, const int32_t transition_type) { - send_LoadHandler_OnLoadStart(bid, transition_type); + send_LoadHandler_OnLoadStart(bid, frame, transition_type); } -void ClientHandlersConcurrentClient::send_LoadHandler_OnLoadStart(const int32_t bid, const int32_t transition_type) +void ClientHandlersConcurrentClient::send_LoadHandler_OnLoadStart(const int32_t bid, const ::thrift_codegen::RObject& frame, const int32_t transition_type) { int32_t cseqid = 0; ::apache::thrift::async::TConcurrentSendSentry sentry(this->sync_.get()); @@ -14426,6 +14767,7 @@ void ClientHandlersConcurrentClient::send_LoadHandler_OnLoadStart(const int32_t ClientHandlers_LoadHandler_OnLoadStart_pargs args; args.bid = &bid; + args.frame = &frame; args.transition_type = &transition_type; args.write(oprot_); @@ -14436,12 +14778,12 @@ void ClientHandlersConcurrentClient::send_LoadHandler_OnLoadStart(const int32_t sentry.commit(); } -void ClientHandlersConcurrentClient::LoadHandler_OnLoadEnd(const int32_t bid, const int32_t httpStatusCode) +void ClientHandlersConcurrentClient::LoadHandler_OnLoadEnd(const int32_t bid, const ::thrift_codegen::RObject& frame, const int32_t httpStatusCode) { - send_LoadHandler_OnLoadEnd(bid, httpStatusCode); + send_LoadHandler_OnLoadEnd(bid, frame, httpStatusCode); } -void ClientHandlersConcurrentClient::send_LoadHandler_OnLoadEnd(const int32_t bid, const int32_t httpStatusCode) +void ClientHandlersConcurrentClient::send_LoadHandler_OnLoadEnd(const int32_t bid, const ::thrift_codegen::RObject& frame, const int32_t httpStatusCode) { int32_t cseqid = 0; ::apache::thrift::async::TConcurrentSendSentry sentry(this->sync_.get()); @@ -14449,6 +14791,7 @@ void ClientHandlersConcurrentClient::send_LoadHandler_OnLoadEnd(const int32_t bi ClientHandlers_LoadHandler_OnLoadEnd_pargs args; args.bid = &bid; + args.frame = &frame; args.httpStatusCode = &httpStatusCode; args.write(oprot_); @@ -14459,12 +14802,12 @@ void ClientHandlersConcurrentClient::send_LoadHandler_OnLoadEnd(const int32_t bi sentry.commit(); } -void ClientHandlersConcurrentClient::LoadHandler_OnLoadError(const int32_t bid, const int32_t errorCode, const std::string& errorText, const std::string& failedUrl) +void ClientHandlersConcurrentClient::LoadHandler_OnLoadError(const int32_t bid, const ::thrift_codegen::RObject& frame, const int32_t errorCode, const std::string& errorText, const std::string& failedUrl) { - send_LoadHandler_OnLoadError(bid, errorCode, errorText, failedUrl); + send_LoadHandler_OnLoadError(bid, frame, errorCode, errorText, failedUrl); } -void ClientHandlersConcurrentClient::send_LoadHandler_OnLoadError(const int32_t bid, const int32_t errorCode, const std::string& errorText, const std::string& failedUrl) +void ClientHandlersConcurrentClient::send_LoadHandler_OnLoadError(const int32_t bid, const ::thrift_codegen::RObject& frame, const int32_t errorCode, const std::string& errorText, const std::string& failedUrl) { int32_t cseqid = 0; ::apache::thrift::async::TConcurrentSendSentry sentry(this->sync_.get()); @@ -14472,6 +14815,7 @@ void ClientHandlersConcurrentClient::send_LoadHandler_OnLoadError(const int32_t ClientHandlers_LoadHandler_OnLoadError_pargs args; args.bid = &bid; + args.frame = &frame; args.errorCode = &errorCode; args.errorText = &errorText; args.failedUrl = &failedUrl; @@ -14484,12 +14828,12 @@ void ClientHandlersConcurrentClient::send_LoadHandler_OnLoadError(const int32_t sentry.commit(); } -void ClientHandlersConcurrentClient::DisplayHandler_OnAddressChange(const int32_t bid, const std::string& url) +void ClientHandlersConcurrentClient::DisplayHandler_OnAddressChange(const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& url) { - send_DisplayHandler_OnAddressChange(bid, url); + send_DisplayHandler_OnAddressChange(bid, frame, url); } -void ClientHandlersConcurrentClient::send_DisplayHandler_OnAddressChange(const int32_t bid, const std::string& url) +void ClientHandlersConcurrentClient::send_DisplayHandler_OnAddressChange(const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& url) { int32_t cseqid = 0; ::apache::thrift::async::TConcurrentSendSentry sentry(this->sync_.get()); @@ -14497,6 +14841,7 @@ void ClientHandlersConcurrentClient::send_DisplayHandler_OnAddressChange(const i ClientHandlers_DisplayHandler_OnAddressChange_pargs args; args.bid = &bid; + args.frame = &frame; args.url = &url; args.write(oprot_); @@ -15026,13 +15371,13 @@ void ClientHandlersConcurrentClient::send_FocusHandler_OnGotFocus(const int32_t sentry.commit(); } -bool ClientHandlersConcurrentClient::RequestHandler_OnBeforeBrowse(const int32_t bid, const ::thrift_codegen::RObject& request, const bool user_gesture, const bool is_redirect) +bool ClientHandlersConcurrentClient::RequestHandler_OnBeforeBrowse(const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const bool user_gesture, const bool is_redirect) { - int32_t seqid = send_RequestHandler_OnBeforeBrowse(bid, request, user_gesture, is_redirect); + int32_t seqid = send_RequestHandler_OnBeforeBrowse(bid, frame, request, user_gesture, is_redirect); return recv_RequestHandler_OnBeforeBrowse(seqid); } -int32_t ClientHandlersConcurrentClient::send_RequestHandler_OnBeforeBrowse(const int32_t bid, const ::thrift_codegen::RObject& request, const bool user_gesture, const bool is_redirect) +int32_t ClientHandlersConcurrentClient::send_RequestHandler_OnBeforeBrowse(const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const bool user_gesture, const bool is_redirect) { int32_t cseqid = this->sync_->generateSeqId(); ::apache::thrift::async::TConcurrentSendSentry sentry(this->sync_.get()); @@ -15040,6 +15385,7 @@ int32_t ClientHandlersConcurrentClient::send_RequestHandler_OnBeforeBrowse(const ClientHandlers_RequestHandler_OnBeforeBrowse_pargs args; args.bid = &bid; + args.frame = &frame; args.request = &request; args.user_gesture = &user_gesture; args.is_redirect = &is_redirect; @@ -15113,13 +15459,13 @@ bool ClientHandlersConcurrentClient::recv_RequestHandler_OnBeforeBrowse(const in } // end while(true) } -bool ClientHandlersConcurrentClient::RequestHandler_OnOpenURLFromTab(const int32_t bid, const std::string& target_url, const bool user_gesture) +bool ClientHandlersConcurrentClient::RequestHandler_OnOpenURLFromTab(const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& target_url, const bool user_gesture) { - int32_t seqid = send_RequestHandler_OnOpenURLFromTab(bid, target_url, user_gesture); + int32_t seqid = send_RequestHandler_OnOpenURLFromTab(bid, frame, target_url, user_gesture); return recv_RequestHandler_OnOpenURLFromTab(seqid); } -int32_t ClientHandlersConcurrentClient::send_RequestHandler_OnOpenURLFromTab(const int32_t bid, const std::string& target_url, const bool user_gesture) +int32_t ClientHandlersConcurrentClient::send_RequestHandler_OnOpenURLFromTab(const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& target_url, const bool user_gesture) { int32_t cseqid = this->sync_->generateSeqId(); ::apache::thrift::async::TConcurrentSendSentry sentry(this->sync_.get()); @@ -15127,6 +15473,7 @@ int32_t ClientHandlersConcurrentClient::send_RequestHandler_OnOpenURLFromTab(con ClientHandlers_RequestHandler_OnOpenURLFromTab_pargs args; args.bid = &bid; + args.frame = &frame; args.target_url = &target_url; args.user_gesture = &user_gesture; args.write(oprot_); @@ -15401,13 +15748,13 @@ void ClientHandlersConcurrentClient::send_RequestHandler_OnRenderProcessTerminat sentry.commit(); } -void ClientHandlersConcurrentClient::RequestHandler_GetResourceRequestHandler( ::thrift_codegen::RObject& _return, const int32_t bid, const ::thrift_codegen::RObject& request, const bool isNavigation, const bool isDownload, const std::string& requestInitiator) +void ClientHandlersConcurrentClient::RequestHandler_GetResourceRequestHandler( ::thrift_codegen::RObject& _return, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const bool isNavigation, const bool isDownload, const std::string& requestInitiator) { - int32_t seqid = send_RequestHandler_GetResourceRequestHandler(bid, request, isNavigation, isDownload, requestInitiator); + int32_t seqid = send_RequestHandler_GetResourceRequestHandler(bid, frame, request, isNavigation, isDownload, requestInitiator); recv_RequestHandler_GetResourceRequestHandler(_return, seqid); } -int32_t ClientHandlersConcurrentClient::send_RequestHandler_GetResourceRequestHandler(const int32_t bid, const ::thrift_codegen::RObject& request, const bool isNavigation, const bool isDownload, const std::string& requestInitiator) +int32_t ClientHandlersConcurrentClient::send_RequestHandler_GetResourceRequestHandler(const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const bool isNavigation, const bool isDownload, const std::string& requestInitiator) { int32_t cseqid = this->sync_->generateSeqId(); ::apache::thrift::async::TConcurrentSendSentry sentry(this->sync_.get()); @@ -15415,6 +15762,7 @@ int32_t ClientHandlersConcurrentClient::send_RequestHandler_GetResourceRequestHa ClientHandlers_RequestHandler_GetResourceRequestHandler_pargs args; args.bid = &bid; + args.frame = &frame; args.request = &request; args.isNavigation = &isNavigation; args.isDownload = &isDownload; @@ -15511,13 +15859,13 @@ void ClientHandlersConcurrentClient::send_ResourceRequestHandler_Dispose(const i sentry.commit(); } -void ClientHandlersConcurrentClient::ResourceRequestHandler_GetCookieAccessFilter( ::thrift_codegen::RObject& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request) +void ClientHandlersConcurrentClient::ResourceRequestHandler_GetCookieAccessFilter( ::thrift_codegen::RObject& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request) { - int32_t seqid = send_ResourceRequestHandler_GetCookieAccessFilter(rrHandler, bid, request); + int32_t seqid = send_ResourceRequestHandler_GetCookieAccessFilter(rrHandler, bid, frame, request); recv_ResourceRequestHandler_GetCookieAccessFilter(_return, seqid); } -int32_t ClientHandlersConcurrentClient::send_ResourceRequestHandler_GetCookieAccessFilter(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request) +int32_t ClientHandlersConcurrentClient::send_ResourceRequestHandler_GetCookieAccessFilter(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request) { int32_t cseqid = this->sync_->generateSeqId(); ::apache::thrift::async::TConcurrentSendSentry sentry(this->sync_.get()); @@ -15526,6 +15874,7 @@ int32_t ClientHandlersConcurrentClient::send_ResourceRequestHandler_GetCookieAcc ClientHandlers_ResourceRequestHandler_GetCookieAccessFilter_pargs args; args.rrHandler = &rrHandler; args.bid = &bid; + args.frame = &frame; args.request = &request; args.write(oprot_); @@ -15619,13 +15968,13 @@ void ClientHandlersConcurrentClient::send_CookieAccessFilter_Dispose(const int32 sentry.commit(); } -bool ClientHandlersConcurrentClient::CookieAccessFilter_CanSendCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& request, const std::vector<std::string> & cookie) +bool ClientHandlersConcurrentClient::CookieAccessFilter_CanSendCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const std::vector<std::string> & cookie) { - int32_t seqid = send_CookieAccessFilter_CanSendCookie(filter, bid, request, cookie); + int32_t seqid = send_CookieAccessFilter_CanSendCookie(filter, bid, frame, request, cookie); return recv_CookieAccessFilter_CanSendCookie(seqid); } -int32_t ClientHandlersConcurrentClient::send_CookieAccessFilter_CanSendCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& request, const std::vector<std::string> & cookie) +int32_t ClientHandlersConcurrentClient::send_CookieAccessFilter_CanSendCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const std::vector<std::string> & cookie) { int32_t cseqid = this->sync_->generateSeqId(); ::apache::thrift::async::TConcurrentSendSentry sentry(this->sync_.get()); @@ -15634,6 +15983,7 @@ int32_t ClientHandlersConcurrentClient::send_CookieAccessFilter_CanSendCookie(co ClientHandlers_CookieAccessFilter_CanSendCookie_pargs args; args.filter = &filter; args.bid = &bid; + args.frame = &frame; args.request = &request; args.cookie = &cookie; args.write(oprot_); @@ -15706,13 +16056,13 @@ bool ClientHandlersConcurrentClient::recv_CookieAccessFilter_CanSendCookie(const } // end while(true) } -bool ClientHandlersConcurrentClient::CookieAccessFilter_CanSaveCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::vector<std::string> & cookie) +bool ClientHandlersConcurrentClient::CookieAccessFilter_CanSaveCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::vector<std::string> & cookie) { - int32_t seqid = send_CookieAccessFilter_CanSaveCookie(filter, bid, request, response, cookie); + int32_t seqid = send_CookieAccessFilter_CanSaveCookie(filter, bid, frame, request, response, cookie); return recv_CookieAccessFilter_CanSaveCookie(seqid); } -int32_t ClientHandlersConcurrentClient::send_CookieAccessFilter_CanSaveCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::vector<std::string> & cookie) +int32_t ClientHandlersConcurrentClient::send_CookieAccessFilter_CanSaveCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::vector<std::string> & cookie) { int32_t cseqid = this->sync_->generateSeqId(); ::apache::thrift::async::TConcurrentSendSentry sentry(this->sync_.get()); @@ -15721,6 +16071,7 @@ int32_t ClientHandlersConcurrentClient::send_CookieAccessFilter_CanSaveCookie(co ClientHandlers_CookieAccessFilter_CanSaveCookie_pargs args; args.filter = &filter; args.bid = &bid; + args.frame = &frame; args.request = &request; args.response = &response; args.cookie = &cookie; @@ -15794,13 +16145,13 @@ bool ClientHandlersConcurrentClient::recv_CookieAccessFilter_CanSaveCookie(const } // end while(true) } -bool ClientHandlersConcurrentClient::ResourceRequestHandler_OnBeforeResourceLoad(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request) +bool ClientHandlersConcurrentClient::ResourceRequestHandler_OnBeforeResourceLoad(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request) { - int32_t seqid = send_ResourceRequestHandler_OnBeforeResourceLoad(rrHandler, bid, request); + int32_t seqid = send_ResourceRequestHandler_OnBeforeResourceLoad(rrHandler, bid, frame, request); return recv_ResourceRequestHandler_OnBeforeResourceLoad(seqid); } -int32_t ClientHandlersConcurrentClient::send_ResourceRequestHandler_OnBeforeResourceLoad(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request) +int32_t ClientHandlersConcurrentClient::send_ResourceRequestHandler_OnBeforeResourceLoad(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request) { int32_t cseqid = this->sync_->generateSeqId(); ::apache::thrift::async::TConcurrentSendSentry sentry(this->sync_.get()); @@ -15809,6 +16160,7 @@ int32_t ClientHandlersConcurrentClient::send_ResourceRequestHandler_OnBeforeReso ClientHandlers_ResourceRequestHandler_OnBeforeResourceLoad_pargs args; args.rrHandler = &rrHandler; args.bid = &bid; + args.frame = &frame; args.request = &request; args.write(oprot_); @@ -15880,13 +16232,13 @@ bool ClientHandlersConcurrentClient::recv_ResourceRequestHandler_OnBeforeResourc } // end while(true) } -void ClientHandlersConcurrentClient::ResourceRequestHandler_GetResourceHandler( ::thrift_codegen::RObject& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request) +void ClientHandlersConcurrentClient::ResourceRequestHandler_GetResourceHandler( ::thrift_codegen::RObject& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request) { - int32_t seqid = send_ResourceRequestHandler_GetResourceHandler(rrHandler, bid, request); + int32_t seqid = send_ResourceRequestHandler_GetResourceHandler(rrHandler, bid, frame, request); recv_ResourceRequestHandler_GetResourceHandler(_return, seqid); } -int32_t ClientHandlersConcurrentClient::send_ResourceRequestHandler_GetResourceHandler(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request) +int32_t ClientHandlersConcurrentClient::send_ResourceRequestHandler_GetResourceHandler(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request) { int32_t cseqid = this->sync_->generateSeqId(); ::apache::thrift::async::TConcurrentSendSentry sentry(this->sync_.get()); @@ -15895,6 +16247,7 @@ int32_t ClientHandlersConcurrentClient::send_ResourceRequestHandler_GetResourceH ClientHandlers_ResourceRequestHandler_GetResourceHandler_pargs args; args.rrHandler = &rrHandler; args.bid = &bid; + args.frame = &frame; args.request = &request; args.write(oprot_); @@ -16267,13 +16620,13 @@ void ClientHandlersConcurrentClient::send_ResourceHandler_Cancel(const int32_t r sentry.commit(); } -void ClientHandlersConcurrentClient::ResourceRequestHandler_OnResourceRedirect(std::string& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& new_url) +void ClientHandlersConcurrentClient::ResourceRequestHandler_OnResourceRedirect(std::string& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& new_url) { - int32_t seqid = send_ResourceRequestHandler_OnResourceRedirect(rrHandler, bid, request, response, new_url); + int32_t seqid = send_ResourceRequestHandler_OnResourceRedirect(rrHandler, bid, frame, request, response, new_url); recv_ResourceRequestHandler_OnResourceRedirect(_return, seqid); } -int32_t ClientHandlersConcurrentClient::send_ResourceRequestHandler_OnResourceRedirect(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& new_url) +int32_t ClientHandlersConcurrentClient::send_ResourceRequestHandler_OnResourceRedirect(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& new_url) { int32_t cseqid = this->sync_->generateSeqId(); ::apache::thrift::async::TConcurrentSendSentry sentry(this->sync_.get()); @@ -16282,6 +16635,7 @@ int32_t ClientHandlersConcurrentClient::send_ResourceRequestHandler_OnResourceRe ClientHandlers_ResourceRequestHandler_OnResourceRedirect_pargs args; args.rrHandler = &rrHandler; args.bid = &bid; + args.frame = &frame; args.request = &request; args.response = &response; args.new_url = &new_url; @@ -16355,13 +16709,13 @@ void ClientHandlersConcurrentClient::recv_ResourceRequestHandler_OnResourceRedir } // end while(true) } -bool ClientHandlersConcurrentClient::ResourceRequestHandler_OnResourceResponse(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response) +bool ClientHandlersConcurrentClient::ResourceRequestHandler_OnResourceResponse(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response) { - int32_t seqid = send_ResourceRequestHandler_OnResourceResponse(rrHandler, bid, request, response); + int32_t seqid = send_ResourceRequestHandler_OnResourceResponse(rrHandler, bid, frame, request, response); return recv_ResourceRequestHandler_OnResourceResponse(seqid); } -int32_t ClientHandlersConcurrentClient::send_ResourceRequestHandler_OnResourceResponse(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response) +int32_t ClientHandlersConcurrentClient::send_ResourceRequestHandler_OnResourceResponse(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response) { int32_t cseqid = this->sync_->generateSeqId(); ::apache::thrift::async::TConcurrentSendSentry sentry(this->sync_.get()); @@ -16370,6 +16724,7 @@ int32_t ClientHandlersConcurrentClient::send_ResourceRequestHandler_OnResourceRe ClientHandlers_ResourceRequestHandler_OnResourceResponse_pargs args; args.rrHandler = &rrHandler; args.bid = &bid; + args.frame = &frame; args.request = &request; args.response = &response; args.write(oprot_); @@ -16442,13 +16797,13 @@ bool ClientHandlersConcurrentClient::recv_ResourceRequestHandler_OnResourceRespo } // end while(true) } -void ClientHandlersConcurrentClient::ResourceRequestHandler_OnResourceLoadComplete(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& status, const int64_t receivedContentLength) +void ClientHandlersConcurrentClient::ResourceRequestHandler_OnResourceLoadComplete(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& status, const int64_t receivedContentLength) { - int32_t seqid = send_ResourceRequestHandler_OnResourceLoadComplete(rrHandler, bid, request, response, status, receivedContentLength); + int32_t seqid = send_ResourceRequestHandler_OnResourceLoadComplete(rrHandler, bid, frame, request, response, status, receivedContentLength); recv_ResourceRequestHandler_OnResourceLoadComplete(seqid); } -int32_t ClientHandlersConcurrentClient::send_ResourceRequestHandler_OnResourceLoadComplete(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& status, const int64_t receivedContentLength) +int32_t ClientHandlersConcurrentClient::send_ResourceRequestHandler_OnResourceLoadComplete(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& status, const int64_t receivedContentLength) { int32_t cseqid = this->sync_->generateSeqId(); ::apache::thrift::async::TConcurrentSendSentry sentry(this->sync_.get()); @@ -16457,6 +16812,7 @@ int32_t ClientHandlersConcurrentClient::send_ResourceRequestHandler_OnResourceLo ClientHandlers_ResourceRequestHandler_OnResourceLoadComplete_pargs args; args.rrHandler = &rrHandler; args.bid = &bid; + args.frame = &frame; args.request = &request; args.response = &response; args.status = &status; @@ -16525,13 +16881,13 @@ void ClientHandlersConcurrentClient::recv_ResourceRequestHandler_OnResourceLoadC } // end while(true) } -bool ClientHandlersConcurrentClient::ResourceRequestHandler_OnProtocolExecution(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const bool allowOsExecution) +bool ClientHandlersConcurrentClient::ResourceRequestHandler_OnProtocolExecution(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const bool allowOsExecution) { - int32_t seqid = send_ResourceRequestHandler_OnProtocolExecution(rrHandler, bid, request, allowOsExecution); + int32_t seqid = send_ResourceRequestHandler_OnProtocolExecution(rrHandler, bid, frame, request, allowOsExecution); return recv_ResourceRequestHandler_OnProtocolExecution(seqid); } -int32_t ClientHandlersConcurrentClient::send_ResourceRequestHandler_OnProtocolExecution(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const bool allowOsExecution) +int32_t ClientHandlersConcurrentClient::send_ResourceRequestHandler_OnProtocolExecution(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const bool allowOsExecution) { int32_t cseqid = this->sync_->generateSeqId(); ::apache::thrift::async::TConcurrentSendSentry sentry(this->sync_.get()); @@ -16540,6 +16896,7 @@ int32_t ClientHandlersConcurrentClient::send_ResourceRequestHandler_OnProtocolEx ClientHandlers_ResourceRequestHandler_OnProtocolExecution_pargs args; args.rrHandler = &rrHandler; args.bid = &bid; + args.frame = &frame; args.request = &request; args.allowOsExecution = &allowOsExecution; args.write(oprot_); @@ -16612,13 +16969,13 @@ bool ClientHandlersConcurrentClient::recv_ResourceRequestHandler_OnProtocolExecu } // end while(true) } -bool ClientHandlersConcurrentClient::MessageRouterHandler_onQuery(const ::thrift_codegen::RObject& handler, const int32_t bid, const int64_t queryId, const std::string& request, const bool persistent, const ::thrift_codegen::RObject& queryCallback) +bool ClientHandlersConcurrentClient::MessageRouterHandler_onQuery(const ::thrift_codegen::RObject& handler, const int32_t bid, const ::thrift_codegen::RObject& frame, const int64_t queryId, const std::string& request, const bool persistent, const ::thrift_codegen::RObject& queryCallback) { - int32_t seqid = send_MessageRouterHandler_onQuery(handler, bid, queryId, request, persistent, queryCallback); + int32_t seqid = send_MessageRouterHandler_onQuery(handler, bid, frame, queryId, request, persistent, queryCallback); return recv_MessageRouterHandler_onQuery(seqid); } -int32_t ClientHandlersConcurrentClient::send_MessageRouterHandler_onQuery(const ::thrift_codegen::RObject& handler, const int32_t bid, const int64_t queryId, const std::string& request, const bool persistent, const ::thrift_codegen::RObject& queryCallback) +int32_t ClientHandlersConcurrentClient::send_MessageRouterHandler_onQuery(const ::thrift_codegen::RObject& handler, const int32_t bid, const ::thrift_codegen::RObject& frame, const int64_t queryId, const std::string& request, const bool persistent, const ::thrift_codegen::RObject& queryCallback) { int32_t cseqid = this->sync_->generateSeqId(); ::apache::thrift::async::TConcurrentSendSentry sentry(this->sync_.get()); @@ -16627,6 +16984,7 @@ int32_t ClientHandlersConcurrentClient::send_MessageRouterHandler_onQuery(const ClientHandlers_MessageRouterHandler_onQuery_pargs args; args.handler = &handler; args.bid = &bid; + args.frame = &frame; args.queryId = &queryId; args.request = &request; args.persistent = &persistent; @@ -16701,12 +17059,12 @@ bool ClientHandlersConcurrentClient::recv_MessageRouterHandler_onQuery(const int } // end while(true) } -void ClientHandlersConcurrentClient::MessageRouterHandler_onQueryCanceled(const ::thrift_codegen::RObject& handler, const int32_t bid, const int64_t queryId) +void ClientHandlersConcurrentClient::MessageRouterHandler_onQueryCanceled(const ::thrift_codegen::RObject& handler, const int32_t bid, const ::thrift_codegen::RObject& frame, const int64_t queryId) { - send_MessageRouterHandler_onQueryCanceled(handler, bid, queryId); + send_MessageRouterHandler_onQueryCanceled(handler, bid, frame, queryId); } -void ClientHandlersConcurrentClient::send_MessageRouterHandler_onQueryCanceled(const ::thrift_codegen::RObject& handler, const int32_t bid, const int64_t queryId) +void ClientHandlersConcurrentClient::send_MessageRouterHandler_onQueryCanceled(const ::thrift_codegen::RObject& handler, const int32_t bid, const ::thrift_codegen::RObject& frame, const int64_t queryId) { int32_t cseqid = 0; ::apache::thrift::async::TConcurrentSendSentry sentry(this->sync_.get()); @@ -16715,6 +17073,7 @@ void ClientHandlersConcurrentClient::send_MessageRouterHandler_onQueryCanceled(c ClientHandlers_MessageRouterHandler_onQueryCanceled_pargs args; args.handler = &handler; args.bid = &bid; + args.frame = &frame; args.queryId = &queryId; args.write(oprot_); @@ -16747,13 +17106,13 @@ void ClientHandlersConcurrentClient::send_MessageRouterHandler_Dispose(const int sentry.commit(); } -void ClientHandlersConcurrentClient::SchemeHandlerFactory_CreateHandler( ::thrift_codegen::RObject& _return, const int32_t schemeHandlerFactory, const int32_t bid, const std::string& scheme_name, const ::thrift_codegen::RObject& request) +void ClientHandlersConcurrentClient::SchemeHandlerFactory_CreateHandler( ::thrift_codegen::RObject& _return, const int32_t schemeHandlerFactory, const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& scheme_name, const ::thrift_codegen::RObject& request) { - int32_t seqid = send_SchemeHandlerFactory_CreateHandler(schemeHandlerFactory, bid, scheme_name, request); + int32_t seqid = send_SchemeHandlerFactory_CreateHandler(schemeHandlerFactory, bid, frame, scheme_name, request); recv_SchemeHandlerFactory_CreateHandler(_return, seqid); } -int32_t ClientHandlersConcurrentClient::send_SchemeHandlerFactory_CreateHandler(const int32_t schemeHandlerFactory, const int32_t bid, const std::string& scheme_name, const ::thrift_codegen::RObject& request) +int32_t ClientHandlersConcurrentClient::send_SchemeHandlerFactory_CreateHandler(const int32_t schemeHandlerFactory, const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& scheme_name, const ::thrift_codegen::RObject& request) { int32_t cseqid = this->sync_->generateSeqId(); ::apache::thrift::async::TConcurrentSendSentry sentry(this->sync_.get()); @@ -16762,6 +17121,7 @@ int32_t ClientHandlersConcurrentClient::send_SchemeHandlerFactory_CreateHandler( ClientHandlers_SchemeHandlerFactory_CreateHandler_pargs args; args.schemeHandlerFactory = &schemeHandlerFactory; args.bid = &bid; + args.frame = &frame; args.scheme_name = &scheme_name; args.request = &request; args.write(oprot_); diff --git a/remote/gen-cpp/ClientHandlers.h b/remote/gen-cpp/ClientHandlers.h index 9ba8061..54f4c14 100644 --- a/remote/gen-cpp/ClientHandlers.h +++ b/remote/gen-cpp/ClientHandlers.h @@ -29,15 +29,15 @@ class ClientHandlersIf { virtual void RenderHandler_GetScreenInfo(ScreenInfo& _return, const int32_t bid) = 0; virtual void RenderHandler_GetScreenPoint(Point& _return, const int32_t bid, const int32_t viewX, const int32_t viewY) = 0; virtual void RenderHandler_OnPaint(const int32_t bid, const bool popup, const int32_t dirtyRectsCount, const std::string& sharedMemName, const int64_t sharedMemHandle, const int32_t width, const int32_t height) = 0; - virtual bool LifeSpanHandler_OnBeforePopup(const int32_t bid, const std::string& url, const std::string& frameName, const bool gesture) = 0; + virtual bool LifeSpanHandler_OnBeforePopup(const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& url, const std::string& frameName, const bool gesture) = 0; virtual void LifeSpanHandler_OnAfterCreated(const int32_t bid, const int32_t nativeBrowserIdentifier) = 0; virtual bool LifeSpanHandler_DoClose(const int32_t bid) = 0; virtual void LifeSpanHandler_OnBeforeClose(const int32_t bid) = 0; virtual void LoadHandler_OnLoadingStateChange(const int32_t bid, const bool isLoading, const bool canGoBack, const bool canGoForward) = 0; - virtual void LoadHandler_OnLoadStart(const int32_t bid, const int32_t transition_type) = 0; - virtual void LoadHandler_OnLoadEnd(const int32_t bid, const int32_t httpStatusCode) = 0; - virtual void LoadHandler_OnLoadError(const int32_t bid, const int32_t errorCode, const std::string& errorText, const std::string& failedUrl) = 0; - virtual void DisplayHandler_OnAddressChange(const int32_t bid, const std::string& url) = 0; + virtual void LoadHandler_OnLoadStart(const int32_t bid, const ::thrift_codegen::RObject& frame, const int32_t transition_type) = 0; + virtual void LoadHandler_OnLoadEnd(const int32_t bid, const ::thrift_codegen::RObject& frame, const int32_t httpStatusCode) = 0; + virtual void LoadHandler_OnLoadError(const int32_t bid, const ::thrift_codegen::RObject& frame, const int32_t errorCode, const std::string& errorText, const std::string& failedUrl) = 0; + virtual void DisplayHandler_OnAddressChange(const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& url) = 0; virtual void DisplayHandler_OnTitleChange(const int32_t bid, const std::string& title) = 0; virtual bool DisplayHandler_OnTooltip(const int32_t bid, const std::string& text) = 0; virtual void DisplayHandler_OnStatusMessage(const int32_t bid, const std::string& value) = 0; @@ -47,32 +47,32 @@ class ClientHandlersIf { virtual void FocusHandler_OnTakeFocus(const int32_t bid, const bool next) = 0; virtual bool FocusHandler_OnSetFocus(const int32_t bid, const std::string& source) = 0; virtual void FocusHandler_OnGotFocus(const int32_t bid) = 0; - virtual bool RequestHandler_OnBeforeBrowse(const int32_t bid, const ::thrift_codegen::RObject& request, const bool user_gesture, const bool is_redirect) = 0; - virtual bool RequestHandler_OnOpenURLFromTab(const int32_t bid, const std::string& target_url, const bool user_gesture) = 0; + virtual bool RequestHandler_OnBeforeBrowse(const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const bool user_gesture, const bool is_redirect) = 0; + virtual bool RequestHandler_OnOpenURLFromTab(const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& target_url, const bool user_gesture) = 0; virtual bool RequestHandler_GetAuthCredentials(const int32_t bid, const std::string& origin_url, const bool isProxy, const std::string& host, const int32_t port, const std::string& realm, const std::string& scheme, const ::thrift_codegen::RObject& authCallback) = 0; virtual bool RequestHandler_OnCertificateError(const int32_t bid, const std::string& cert_error, const std::string& request_url, const std::string& sslInfo, const ::thrift_codegen::RObject& callback) = 0; virtual void RequestHandler_OnRenderProcessTerminated(const int32_t bid, const std::string& status) = 0; - virtual void RequestHandler_GetResourceRequestHandler( ::thrift_codegen::RObject& _return, const int32_t bid, const ::thrift_codegen::RObject& request, const bool isNavigation, const bool isDownload, const std::string& requestInitiator) = 0; + virtual void RequestHandler_GetResourceRequestHandler( ::thrift_codegen::RObject& _return, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const bool isNavigation, const bool isDownload, const std::string& requestInitiator) = 0; virtual void ResourceRequestHandler_Dispose(const int32_t rrHandler) = 0; - virtual void ResourceRequestHandler_GetCookieAccessFilter( ::thrift_codegen::RObject& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request) = 0; + virtual void ResourceRequestHandler_GetCookieAccessFilter( ::thrift_codegen::RObject& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request) = 0; virtual void CookieAccessFilter_Dispose(const int32_t filter) = 0; - virtual bool CookieAccessFilter_CanSendCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& request, const std::vector<std::string> & cookie) = 0; - virtual bool CookieAccessFilter_CanSaveCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::vector<std::string> & cookie) = 0; - virtual bool ResourceRequestHandler_OnBeforeResourceLoad(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request) = 0; - virtual void ResourceRequestHandler_GetResourceHandler( ::thrift_codegen::RObject& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request) = 0; + virtual bool CookieAccessFilter_CanSendCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const std::vector<std::string> & cookie) = 0; + virtual bool CookieAccessFilter_CanSaveCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::vector<std::string> & cookie) = 0; + virtual bool ResourceRequestHandler_OnBeforeResourceLoad(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request) = 0; + virtual void ResourceRequestHandler_GetResourceHandler( ::thrift_codegen::RObject& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request) = 0; virtual void ResourceHandler_Dispose(const int32_t resourceHandler) = 0; virtual bool ResourceHandler_ProcessRequest(const int32_t resourceHandler, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& callback) = 0; virtual void ResourceHandler_GetResponseHeaders( ::thrift_codegen::ResponseHeaders& _return, const int32_t resourceHandler, const ::thrift_codegen::RObject& response) = 0; virtual void ResourceHandler_ReadResponse( ::thrift_codegen::ResponseData& _return, const int32_t resourceHandler, const int32_t bytes_to_read, const ::thrift_codegen::RObject& callback) = 0; virtual void ResourceHandler_Cancel(const int32_t resourceHandler) = 0; - virtual void ResourceRequestHandler_OnResourceRedirect(std::string& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& new_url) = 0; - virtual bool ResourceRequestHandler_OnResourceResponse(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response) = 0; - virtual void ResourceRequestHandler_OnResourceLoadComplete(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& status, const int64_t receivedContentLength) = 0; - virtual bool ResourceRequestHandler_OnProtocolExecution(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const bool allowOsExecution) = 0; - virtual bool MessageRouterHandler_onQuery(const ::thrift_codegen::RObject& handler, const int32_t bid, const int64_t queryId, const std::string& request, const bool persistent, const ::thrift_codegen::RObject& queryCallback) = 0; - virtual void MessageRouterHandler_onQueryCanceled(const ::thrift_codegen::RObject& handler, const int32_t bid, const int64_t queryId) = 0; + virtual void ResourceRequestHandler_OnResourceRedirect(std::string& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& new_url) = 0; + virtual bool ResourceRequestHandler_OnResourceResponse(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response) = 0; + virtual void ResourceRequestHandler_OnResourceLoadComplete(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& status, const int64_t receivedContentLength) = 0; + virtual bool ResourceRequestHandler_OnProtocolExecution(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const bool allowOsExecution) = 0; + virtual bool MessageRouterHandler_onQuery(const ::thrift_codegen::RObject& handler, const int32_t bid, const ::thrift_codegen::RObject& frame, const int64_t queryId, const std::string& request, const bool persistent, const ::thrift_codegen::RObject& queryCallback) = 0; + virtual void MessageRouterHandler_onQueryCanceled(const ::thrift_codegen::RObject& handler, const int32_t bid, const ::thrift_codegen::RObject& frame, const int64_t queryId) = 0; virtual void MessageRouterHandler_Dispose(const int32_t handler) = 0; - virtual void SchemeHandlerFactory_CreateHandler( ::thrift_codegen::RObject& _return, const int32_t schemeHandlerFactory, const int32_t bid, const std::string& scheme_name, const ::thrift_codegen::RObject& request) = 0; + virtual void SchemeHandlerFactory_CreateHandler( ::thrift_codegen::RObject& _return, const int32_t schemeHandlerFactory, const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& scheme_name, const ::thrift_codegen::RObject& request) = 0; virtual void SchemeHandlerFactory_Dispose(const int32_t schemeHandlerFactory) = 0; }; @@ -125,7 +125,7 @@ class ClientHandlersNull : virtual public ClientHandlersIf { void RenderHandler_OnPaint(const int32_t /* bid */, const bool /* popup */, const int32_t /* dirtyRectsCount */, const std::string& /* sharedMemName */, const int64_t /* sharedMemHandle */, const int32_t /* width */, const int32_t /* height */) override { return; } - bool LifeSpanHandler_OnBeforePopup(const int32_t /* bid */, const std::string& /* url */, const std::string& /* frameName */, const bool /* gesture */) override { + bool LifeSpanHandler_OnBeforePopup(const int32_t /* bid */, const ::thrift_codegen::RObject& /* frame */, const std::string& /* url */, const std::string& /* frameName */, const bool /* gesture */) override { bool _return = false; return _return; } @@ -142,16 +142,16 @@ class ClientHandlersNull : virtual public ClientHandlersIf { void LoadHandler_OnLoadingStateChange(const int32_t /* bid */, const bool /* isLoading */, const bool /* canGoBack */, const bool /* canGoForward */) override { return; } - void LoadHandler_OnLoadStart(const int32_t /* bid */, const int32_t /* transition_type */) override { + void LoadHandler_OnLoadStart(const int32_t /* bid */, const ::thrift_codegen::RObject& /* frame */, const int32_t /* transition_type */) override { return; } - void LoadHandler_OnLoadEnd(const int32_t /* bid */, const int32_t /* httpStatusCode */) override { + void LoadHandler_OnLoadEnd(const int32_t /* bid */, const ::thrift_codegen::RObject& /* frame */, const int32_t /* httpStatusCode */) override { return; } - void LoadHandler_OnLoadError(const int32_t /* bid */, const int32_t /* errorCode */, const std::string& /* errorText */, const std::string& /* failedUrl */) override { + void LoadHandler_OnLoadError(const int32_t /* bid */, const ::thrift_codegen::RObject& /* frame */, const int32_t /* errorCode */, const std::string& /* errorText */, const std::string& /* failedUrl */) override { return; } - void DisplayHandler_OnAddressChange(const int32_t /* bid */, const std::string& /* url */) override { + void DisplayHandler_OnAddressChange(const int32_t /* bid */, const ::thrift_codegen::RObject& /* frame */, const std::string& /* url */) override { return; } void DisplayHandler_OnTitleChange(const int32_t /* bid */, const std::string& /* title */) override { @@ -186,11 +186,11 @@ class ClientHandlersNull : virtual public ClientHandlersIf { void FocusHandler_OnGotFocus(const int32_t /* bid */) override { return; } - bool RequestHandler_OnBeforeBrowse(const int32_t /* bid */, const ::thrift_codegen::RObject& /* request */, const bool /* user_gesture */, const bool /* is_redirect */) override { + bool RequestHandler_OnBeforeBrowse(const int32_t /* bid */, const ::thrift_codegen::RObject& /* frame */, const ::thrift_codegen::RObject& /* request */, const bool /* user_gesture */, const bool /* is_redirect */) override { bool _return = false; return _return; } - bool RequestHandler_OnOpenURLFromTab(const int32_t /* bid */, const std::string& /* target_url */, const bool /* user_gesture */) override { + bool RequestHandler_OnOpenURLFromTab(const int32_t /* bid */, const ::thrift_codegen::RObject& /* frame */, const std::string& /* target_url */, const bool /* user_gesture */) override { bool _return = false; return _return; } @@ -205,31 +205,31 @@ class ClientHandlersNull : virtual public ClientHandlersIf { void RequestHandler_OnRenderProcessTerminated(const int32_t /* bid */, const std::string& /* status */) override { return; } - void RequestHandler_GetResourceRequestHandler( ::thrift_codegen::RObject& /* _return */, const int32_t /* bid */, const ::thrift_codegen::RObject& /* request */, const bool /* isNavigation */, const bool /* isDownload */, const std::string& /* requestInitiator */) override { + void RequestHandler_GetResourceRequestHandler( ::thrift_codegen::RObject& /* _return */, const int32_t /* bid */, const ::thrift_codegen::RObject& /* frame */, const ::thrift_codegen::RObject& /* request */, const bool /* isNavigation */, const bool /* isDownload */, const std::string& /* requestInitiator */) override { return; } void ResourceRequestHandler_Dispose(const int32_t /* rrHandler */) override { return; } - void ResourceRequestHandler_GetCookieAccessFilter( ::thrift_codegen::RObject& /* _return */, const int32_t /* rrHandler */, const int32_t /* bid */, const ::thrift_codegen::RObject& /* request */) override { + void ResourceRequestHandler_GetCookieAccessFilter( ::thrift_codegen::RObject& /* _return */, const int32_t /* rrHandler */, const int32_t /* bid */, const ::thrift_codegen::RObject& /* frame */, const ::thrift_codegen::RObject& /* request */) override { return; } void CookieAccessFilter_Dispose(const int32_t /* filter */) override { return; } - bool CookieAccessFilter_CanSendCookie(const int32_t /* filter */, const int32_t /* bid */, const ::thrift_codegen::RObject& /* request */, const std::vector<std::string> & /* cookie */) override { + bool CookieAccessFilter_CanSendCookie(const int32_t /* filter */, const int32_t /* bid */, const ::thrift_codegen::RObject& /* frame */, const ::thrift_codegen::RObject& /* request */, const std::vector<std::string> & /* cookie */) override { bool _return = false; return _return; } - bool CookieAccessFilter_CanSaveCookie(const int32_t /* filter */, const int32_t /* bid */, const ::thrift_codegen::RObject& /* request */, const ::thrift_codegen::RObject& /* response */, const std::vector<std::string> & /* cookie */) override { + bool CookieAccessFilter_CanSaveCookie(const int32_t /* filter */, const int32_t /* bid */, const ::thrift_codegen::RObject& /* frame */, const ::thrift_codegen::RObject& /* request */, const ::thrift_codegen::RObject& /* response */, const std::vector<std::string> & /* cookie */) override { bool _return = false; return _return; } - bool ResourceRequestHandler_OnBeforeResourceLoad(const int32_t /* rrHandler */, const int32_t /* bid */, const ::thrift_codegen::RObject& /* request */) override { + bool ResourceRequestHandler_OnBeforeResourceLoad(const int32_t /* rrHandler */, const int32_t /* bid */, const ::thrift_codegen::RObject& /* frame */, const ::thrift_codegen::RObject& /* request */) override { bool _return = false; return _return; } - void ResourceRequestHandler_GetResourceHandler( ::thrift_codegen::RObject& /* _return */, const int32_t /* rrHandler */, const int32_t /* bid */, const ::thrift_codegen::RObject& /* request */) override { + void ResourceRequestHandler_GetResourceHandler( ::thrift_codegen::RObject& /* _return */, const int32_t /* rrHandler */, const int32_t /* bid */, const ::thrift_codegen::RObject& /* frame */, const ::thrift_codegen::RObject& /* request */) override { return; } void ResourceHandler_Dispose(const int32_t /* resourceHandler */) override { @@ -248,31 +248,31 @@ class ClientHandlersNull : virtual public ClientHandlersIf { void ResourceHandler_Cancel(const int32_t /* resourceHandler */) override { return; } - void ResourceRequestHandler_OnResourceRedirect(std::string& /* _return */, const int32_t /* rrHandler */, const int32_t /* bid */, const ::thrift_codegen::RObject& /* request */, const ::thrift_codegen::RObject& /* response */, const std::string& /* new_url */) override { + void ResourceRequestHandler_OnResourceRedirect(std::string& /* _return */, const int32_t /* rrHandler */, const int32_t /* bid */, const ::thrift_codegen::RObject& /* frame */, const ::thrift_codegen::RObject& /* request */, const ::thrift_codegen::RObject& /* response */, const std::string& /* new_url */) override { return; } - bool ResourceRequestHandler_OnResourceResponse(const int32_t /* rrHandler */, const int32_t /* bid */, const ::thrift_codegen::RObject& /* request */, const ::thrift_codegen::RObject& /* response */) override { + bool ResourceRequestHandler_OnResourceResponse(const int32_t /* rrHandler */, const int32_t /* bid */, const ::thrift_codegen::RObject& /* frame */, const ::thrift_codegen::RObject& /* request */, const ::thrift_codegen::RObject& /* response */) override { bool _return = false; return _return; } - void ResourceRequestHandler_OnResourceLoadComplete(const int32_t /* rrHandler */, const int32_t /* bid */, const ::thrift_codegen::RObject& /* request */, const ::thrift_codegen::RObject& /* response */, const std::string& /* status */, const int64_t /* receivedContentLength */) override { + void ResourceRequestHandler_OnResourceLoadComplete(const int32_t /* rrHandler */, const int32_t /* bid */, const ::thrift_codegen::RObject& /* frame */, const ::thrift_codegen::RObject& /* request */, const ::thrift_codegen::RObject& /* response */, const std::string& /* status */, const int64_t /* receivedContentLength */) override { return; } - bool ResourceRequestHandler_OnProtocolExecution(const int32_t /* rrHandler */, const int32_t /* bid */, const ::thrift_codegen::RObject& /* request */, const bool /* allowOsExecution */) override { + bool ResourceRequestHandler_OnProtocolExecution(const int32_t /* rrHandler */, const int32_t /* bid */, const ::thrift_codegen::RObject& /* frame */, const ::thrift_codegen::RObject& /* request */, const bool /* allowOsExecution */) override { bool _return = false; return _return; } - bool MessageRouterHandler_onQuery(const ::thrift_codegen::RObject& /* handler */, const int32_t /* bid */, const int64_t /* queryId */, const std::string& /* request */, const bool /* persistent */, const ::thrift_codegen::RObject& /* queryCallback */) override { + bool MessageRouterHandler_onQuery(const ::thrift_codegen::RObject& /* handler */, const int32_t /* bid */, const ::thrift_codegen::RObject& /* frame */, const int64_t /* queryId */, const std::string& /* request */, const bool /* persistent */, const ::thrift_codegen::RObject& /* queryCallback */) override { bool _return = false; return _return; } - void MessageRouterHandler_onQueryCanceled(const ::thrift_codegen::RObject& /* handler */, const int32_t /* bid */, const int64_t /* queryId */) override { + void MessageRouterHandler_onQueryCanceled(const ::thrift_codegen::RObject& /* handler */, const int32_t /* bid */, const ::thrift_codegen::RObject& /* frame */, const int64_t /* queryId */) override { return; } void MessageRouterHandler_Dispose(const int32_t /* handler */) override { return; } - void SchemeHandlerFactory_CreateHandler( ::thrift_codegen::RObject& /* _return */, const int32_t /* schemeHandlerFactory */, const int32_t /* bid */, const std::string& /* scheme_name */, const ::thrift_codegen::RObject& /* request */) override { + void SchemeHandlerFactory_CreateHandler( ::thrift_codegen::RObject& /* _return */, const int32_t /* schemeHandlerFactory */, const int32_t /* bid */, const ::thrift_codegen::RObject& /* frame */, const std::string& /* scheme_name */, const ::thrift_codegen::RObject& /* request */) override { return; } void SchemeHandlerFactory_Dispose(const int32_t /* schemeHandlerFactory */) override { @@ -927,8 +927,9 @@ class ClientHandlers_RenderHandler_OnPaint_presult { }; typedef struct _ClientHandlers_LifeSpanHandler_OnBeforePopup_args__isset { - _ClientHandlers_LifeSpanHandler_OnBeforePopup_args__isset() : bid(false), url(false), frameName(false), gesture(false) {} + _ClientHandlers_LifeSpanHandler_OnBeforePopup_args__isset() : bid(false), frame(false), url(false), frameName(false), gesture(false) {} bool bid :1; + bool frame :1; bool url :1; bool frameName :1; bool gesture :1; @@ -948,6 +949,7 @@ class ClientHandlers_LifeSpanHandler_OnBeforePopup_args { virtual ~ClientHandlers_LifeSpanHandler_OnBeforePopup_args() noexcept; int32_t bid; + ::thrift_codegen::RObject frame; std::string url; std::string frameName; bool gesture; @@ -956,6 +958,8 @@ class ClientHandlers_LifeSpanHandler_OnBeforePopup_args { void __set_bid(const int32_t val); + void __set_frame(const ::thrift_codegen::RObject& val); + void __set_url(const std::string& val); void __set_frameName(const std::string& val); @@ -966,6 +970,8 @@ class ClientHandlers_LifeSpanHandler_OnBeforePopup_args { { if (!(bid == rhs.bid)) return false; + if (!(frame == rhs.frame)) + return false; if (!(url == rhs.url)) return false; if (!(frameName == rhs.frameName)) @@ -992,6 +998,7 @@ class ClientHandlers_LifeSpanHandler_OnBeforePopup_pargs { virtual ~ClientHandlers_LifeSpanHandler_OnBeforePopup_pargs() noexcept; const int32_t* bid; + const ::thrift_codegen::RObject* frame; const std::string* url; const std::string* frameName; const bool* gesture; @@ -1345,16 +1352,17 @@ class ClientHandlers_LoadHandler_OnLoadingStateChange_pargs { }; typedef struct _ClientHandlers_LoadHandler_OnLoadStart_args__isset { - _ClientHandlers_LoadHandler_OnLoadStart_args__isset() : bid(false), transition_type(false) {} + _ClientHandlers_LoadHandler_OnLoadStart_args__isset() : bid(false), frame(false), transition_type(false) {} bool bid :1; + bool frame :1; bool transition_type :1; } _ClientHandlers_LoadHandler_OnLoadStart_args__isset; class ClientHandlers_LoadHandler_OnLoadStart_args { public: - ClientHandlers_LoadHandler_OnLoadStart_args(const ClientHandlers_LoadHandler_OnLoadStart_args&) noexcept; - ClientHandlers_LoadHandler_OnLoadStart_args& operator=(const ClientHandlers_LoadHandler_OnLoadStart_args&) noexcept; + ClientHandlers_LoadHandler_OnLoadStart_args(const ClientHandlers_LoadHandler_OnLoadStart_args&); + ClientHandlers_LoadHandler_OnLoadStart_args& operator=(const ClientHandlers_LoadHandler_OnLoadStart_args&); ClientHandlers_LoadHandler_OnLoadStart_args() noexcept : bid(0), transition_type(0) { @@ -1362,18 +1370,23 @@ class ClientHandlers_LoadHandler_OnLoadStart_args { virtual ~ClientHandlers_LoadHandler_OnLoadStart_args() noexcept; int32_t bid; + ::thrift_codegen::RObject frame; int32_t transition_type; _ClientHandlers_LoadHandler_OnLoadStart_args__isset __isset; void __set_bid(const int32_t val); + void __set_frame(const ::thrift_codegen::RObject& val); + void __set_transition_type(const int32_t val); bool operator == (const ClientHandlers_LoadHandler_OnLoadStart_args & rhs) const { if (!(bid == rhs.bid)) return false; + if (!(frame == rhs.frame)) + return false; if (!(transition_type == rhs.transition_type)) return false; return true; @@ -1396,6 +1409,7 @@ class ClientHandlers_LoadHandler_OnLoadStart_pargs { virtual ~ClientHandlers_LoadHandler_OnLoadStart_pargs() noexcept; const int32_t* bid; + const ::thrift_codegen::RObject* frame; const int32_t* transition_type; uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; @@ -1403,16 +1417,17 @@ class ClientHandlers_LoadHandler_OnLoadStart_pargs { }; typedef struct _ClientHandlers_LoadHandler_OnLoadEnd_args__isset { - _ClientHandlers_LoadHandler_OnLoadEnd_args__isset() : bid(false), httpStatusCode(false) {} + _ClientHandlers_LoadHandler_OnLoadEnd_args__isset() : bid(false), frame(false), httpStatusCode(false) {} bool bid :1; + bool frame :1; bool httpStatusCode :1; } _ClientHandlers_LoadHandler_OnLoadEnd_args__isset; class ClientHandlers_LoadHandler_OnLoadEnd_args { public: - ClientHandlers_LoadHandler_OnLoadEnd_args(const ClientHandlers_LoadHandler_OnLoadEnd_args&) noexcept; - ClientHandlers_LoadHandler_OnLoadEnd_args& operator=(const ClientHandlers_LoadHandler_OnLoadEnd_args&) noexcept; + ClientHandlers_LoadHandler_OnLoadEnd_args(const ClientHandlers_LoadHandler_OnLoadEnd_args&); + ClientHandlers_LoadHandler_OnLoadEnd_args& operator=(const ClientHandlers_LoadHandler_OnLoadEnd_args&); ClientHandlers_LoadHandler_OnLoadEnd_args() noexcept : bid(0), httpStatusCode(0) { @@ -1420,18 +1435,23 @@ class ClientHandlers_LoadHandler_OnLoadEnd_args { virtual ~ClientHandlers_LoadHandler_OnLoadEnd_args() noexcept; int32_t bid; + ::thrift_codegen::RObject frame; int32_t httpStatusCode; _ClientHandlers_LoadHandler_OnLoadEnd_args__isset __isset; void __set_bid(const int32_t val); + void __set_frame(const ::thrift_codegen::RObject& val); + void __set_httpStatusCode(const int32_t val); bool operator == (const ClientHandlers_LoadHandler_OnLoadEnd_args & rhs) const { if (!(bid == rhs.bid)) return false; + if (!(frame == rhs.frame)) + return false; if (!(httpStatusCode == rhs.httpStatusCode)) return false; return true; @@ -1454,6 +1474,7 @@ class ClientHandlers_LoadHandler_OnLoadEnd_pargs { virtual ~ClientHandlers_LoadHandler_OnLoadEnd_pargs() noexcept; const int32_t* bid; + const ::thrift_codegen::RObject* frame; const int32_t* httpStatusCode; uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; @@ -1461,8 +1482,9 @@ class ClientHandlers_LoadHandler_OnLoadEnd_pargs { }; typedef struct _ClientHandlers_LoadHandler_OnLoadError_args__isset { - _ClientHandlers_LoadHandler_OnLoadError_args__isset() : bid(false), errorCode(false), errorText(false), failedUrl(false) {} + _ClientHandlers_LoadHandler_OnLoadError_args__isset() : bid(false), frame(false), errorCode(false), errorText(false), failedUrl(false) {} bool bid :1; + bool frame :1; bool errorCode :1; bool errorText :1; bool failedUrl :1; @@ -1482,6 +1504,7 @@ class ClientHandlers_LoadHandler_OnLoadError_args { virtual ~ClientHandlers_LoadHandler_OnLoadError_args() noexcept; int32_t bid; + ::thrift_codegen::RObject frame; int32_t errorCode; std::string errorText; std::string failedUrl; @@ -1490,6 +1513,8 @@ class ClientHandlers_LoadHandler_OnLoadError_args { void __set_bid(const int32_t val); + void __set_frame(const ::thrift_codegen::RObject& val); + void __set_errorCode(const int32_t val); void __set_errorText(const std::string& val); @@ -1500,6 +1525,8 @@ class ClientHandlers_LoadHandler_OnLoadError_args { { if (!(bid == rhs.bid)) return false; + if (!(frame == rhs.frame)) + return false; if (!(errorCode == rhs.errorCode)) return false; if (!(errorText == rhs.errorText)) @@ -1526,6 +1553,7 @@ class ClientHandlers_LoadHandler_OnLoadError_pargs { virtual ~ClientHandlers_LoadHandler_OnLoadError_pargs() noexcept; const int32_t* bid; + const ::thrift_codegen::RObject* frame; const int32_t* errorCode; const std::string* errorText; const std::string* failedUrl; @@ -1535,8 +1563,9 @@ class ClientHandlers_LoadHandler_OnLoadError_pargs { }; typedef struct _ClientHandlers_DisplayHandler_OnAddressChange_args__isset { - _ClientHandlers_DisplayHandler_OnAddressChange_args__isset() : bid(false), url(false) {} + _ClientHandlers_DisplayHandler_OnAddressChange_args__isset() : bid(false), frame(false), url(false) {} bool bid :1; + bool frame :1; bool url :1; } _ClientHandlers_DisplayHandler_OnAddressChange_args__isset; @@ -1552,18 +1581,23 @@ class ClientHandlers_DisplayHandler_OnAddressChange_args { virtual ~ClientHandlers_DisplayHandler_OnAddressChange_args() noexcept; int32_t bid; + ::thrift_codegen::RObject frame; std::string url; _ClientHandlers_DisplayHandler_OnAddressChange_args__isset __isset; void __set_bid(const int32_t val); + void __set_frame(const ::thrift_codegen::RObject& val); + void __set_url(const std::string& val); bool operator == (const ClientHandlers_DisplayHandler_OnAddressChange_args & rhs) const { if (!(bid == rhs.bid)) return false; + if (!(frame == rhs.frame)) + return false; if (!(url == rhs.url)) return false; return true; @@ -1586,6 +1620,7 @@ class ClientHandlers_DisplayHandler_OnAddressChange_pargs { virtual ~ClientHandlers_DisplayHandler_OnAddressChange_pargs() noexcept; const int32_t* bid; + const ::thrift_codegen::RObject* frame; const std::string* url; uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; @@ -2409,8 +2444,9 @@ class ClientHandlers_FocusHandler_OnGotFocus_pargs { }; typedef struct _ClientHandlers_RequestHandler_OnBeforeBrowse_args__isset { - _ClientHandlers_RequestHandler_OnBeforeBrowse_args__isset() : bid(false), request(false), user_gesture(false), is_redirect(false) {} + _ClientHandlers_RequestHandler_OnBeforeBrowse_args__isset() : bid(false), frame(false), request(false), user_gesture(false), is_redirect(false) {} bool bid :1; + bool frame :1; bool request :1; bool user_gesture :1; bool is_redirect :1; @@ -2429,6 +2465,7 @@ class ClientHandlers_RequestHandler_OnBeforeBrowse_args { virtual ~ClientHandlers_RequestHandler_OnBeforeBrowse_args() noexcept; int32_t bid; + ::thrift_codegen::RObject frame; ::thrift_codegen::RObject request; bool user_gesture; bool is_redirect; @@ -2437,6 +2474,8 @@ class ClientHandlers_RequestHandler_OnBeforeBrowse_args { void __set_bid(const int32_t val); + void __set_frame(const ::thrift_codegen::RObject& val); + void __set_request(const ::thrift_codegen::RObject& val); void __set_user_gesture(const bool val); @@ -2447,6 +2486,8 @@ class ClientHandlers_RequestHandler_OnBeforeBrowse_args { { if (!(bid == rhs.bid)) return false; + if (!(frame == rhs.frame)) + return false; if (!(request == rhs.request)) return false; if (!(user_gesture == rhs.user_gesture)) @@ -2473,6 +2514,7 @@ class ClientHandlers_RequestHandler_OnBeforeBrowse_pargs { virtual ~ClientHandlers_RequestHandler_OnBeforeBrowse_pargs() noexcept; const int32_t* bid; + const ::thrift_codegen::RObject* frame; const ::thrift_codegen::RObject* request; const bool* user_gesture; const bool* is_redirect; @@ -2538,8 +2580,9 @@ class ClientHandlers_RequestHandler_OnBeforeBrowse_presult { }; typedef struct _ClientHandlers_RequestHandler_OnOpenURLFromTab_args__isset { - _ClientHandlers_RequestHandler_OnOpenURLFromTab_args__isset() : bid(false), target_url(false), user_gesture(false) {} + _ClientHandlers_RequestHandler_OnOpenURLFromTab_args__isset() : bid(false), frame(false), target_url(false), user_gesture(false) {} bool bid :1; + bool frame :1; bool target_url :1; bool user_gesture :1; } _ClientHandlers_RequestHandler_OnOpenURLFromTab_args__isset; @@ -2557,6 +2600,7 @@ class ClientHandlers_RequestHandler_OnOpenURLFromTab_args { virtual ~ClientHandlers_RequestHandler_OnOpenURLFromTab_args() noexcept; int32_t bid; + ::thrift_codegen::RObject frame; std::string target_url; bool user_gesture; @@ -2564,6 +2608,8 @@ class ClientHandlers_RequestHandler_OnOpenURLFromTab_args { void __set_bid(const int32_t val); + void __set_frame(const ::thrift_codegen::RObject& val); + void __set_target_url(const std::string& val); void __set_user_gesture(const bool val); @@ -2572,6 +2618,8 @@ class ClientHandlers_RequestHandler_OnOpenURLFromTab_args { { if (!(bid == rhs.bid)) return false; + if (!(frame == rhs.frame)) + return false; if (!(target_url == rhs.target_url)) return false; if (!(user_gesture == rhs.user_gesture)) @@ -2596,6 +2644,7 @@ class ClientHandlers_RequestHandler_OnOpenURLFromTab_pargs { virtual ~ClientHandlers_RequestHandler_OnOpenURLFromTab_pargs() noexcept; const int32_t* bid; + const ::thrift_codegen::RObject* frame; const std::string* target_url; const bool* user_gesture; @@ -3016,8 +3065,9 @@ class ClientHandlers_RequestHandler_OnRenderProcessTerminated_pargs { }; typedef struct _ClientHandlers_RequestHandler_GetResourceRequestHandler_args__isset { - _ClientHandlers_RequestHandler_GetResourceRequestHandler_args__isset() : bid(false), request(false), isNavigation(false), isDownload(false), requestInitiator(false) {} + _ClientHandlers_RequestHandler_GetResourceRequestHandler_args__isset() : bid(false), frame(false), request(false), isNavigation(false), isDownload(false), requestInitiator(false) {} bool bid :1; + bool frame :1; bool request :1; bool isNavigation :1; bool isDownload :1; @@ -3038,6 +3088,7 @@ class ClientHandlers_RequestHandler_GetResourceRequestHandler_args { virtual ~ClientHandlers_RequestHandler_GetResourceRequestHandler_args() noexcept; int32_t bid; + ::thrift_codegen::RObject frame; ::thrift_codegen::RObject request; bool isNavigation; bool isDownload; @@ -3047,6 +3098,8 @@ class ClientHandlers_RequestHandler_GetResourceRequestHandler_args { void __set_bid(const int32_t val); + void __set_frame(const ::thrift_codegen::RObject& val); + void __set_request(const ::thrift_codegen::RObject& val); void __set_isNavigation(const bool val); @@ -3059,6 +3112,8 @@ class ClientHandlers_RequestHandler_GetResourceRequestHandler_args { { if (!(bid == rhs.bid)) return false; + if (!(frame == rhs.frame)) + return false; if (!(request == rhs.request)) return false; if (!(isNavigation == rhs.isNavigation)) @@ -3087,6 +3142,7 @@ class ClientHandlers_RequestHandler_GetResourceRequestHandler_pargs { virtual ~ClientHandlers_RequestHandler_GetResourceRequestHandler_pargs() noexcept; const int32_t* bid; + const ::thrift_codegen::RObject* frame; const ::thrift_codegen::RObject* request; const bool* isNavigation; const bool* isDownload; @@ -3202,9 +3258,10 @@ class ClientHandlers_ResourceRequestHandler_Dispose_pargs { }; typedef struct _ClientHandlers_ResourceRequestHandler_GetCookieAccessFilter_args__isset { - _ClientHandlers_ResourceRequestHandler_GetCookieAccessFilter_args__isset() : rrHandler(false), bid(false), request(false) {} + _ClientHandlers_ResourceRequestHandler_GetCookieAccessFilter_args__isset() : rrHandler(false), bid(false), frame(false), request(false) {} bool rrHandler :1; bool bid :1; + bool frame :1; bool request :1; } _ClientHandlers_ResourceRequestHandler_GetCookieAccessFilter_args__isset; @@ -3221,6 +3278,7 @@ class ClientHandlers_ResourceRequestHandler_GetCookieAccessFilter_args { virtual ~ClientHandlers_ResourceRequestHandler_GetCookieAccessFilter_args() noexcept; int32_t rrHandler; int32_t bid; + ::thrift_codegen::RObject frame; ::thrift_codegen::RObject request; _ClientHandlers_ResourceRequestHandler_GetCookieAccessFilter_args__isset __isset; @@ -3229,6 +3287,8 @@ class ClientHandlers_ResourceRequestHandler_GetCookieAccessFilter_args { void __set_bid(const int32_t val); + void __set_frame(const ::thrift_codegen::RObject& val); + void __set_request(const ::thrift_codegen::RObject& val); bool operator == (const ClientHandlers_ResourceRequestHandler_GetCookieAccessFilter_args & rhs) const @@ -3237,6 +3297,8 @@ class ClientHandlers_ResourceRequestHandler_GetCookieAccessFilter_args { return false; if (!(bid == rhs.bid)) return false; + if (!(frame == rhs.frame)) + return false; if (!(request == rhs.request)) return false; return true; @@ -3260,6 +3322,7 @@ class ClientHandlers_ResourceRequestHandler_GetCookieAccessFilter_pargs { virtual ~ClientHandlers_ResourceRequestHandler_GetCookieAccessFilter_pargs() noexcept; const int32_t* rrHandler; const int32_t* bid; + const ::thrift_codegen::RObject* frame; const ::thrift_codegen::RObject* request; uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; @@ -3372,9 +3435,10 @@ class ClientHandlers_CookieAccessFilter_Dispose_pargs { }; typedef struct _ClientHandlers_CookieAccessFilter_CanSendCookie_args__isset { - _ClientHandlers_CookieAccessFilter_CanSendCookie_args__isset() : filter(false), bid(false), request(false), cookie(false) {} + _ClientHandlers_CookieAccessFilter_CanSendCookie_args__isset() : filter(false), bid(false), frame(false), request(false), cookie(false) {} bool filter :1; bool bid :1; + bool frame :1; bool request :1; bool cookie :1; } _ClientHandlers_CookieAccessFilter_CanSendCookie_args__isset; @@ -3392,6 +3456,7 @@ class ClientHandlers_CookieAccessFilter_CanSendCookie_args { virtual ~ClientHandlers_CookieAccessFilter_CanSendCookie_args() noexcept; int32_t filter; int32_t bid; + ::thrift_codegen::RObject frame; ::thrift_codegen::RObject request; std::vector<std::string> cookie; @@ -3401,6 +3466,8 @@ class ClientHandlers_CookieAccessFilter_CanSendCookie_args { void __set_bid(const int32_t val); + void __set_frame(const ::thrift_codegen::RObject& val); + void __set_request(const ::thrift_codegen::RObject& val); void __set_cookie(const std::vector<std::string> & val); @@ -3411,6 +3478,8 @@ class ClientHandlers_CookieAccessFilter_CanSendCookie_args { return false; if (!(bid == rhs.bid)) return false; + if (!(frame == rhs.frame)) + return false; if (!(request == rhs.request)) return false; if (!(cookie == rhs.cookie)) @@ -3436,6 +3505,7 @@ class ClientHandlers_CookieAccessFilter_CanSendCookie_pargs { virtual ~ClientHandlers_CookieAccessFilter_CanSendCookie_pargs() noexcept; const int32_t* filter; const int32_t* bid; + const ::thrift_codegen::RObject* frame; const ::thrift_codegen::RObject* request; const std::vector<std::string> * cookie; @@ -3500,9 +3570,10 @@ class ClientHandlers_CookieAccessFilter_CanSendCookie_presult { }; typedef struct _ClientHandlers_CookieAccessFilter_CanSaveCookie_args__isset { - _ClientHandlers_CookieAccessFilter_CanSaveCookie_args__isset() : filter(false), bid(false), request(false), response(false), cookie(false) {} + _ClientHandlers_CookieAccessFilter_CanSaveCookie_args__isset() : filter(false), bid(false), frame(false), request(false), response(false), cookie(false) {} bool filter :1; bool bid :1; + bool frame :1; bool request :1; bool response :1; bool cookie :1; @@ -3521,6 +3592,7 @@ class ClientHandlers_CookieAccessFilter_CanSaveCookie_args { virtual ~ClientHandlers_CookieAccessFilter_CanSaveCookie_args() noexcept; int32_t filter; int32_t bid; + ::thrift_codegen::RObject frame; ::thrift_codegen::RObject request; ::thrift_codegen::RObject response; std::vector<std::string> cookie; @@ -3531,6 +3603,8 @@ class ClientHandlers_CookieAccessFilter_CanSaveCookie_args { void __set_bid(const int32_t val); + void __set_frame(const ::thrift_codegen::RObject& val); + void __set_request(const ::thrift_codegen::RObject& val); void __set_response(const ::thrift_codegen::RObject& val); @@ -3543,6 +3617,8 @@ class ClientHandlers_CookieAccessFilter_CanSaveCookie_args { return false; if (!(bid == rhs.bid)) return false; + if (!(frame == rhs.frame)) + return false; if (!(request == rhs.request)) return false; if (!(response == rhs.response)) @@ -3570,6 +3646,7 @@ class ClientHandlers_CookieAccessFilter_CanSaveCookie_pargs { virtual ~ClientHandlers_CookieAccessFilter_CanSaveCookie_pargs() noexcept; const int32_t* filter; const int32_t* bid; + const ::thrift_codegen::RObject* frame; const ::thrift_codegen::RObject* request; const ::thrift_codegen::RObject* response; const std::vector<std::string> * cookie; @@ -3635,9 +3712,10 @@ class ClientHandlers_CookieAccessFilter_CanSaveCookie_presult { }; typedef struct _ClientHandlers_ResourceRequestHandler_OnBeforeResourceLoad_args__isset { - _ClientHandlers_ResourceRequestHandler_OnBeforeResourceLoad_args__isset() : rrHandler(false), bid(false), request(false) {} + _ClientHandlers_ResourceRequestHandler_OnBeforeResourceLoad_args__isset() : rrHandler(false), bid(false), frame(false), request(false) {} bool rrHandler :1; bool bid :1; + bool frame :1; bool request :1; } _ClientHandlers_ResourceRequestHandler_OnBeforeResourceLoad_args__isset; @@ -3654,6 +3732,7 @@ class ClientHandlers_ResourceRequestHandler_OnBeforeResourceLoad_args { virtual ~ClientHandlers_ResourceRequestHandler_OnBeforeResourceLoad_args() noexcept; int32_t rrHandler; int32_t bid; + ::thrift_codegen::RObject frame; ::thrift_codegen::RObject request; _ClientHandlers_ResourceRequestHandler_OnBeforeResourceLoad_args__isset __isset; @@ -3662,6 +3741,8 @@ class ClientHandlers_ResourceRequestHandler_OnBeforeResourceLoad_args { void __set_bid(const int32_t val); + void __set_frame(const ::thrift_codegen::RObject& val); + void __set_request(const ::thrift_codegen::RObject& val); bool operator == (const ClientHandlers_ResourceRequestHandler_OnBeforeResourceLoad_args & rhs) const @@ -3670,6 +3751,8 @@ class ClientHandlers_ResourceRequestHandler_OnBeforeResourceLoad_args { return false; if (!(bid == rhs.bid)) return false; + if (!(frame == rhs.frame)) + return false; if (!(request == rhs.request)) return false; return true; @@ -3693,6 +3776,7 @@ class ClientHandlers_ResourceRequestHandler_OnBeforeResourceLoad_pargs { virtual ~ClientHandlers_ResourceRequestHandler_OnBeforeResourceLoad_pargs() noexcept; const int32_t* rrHandler; const int32_t* bid; + const ::thrift_codegen::RObject* frame; const ::thrift_codegen::RObject* request; uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; @@ -3756,9 +3840,10 @@ class ClientHandlers_ResourceRequestHandler_OnBeforeResourceLoad_presult { }; typedef struct _ClientHandlers_ResourceRequestHandler_GetResourceHandler_args__isset { - _ClientHandlers_ResourceRequestHandler_GetResourceHandler_args__isset() : rrHandler(false), bid(false), request(false) {} + _ClientHandlers_ResourceRequestHandler_GetResourceHandler_args__isset() : rrHandler(false), bid(false), frame(false), request(false) {} bool rrHandler :1; bool bid :1; + bool frame :1; bool request :1; } _ClientHandlers_ResourceRequestHandler_GetResourceHandler_args__isset; @@ -3775,6 +3860,7 @@ class ClientHandlers_ResourceRequestHandler_GetResourceHandler_args { virtual ~ClientHandlers_ResourceRequestHandler_GetResourceHandler_args() noexcept; int32_t rrHandler; int32_t bid; + ::thrift_codegen::RObject frame; ::thrift_codegen::RObject request; _ClientHandlers_ResourceRequestHandler_GetResourceHandler_args__isset __isset; @@ -3783,6 +3869,8 @@ class ClientHandlers_ResourceRequestHandler_GetResourceHandler_args { void __set_bid(const int32_t val); + void __set_frame(const ::thrift_codegen::RObject& val); + void __set_request(const ::thrift_codegen::RObject& val); bool operator == (const ClientHandlers_ResourceRequestHandler_GetResourceHandler_args & rhs) const @@ -3791,6 +3879,8 @@ class ClientHandlers_ResourceRequestHandler_GetResourceHandler_args { return false; if (!(bid == rhs.bid)) return false; + if (!(frame == rhs.frame)) + return false; if (!(request == rhs.request)) return false; return true; @@ -3814,6 +3904,7 @@ class ClientHandlers_ResourceRequestHandler_GetResourceHandler_pargs { virtual ~ClientHandlers_ResourceRequestHandler_GetResourceHandler_pargs() noexcept; const int32_t* rrHandler; const int32_t* bid; + const ::thrift_codegen::RObject* frame; const ::thrift_codegen::RObject* request; uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; @@ -4328,9 +4419,10 @@ class ClientHandlers_ResourceHandler_Cancel_pargs { }; typedef struct _ClientHandlers_ResourceRequestHandler_OnResourceRedirect_args__isset { - _ClientHandlers_ResourceRequestHandler_OnResourceRedirect_args__isset() : rrHandler(false), bid(false), request(false), response(false), new_url(false) {} + _ClientHandlers_ResourceRequestHandler_OnResourceRedirect_args__isset() : rrHandler(false), bid(false), frame(false), request(false), response(false), new_url(false) {} bool rrHandler :1; bool bid :1; + bool frame :1; bool request :1; bool response :1; bool new_url :1; @@ -4350,6 +4442,7 @@ class ClientHandlers_ResourceRequestHandler_OnResourceRedirect_args { virtual ~ClientHandlers_ResourceRequestHandler_OnResourceRedirect_args() noexcept; int32_t rrHandler; int32_t bid; + ::thrift_codegen::RObject frame; ::thrift_codegen::RObject request; ::thrift_codegen::RObject response; std::string new_url; @@ -4360,6 +4453,8 @@ class ClientHandlers_ResourceRequestHandler_OnResourceRedirect_args { void __set_bid(const int32_t val); + void __set_frame(const ::thrift_codegen::RObject& val); + void __set_request(const ::thrift_codegen::RObject& val); void __set_response(const ::thrift_codegen::RObject& val); @@ -4372,6 +4467,8 @@ class ClientHandlers_ResourceRequestHandler_OnResourceRedirect_args { return false; if (!(bid == rhs.bid)) return false; + if (!(frame == rhs.frame)) + return false; if (!(request == rhs.request)) return false; if (!(response == rhs.response)) @@ -4399,6 +4496,7 @@ class ClientHandlers_ResourceRequestHandler_OnResourceRedirect_pargs { virtual ~ClientHandlers_ResourceRequestHandler_OnResourceRedirect_pargs() noexcept; const int32_t* rrHandler; const int32_t* bid; + const ::thrift_codegen::RObject* frame; const ::thrift_codegen::RObject* request; const ::thrift_codegen::RObject* response; const std::string* new_url; @@ -4464,9 +4562,10 @@ class ClientHandlers_ResourceRequestHandler_OnResourceRedirect_presult { }; typedef struct _ClientHandlers_ResourceRequestHandler_OnResourceResponse_args__isset { - _ClientHandlers_ResourceRequestHandler_OnResourceResponse_args__isset() : rrHandler(false), bid(false), request(false), response(false) {} + _ClientHandlers_ResourceRequestHandler_OnResourceResponse_args__isset() : rrHandler(false), bid(false), frame(false), request(false), response(false) {} bool rrHandler :1; bool bid :1; + bool frame :1; bool request :1; bool response :1; } _ClientHandlers_ResourceRequestHandler_OnResourceResponse_args__isset; @@ -4484,6 +4583,7 @@ class ClientHandlers_ResourceRequestHandler_OnResourceResponse_args { virtual ~ClientHandlers_ResourceRequestHandler_OnResourceResponse_args() noexcept; int32_t rrHandler; int32_t bid; + ::thrift_codegen::RObject frame; ::thrift_codegen::RObject request; ::thrift_codegen::RObject response; @@ -4493,6 +4593,8 @@ class ClientHandlers_ResourceRequestHandler_OnResourceResponse_args { void __set_bid(const int32_t val); + void __set_frame(const ::thrift_codegen::RObject& val); + void __set_request(const ::thrift_codegen::RObject& val); void __set_response(const ::thrift_codegen::RObject& val); @@ -4503,6 +4605,8 @@ class ClientHandlers_ResourceRequestHandler_OnResourceResponse_args { return false; if (!(bid == rhs.bid)) return false; + if (!(frame == rhs.frame)) + return false; if (!(request == rhs.request)) return false; if (!(response == rhs.response)) @@ -4528,6 +4632,7 @@ class ClientHandlers_ResourceRequestHandler_OnResourceResponse_pargs { virtual ~ClientHandlers_ResourceRequestHandler_OnResourceResponse_pargs() noexcept; const int32_t* rrHandler; const int32_t* bid; + const ::thrift_codegen::RObject* frame; const ::thrift_codegen::RObject* request; const ::thrift_codegen::RObject* response; @@ -4592,9 +4697,10 @@ class ClientHandlers_ResourceRequestHandler_OnResourceResponse_presult { }; typedef struct _ClientHandlers_ResourceRequestHandler_OnResourceLoadComplete_args__isset { - _ClientHandlers_ResourceRequestHandler_OnResourceLoadComplete_args__isset() : rrHandler(false), bid(false), request(false), response(false), status(false), receivedContentLength(false) {} + _ClientHandlers_ResourceRequestHandler_OnResourceLoadComplete_args__isset() : rrHandler(false), bid(false), frame(false), request(false), response(false), status(false), receivedContentLength(false) {} bool rrHandler :1; bool bid :1; + bool frame :1; bool request :1; bool response :1; bool status :1; @@ -4616,6 +4722,7 @@ class ClientHandlers_ResourceRequestHandler_OnResourceLoadComplete_args { virtual ~ClientHandlers_ResourceRequestHandler_OnResourceLoadComplete_args() noexcept; int32_t rrHandler; int32_t bid; + ::thrift_codegen::RObject frame; ::thrift_codegen::RObject request; ::thrift_codegen::RObject response; std::string status; @@ -4627,6 +4734,8 @@ class ClientHandlers_ResourceRequestHandler_OnResourceLoadComplete_args { void __set_bid(const int32_t val); + void __set_frame(const ::thrift_codegen::RObject& val); + void __set_request(const ::thrift_codegen::RObject& val); void __set_response(const ::thrift_codegen::RObject& val); @@ -4641,6 +4750,8 @@ class ClientHandlers_ResourceRequestHandler_OnResourceLoadComplete_args { return false; if (!(bid == rhs.bid)) return false; + if (!(frame == rhs.frame)) + return false; if (!(request == rhs.request)) return false; if (!(response == rhs.response)) @@ -4670,6 +4781,7 @@ class ClientHandlers_ResourceRequestHandler_OnResourceLoadComplete_pargs { virtual ~ClientHandlers_ResourceRequestHandler_OnResourceLoadComplete_pargs() noexcept; const int32_t* rrHandler; const int32_t* bid; + const ::thrift_codegen::RObject* frame; const ::thrift_codegen::RObject* request; const ::thrift_codegen::RObject* response; const std::string* status; @@ -4717,9 +4829,10 @@ class ClientHandlers_ResourceRequestHandler_OnResourceLoadComplete_presult { }; typedef struct _ClientHandlers_ResourceRequestHandler_OnProtocolExecution_args__isset { - _ClientHandlers_ResourceRequestHandler_OnProtocolExecution_args__isset() : rrHandler(false), bid(false), request(false), allowOsExecution(false) {} + _ClientHandlers_ResourceRequestHandler_OnProtocolExecution_args__isset() : rrHandler(false), bid(false), frame(false), request(false), allowOsExecution(false) {} bool rrHandler :1; bool bid :1; + bool frame :1; bool request :1; bool allowOsExecution :1; } _ClientHandlers_ResourceRequestHandler_OnProtocolExecution_args__isset; @@ -4738,6 +4851,7 @@ class ClientHandlers_ResourceRequestHandler_OnProtocolExecution_args { virtual ~ClientHandlers_ResourceRequestHandler_OnProtocolExecution_args() noexcept; int32_t rrHandler; int32_t bid; + ::thrift_codegen::RObject frame; ::thrift_codegen::RObject request; bool allowOsExecution; @@ -4747,6 +4861,8 @@ class ClientHandlers_ResourceRequestHandler_OnProtocolExecution_args { void __set_bid(const int32_t val); + void __set_frame(const ::thrift_codegen::RObject& val); + void __set_request(const ::thrift_codegen::RObject& val); void __set_allowOsExecution(const bool val); @@ -4757,6 +4873,8 @@ class ClientHandlers_ResourceRequestHandler_OnProtocolExecution_args { return false; if (!(bid == rhs.bid)) return false; + if (!(frame == rhs.frame)) + return false; if (!(request == rhs.request)) return false; if (!(allowOsExecution == rhs.allowOsExecution)) @@ -4782,6 +4900,7 @@ class ClientHandlers_ResourceRequestHandler_OnProtocolExecution_pargs { virtual ~ClientHandlers_ResourceRequestHandler_OnProtocolExecution_pargs() noexcept; const int32_t* rrHandler; const int32_t* bid; + const ::thrift_codegen::RObject* frame; const ::thrift_codegen::RObject* request; const bool* allowOsExecution; @@ -4846,9 +4965,10 @@ class ClientHandlers_ResourceRequestHandler_OnProtocolExecution_presult { }; typedef struct _ClientHandlers_MessageRouterHandler_onQuery_args__isset { - _ClientHandlers_MessageRouterHandler_onQuery_args__isset() : handler(false), bid(false), queryId(false), request(false), persistent(false), queryCallback(false) {} + _ClientHandlers_MessageRouterHandler_onQuery_args__isset() : handler(false), bid(false), frame(false), queryId(false), request(false), persistent(false), queryCallback(false) {} bool handler :1; bool bid :1; + bool frame :1; bool queryId :1; bool request :1; bool persistent :1; @@ -4870,6 +4990,7 @@ class ClientHandlers_MessageRouterHandler_onQuery_args { virtual ~ClientHandlers_MessageRouterHandler_onQuery_args() noexcept; ::thrift_codegen::RObject handler; int32_t bid; + ::thrift_codegen::RObject frame; int64_t queryId; std::string request; bool persistent; @@ -4881,6 +5002,8 @@ class ClientHandlers_MessageRouterHandler_onQuery_args { void __set_bid(const int32_t val); + void __set_frame(const ::thrift_codegen::RObject& val); + void __set_queryId(const int64_t val); void __set_request(const std::string& val); @@ -4895,6 +5018,8 @@ class ClientHandlers_MessageRouterHandler_onQuery_args { return false; if (!(bid == rhs.bid)) return false; + if (!(frame == rhs.frame)) + return false; if (!(queryId == rhs.queryId)) return false; if (!(request == rhs.request)) @@ -4924,6 +5049,7 @@ class ClientHandlers_MessageRouterHandler_onQuery_pargs { virtual ~ClientHandlers_MessageRouterHandler_onQuery_pargs() noexcept; const ::thrift_codegen::RObject* handler; const int32_t* bid; + const ::thrift_codegen::RObject* frame; const int64_t* queryId; const std::string* request; const bool* persistent; @@ -4990,9 +5116,10 @@ class ClientHandlers_MessageRouterHandler_onQuery_presult { }; typedef struct _ClientHandlers_MessageRouterHandler_onQueryCanceled_args__isset { - _ClientHandlers_MessageRouterHandler_onQueryCanceled_args__isset() : handler(false), bid(false), queryId(false) {} + _ClientHandlers_MessageRouterHandler_onQueryCanceled_args__isset() : handler(false), bid(false), frame(false), queryId(false) {} bool handler :1; bool bid :1; + bool frame :1; bool queryId :1; } _ClientHandlers_MessageRouterHandler_onQueryCanceled_args__isset; @@ -5009,6 +5136,7 @@ class ClientHandlers_MessageRouterHandler_onQueryCanceled_args { virtual ~ClientHandlers_MessageRouterHandler_onQueryCanceled_args() noexcept; ::thrift_codegen::RObject handler; int32_t bid; + ::thrift_codegen::RObject frame; int64_t queryId; _ClientHandlers_MessageRouterHandler_onQueryCanceled_args__isset __isset; @@ -5017,6 +5145,8 @@ class ClientHandlers_MessageRouterHandler_onQueryCanceled_args { void __set_bid(const int32_t val); + void __set_frame(const ::thrift_codegen::RObject& val); + void __set_queryId(const int64_t val); bool operator == (const ClientHandlers_MessageRouterHandler_onQueryCanceled_args & rhs) const @@ -5025,6 +5155,8 @@ class ClientHandlers_MessageRouterHandler_onQueryCanceled_args { return false; if (!(bid == rhs.bid)) return false; + if (!(frame == rhs.frame)) + return false; if (!(queryId == rhs.queryId)) return false; return true; @@ -5048,6 +5180,7 @@ class ClientHandlers_MessageRouterHandler_onQueryCanceled_pargs { virtual ~ClientHandlers_MessageRouterHandler_onQueryCanceled_pargs() noexcept; const ::thrift_codegen::RObject* handler; const int32_t* bid; + const ::thrift_codegen::RObject* frame; const int64_t* queryId; uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; @@ -5105,9 +5238,10 @@ class ClientHandlers_MessageRouterHandler_Dispose_pargs { }; typedef struct _ClientHandlers_SchemeHandlerFactory_CreateHandler_args__isset { - _ClientHandlers_SchemeHandlerFactory_CreateHandler_args__isset() : schemeHandlerFactory(false), bid(false), scheme_name(false), request(false) {} + _ClientHandlers_SchemeHandlerFactory_CreateHandler_args__isset() : schemeHandlerFactory(false), bid(false), frame(false), scheme_name(false), request(false) {} bool schemeHandlerFactory :1; bool bid :1; + bool frame :1; bool scheme_name :1; bool request :1; } _ClientHandlers_SchemeHandlerFactory_CreateHandler_args__isset; @@ -5126,6 +5260,7 @@ class ClientHandlers_SchemeHandlerFactory_CreateHandler_args { virtual ~ClientHandlers_SchemeHandlerFactory_CreateHandler_args() noexcept; int32_t schemeHandlerFactory; int32_t bid; + ::thrift_codegen::RObject frame; std::string scheme_name; ::thrift_codegen::RObject request; @@ -5135,6 +5270,8 @@ class ClientHandlers_SchemeHandlerFactory_CreateHandler_args { void __set_bid(const int32_t val); + void __set_frame(const ::thrift_codegen::RObject& val); + void __set_scheme_name(const std::string& val); void __set_request(const ::thrift_codegen::RObject& val); @@ -5145,6 +5282,8 @@ class ClientHandlers_SchemeHandlerFactory_CreateHandler_args { return false; if (!(bid == rhs.bid)) return false; + if (!(frame == rhs.frame)) + return false; if (!(scheme_name == rhs.scheme_name)) return false; if (!(request == rhs.request)) @@ -5170,6 +5309,7 @@ class ClientHandlers_SchemeHandlerFactory_CreateHandler_pargs { virtual ~ClientHandlers_SchemeHandlerFactory_CreateHandler_pargs() noexcept; const int32_t* schemeHandlerFactory; const int32_t* bid; + const ::thrift_codegen::RObject* frame; const std::string* scheme_name; const ::thrift_codegen::RObject* request; @@ -5326,8 +5466,8 @@ class ClientHandlersClient : virtual public ClientHandlersIf { void RenderHandler_OnPaint(const int32_t bid, const bool popup, const int32_t dirtyRectsCount, const std::string& sharedMemName, const int64_t sharedMemHandle, const int32_t width, const int32_t height) override; void send_RenderHandler_OnPaint(const int32_t bid, const bool popup, const int32_t dirtyRectsCount, const std::string& sharedMemName, const int64_t sharedMemHandle, const int32_t width, const int32_t height); void recv_RenderHandler_OnPaint(); - bool LifeSpanHandler_OnBeforePopup(const int32_t bid, const std::string& url, const std::string& frameName, const bool gesture) override; - void send_LifeSpanHandler_OnBeforePopup(const int32_t bid, const std::string& url, const std::string& frameName, const bool gesture); + bool LifeSpanHandler_OnBeforePopup(const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& url, const std::string& frameName, const bool gesture) override; + void send_LifeSpanHandler_OnBeforePopup(const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& url, const std::string& frameName, const bool gesture); bool recv_LifeSpanHandler_OnBeforePopup(); void LifeSpanHandler_OnAfterCreated(const int32_t bid, const int32_t nativeBrowserIdentifier) override; void send_LifeSpanHandler_OnAfterCreated(const int32_t bid, const int32_t nativeBrowserIdentifier); @@ -5338,14 +5478,14 @@ class ClientHandlersClient : virtual public ClientHandlersIf { void send_LifeSpanHandler_OnBeforeClose(const int32_t bid); void LoadHandler_OnLoadingStateChange(const int32_t bid, const bool isLoading, const bool canGoBack, const bool canGoForward) override; void send_LoadHandler_OnLoadingStateChange(const int32_t bid, const bool isLoading, const bool canGoBack, const bool canGoForward); - void LoadHandler_OnLoadStart(const int32_t bid, const int32_t transition_type) override; - void send_LoadHandler_OnLoadStart(const int32_t bid, const int32_t transition_type); - void LoadHandler_OnLoadEnd(const int32_t bid, const int32_t httpStatusCode) override; - void send_LoadHandler_OnLoadEnd(const int32_t bid, const int32_t httpStatusCode); - void LoadHandler_OnLoadError(const int32_t bid, const int32_t errorCode, const std::string& errorText, const std::string& failedUrl) override; - void send_LoadHandler_OnLoadError(const int32_t bid, const int32_t errorCode, const std::string& errorText, const std::string& failedUrl); - void DisplayHandler_OnAddressChange(const int32_t bid, const std::string& url) override; - void send_DisplayHandler_OnAddressChange(const int32_t bid, const std::string& url); + void LoadHandler_OnLoadStart(const int32_t bid, const ::thrift_codegen::RObject& frame, const int32_t transition_type) override; + void send_LoadHandler_OnLoadStart(const int32_t bid, const ::thrift_codegen::RObject& frame, const int32_t transition_type); + void LoadHandler_OnLoadEnd(const int32_t bid, const ::thrift_codegen::RObject& frame, const int32_t httpStatusCode) override; + void send_LoadHandler_OnLoadEnd(const int32_t bid, const ::thrift_codegen::RObject& frame, const int32_t httpStatusCode); + void LoadHandler_OnLoadError(const int32_t bid, const ::thrift_codegen::RObject& frame, const int32_t errorCode, const std::string& errorText, const std::string& failedUrl) override; + void send_LoadHandler_OnLoadError(const int32_t bid, const ::thrift_codegen::RObject& frame, const int32_t errorCode, const std::string& errorText, const std::string& failedUrl); + void DisplayHandler_OnAddressChange(const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& url) override; + void send_DisplayHandler_OnAddressChange(const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& url); void DisplayHandler_OnTitleChange(const int32_t bid, const std::string& title) override; void send_DisplayHandler_OnTitleChange(const int32_t bid, const std::string& title); bool DisplayHandler_OnTooltip(const int32_t bid, const std::string& text) override; @@ -5369,11 +5509,11 @@ class ClientHandlersClient : virtual public ClientHandlersIf { bool recv_FocusHandler_OnSetFocus(); void FocusHandler_OnGotFocus(const int32_t bid) override; void send_FocusHandler_OnGotFocus(const int32_t bid); - bool RequestHandler_OnBeforeBrowse(const int32_t bid, const ::thrift_codegen::RObject& request, const bool user_gesture, const bool is_redirect) override; - void send_RequestHandler_OnBeforeBrowse(const int32_t bid, const ::thrift_codegen::RObject& request, const bool user_gesture, const bool is_redirect); + bool RequestHandler_OnBeforeBrowse(const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const bool user_gesture, const bool is_redirect) override; + void send_RequestHandler_OnBeforeBrowse(const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const bool user_gesture, const bool is_redirect); bool recv_RequestHandler_OnBeforeBrowse(); - bool RequestHandler_OnOpenURLFromTab(const int32_t bid, const std::string& target_url, const bool user_gesture) override; - void send_RequestHandler_OnOpenURLFromTab(const int32_t bid, const std::string& target_url, const bool user_gesture); + bool RequestHandler_OnOpenURLFromTab(const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& target_url, const bool user_gesture) override; + void send_RequestHandler_OnOpenURLFromTab(const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& target_url, const bool user_gesture); bool recv_RequestHandler_OnOpenURLFromTab(); bool RequestHandler_GetAuthCredentials(const int32_t bid, const std::string& origin_url, const bool isProxy, const std::string& host, const int32_t port, const std::string& realm, const std::string& scheme, const ::thrift_codegen::RObject& authCallback) override; void send_RequestHandler_GetAuthCredentials(const int32_t bid, const std::string& origin_url, const bool isProxy, const std::string& host, const int32_t port, const std::string& realm, const std::string& scheme, const ::thrift_codegen::RObject& authCallback); @@ -5383,27 +5523,27 @@ class ClientHandlersClient : virtual public ClientHandlersIf { bool recv_RequestHandler_OnCertificateError(); void RequestHandler_OnRenderProcessTerminated(const int32_t bid, const std::string& status) override; void send_RequestHandler_OnRenderProcessTerminated(const int32_t bid, const std::string& status); - void RequestHandler_GetResourceRequestHandler( ::thrift_codegen::RObject& _return, const int32_t bid, const ::thrift_codegen::RObject& request, const bool isNavigation, const bool isDownload, const std::string& requestInitiator) override; - void send_RequestHandler_GetResourceRequestHandler(const int32_t bid, const ::thrift_codegen::RObject& request, const bool isNavigation, const bool isDownload, const std::string& requestInitiator); + void RequestHandler_GetResourceRequestHandler( ::thrift_codegen::RObject& _return, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const bool isNavigation, const bool isDownload, const std::string& requestInitiator) override; + void send_RequestHandler_GetResourceRequestHandler(const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const bool isNavigation, const bool isDownload, const std::string& requestInitiator); void recv_RequestHandler_GetResourceRequestHandler( ::thrift_codegen::RObject& _return); void ResourceRequestHandler_Dispose(const int32_t rrHandler) override; void send_ResourceRequestHandler_Dispose(const int32_t rrHandler); - void ResourceRequestHandler_GetCookieAccessFilter( ::thrift_codegen::RObject& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request) override; - void send_ResourceRequestHandler_GetCookieAccessFilter(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request); + void ResourceRequestHandler_GetCookieAccessFilter( ::thrift_codegen::RObject& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request) override; + void send_ResourceRequestHandler_GetCookieAccessFilter(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request); void recv_ResourceRequestHandler_GetCookieAccessFilter( ::thrift_codegen::RObject& _return); void CookieAccessFilter_Dispose(const int32_t filter) override; void send_CookieAccessFilter_Dispose(const int32_t filter); - bool CookieAccessFilter_CanSendCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& request, const std::vector<std::string> & cookie) override; - void send_CookieAccessFilter_CanSendCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& request, const std::vector<std::string> & cookie); + bool CookieAccessFilter_CanSendCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const std::vector<std::string> & cookie) override; + void send_CookieAccessFilter_CanSendCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const std::vector<std::string> & cookie); bool recv_CookieAccessFilter_CanSendCookie(); - bool CookieAccessFilter_CanSaveCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::vector<std::string> & cookie) override; - void send_CookieAccessFilter_CanSaveCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::vector<std::string> & cookie); + bool CookieAccessFilter_CanSaveCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::vector<std::string> & cookie) override; + void send_CookieAccessFilter_CanSaveCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::vector<std::string> & cookie); bool recv_CookieAccessFilter_CanSaveCookie(); - bool ResourceRequestHandler_OnBeforeResourceLoad(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request) override; - void send_ResourceRequestHandler_OnBeforeResourceLoad(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request); + bool ResourceRequestHandler_OnBeforeResourceLoad(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request) override; + void send_ResourceRequestHandler_OnBeforeResourceLoad(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request); bool recv_ResourceRequestHandler_OnBeforeResourceLoad(); - void ResourceRequestHandler_GetResourceHandler( ::thrift_codegen::RObject& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request) override; - void send_ResourceRequestHandler_GetResourceHandler(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request); + void ResourceRequestHandler_GetResourceHandler( ::thrift_codegen::RObject& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request) override; + void send_ResourceRequestHandler_GetResourceHandler(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request); void recv_ResourceRequestHandler_GetResourceHandler( ::thrift_codegen::RObject& _return); void ResourceHandler_Dispose(const int32_t resourceHandler) override; void send_ResourceHandler_Dispose(const int32_t resourceHandler); @@ -5418,27 +5558,27 @@ class ClientHandlersClient : virtual public ClientHandlersIf { void recv_ResourceHandler_ReadResponse( ::thrift_codegen::ResponseData& _return); void ResourceHandler_Cancel(const int32_t resourceHandler) override; void send_ResourceHandler_Cancel(const int32_t resourceHandler); - void ResourceRequestHandler_OnResourceRedirect(std::string& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& new_url) override; - void send_ResourceRequestHandler_OnResourceRedirect(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& new_url); + void ResourceRequestHandler_OnResourceRedirect(std::string& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& new_url) override; + void send_ResourceRequestHandler_OnResourceRedirect(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& new_url); void recv_ResourceRequestHandler_OnResourceRedirect(std::string& _return); - bool ResourceRequestHandler_OnResourceResponse(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response) override; - void send_ResourceRequestHandler_OnResourceResponse(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response); + bool ResourceRequestHandler_OnResourceResponse(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response) override; + void send_ResourceRequestHandler_OnResourceResponse(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response); bool recv_ResourceRequestHandler_OnResourceResponse(); - void ResourceRequestHandler_OnResourceLoadComplete(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& status, const int64_t receivedContentLength) override; - void send_ResourceRequestHandler_OnResourceLoadComplete(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& status, const int64_t receivedContentLength); + void ResourceRequestHandler_OnResourceLoadComplete(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& status, const int64_t receivedContentLength) override; + void send_ResourceRequestHandler_OnResourceLoadComplete(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& status, const int64_t receivedContentLength); void recv_ResourceRequestHandler_OnResourceLoadComplete(); - bool ResourceRequestHandler_OnProtocolExecution(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const bool allowOsExecution) override; - void send_ResourceRequestHandler_OnProtocolExecution(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const bool allowOsExecution); + bool ResourceRequestHandler_OnProtocolExecution(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const bool allowOsExecution) override; + void send_ResourceRequestHandler_OnProtocolExecution(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const bool allowOsExecution); bool recv_ResourceRequestHandler_OnProtocolExecution(); - bool MessageRouterHandler_onQuery(const ::thrift_codegen::RObject& handler, const int32_t bid, const int64_t queryId, const std::string& request, const bool persistent, const ::thrift_codegen::RObject& queryCallback) override; - void send_MessageRouterHandler_onQuery(const ::thrift_codegen::RObject& handler, const int32_t bid, const int64_t queryId, const std::string& request, const bool persistent, const ::thrift_codegen::RObject& queryCallback); + bool MessageRouterHandler_onQuery(const ::thrift_codegen::RObject& handler, const int32_t bid, const ::thrift_codegen::RObject& frame, const int64_t queryId, const std::string& request, const bool persistent, const ::thrift_codegen::RObject& queryCallback) override; + void send_MessageRouterHandler_onQuery(const ::thrift_codegen::RObject& handler, const int32_t bid, const ::thrift_codegen::RObject& frame, const int64_t queryId, const std::string& request, const bool persistent, const ::thrift_codegen::RObject& queryCallback); bool recv_MessageRouterHandler_onQuery(); - void MessageRouterHandler_onQueryCanceled(const ::thrift_codegen::RObject& handler, const int32_t bid, const int64_t queryId) override; - void send_MessageRouterHandler_onQueryCanceled(const ::thrift_codegen::RObject& handler, const int32_t bid, const int64_t queryId); + void MessageRouterHandler_onQueryCanceled(const ::thrift_codegen::RObject& handler, const int32_t bid, const ::thrift_codegen::RObject& frame, const int64_t queryId) override; + void send_MessageRouterHandler_onQueryCanceled(const ::thrift_codegen::RObject& handler, const int32_t bid, const ::thrift_codegen::RObject& frame, const int64_t queryId); void MessageRouterHandler_Dispose(const int32_t handler) override; void send_MessageRouterHandler_Dispose(const int32_t handler); - void SchemeHandlerFactory_CreateHandler( ::thrift_codegen::RObject& _return, const int32_t schemeHandlerFactory, const int32_t bid, const std::string& scheme_name, const ::thrift_codegen::RObject& request) override; - void send_SchemeHandlerFactory_CreateHandler(const int32_t schemeHandlerFactory, const int32_t bid, const std::string& scheme_name, const ::thrift_codegen::RObject& request); + void SchemeHandlerFactory_CreateHandler( ::thrift_codegen::RObject& _return, const int32_t schemeHandlerFactory, const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& scheme_name, const ::thrift_codegen::RObject& request) override; + void send_SchemeHandlerFactory_CreateHandler(const int32_t schemeHandlerFactory, const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& scheme_name, const ::thrift_codegen::RObject& request); void recv_SchemeHandlerFactory_CreateHandler( ::thrift_codegen::RObject& _return); void SchemeHandlerFactory_Dispose(const int32_t schemeHandlerFactory) override; void send_SchemeHandlerFactory_Dispose(const int32_t schemeHandlerFactory); @@ -5658,13 +5798,13 @@ class ClientHandlersMultiface : virtual public ClientHandlersIf { ifaces_[i]->RenderHandler_OnPaint(bid, popup, dirtyRectsCount, sharedMemName, sharedMemHandle, width, height); } - bool LifeSpanHandler_OnBeforePopup(const int32_t bid, const std::string& url, const std::string& frameName, const bool gesture) override { + bool LifeSpanHandler_OnBeforePopup(const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& url, const std::string& frameName, const bool gesture) override { size_t sz = ifaces_.size(); size_t i = 0; for (; i < (sz - 1); ++i) { - ifaces_[i]->LifeSpanHandler_OnBeforePopup(bid, url, frameName, gesture); + ifaces_[i]->LifeSpanHandler_OnBeforePopup(bid, frame, url, frameName, gesture); } - return ifaces_[i]->LifeSpanHandler_OnBeforePopup(bid, url, frameName, gesture); + return ifaces_[i]->LifeSpanHandler_OnBeforePopup(bid, frame, url, frameName, gesture); } void LifeSpanHandler_OnAfterCreated(const int32_t bid, const int32_t nativeBrowserIdentifier) override { @@ -5703,40 +5843,40 @@ class ClientHandlersMultiface : virtual public ClientHandlersIf { ifaces_[i]->LoadHandler_OnLoadingStateChange(bid, isLoading, canGoBack, canGoForward); } - void LoadHandler_OnLoadStart(const int32_t bid, const int32_t transition_type) override { + void LoadHandler_OnLoadStart(const int32_t bid, const ::thrift_codegen::RObject& frame, const int32_t transition_type) override { size_t sz = ifaces_.size(); size_t i = 0; for (; i < (sz - 1); ++i) { - ifaces_[i]->LoadHandler_OnLoadStart(bid, transition_type); + ifaces_[i]->LoadHandler_OnLoadStart(bid, frame, transition_type); } - ifaces_[i]->LoadHandler_OnLoadStart(bid, transition_type); + ifaces_[i]->LoadHandler_OnLoadStart(bid, frame, transition_type); } - void LoadHandler_OnLoadEnd(const int32_t bid, const int32_t httpStatusCode) override { + void LoadHandler_OnLoadEnd(const int32_t bid, const ::thrift_codegen::RObject& frame, const int32_t httpStatusCode) override { size_t sz = ifaces_.size(); size_t i = 0; for (; i < (sz - 1); ++i) { - ifaces_[i]->LoadHandler_OnLoadEnd(bid, httpStatusCode); + ifaces_[i]->LoadHandler_OnLoadEnd(bid, frame, httpStatusCode); } - ifaces_[i]->LoadHandler_OnLoadEnd(bid, httpStatusCode); + ifaces_[i]->LoadHandler_OnLoadEnd(bid, frame, httpStatusCode); } - void LoadHandler_OnLoadError(const int32_t bid, const int32_t errorCode, const std::string& errorText, const std::string& failedUrl) override { + void LoadHandler_OnLoadError(const int32_t bid, const ::thrift_codegen::RObject& frame, const int32_t errorCode, const std::string& errorText, const std::string& failedUrl) override { size_t sz = ifaces_.size(); size_t i = 0; for (; i < (sz - 1); ++i) { - ifaces_[i]->LoadHandler_OnLoadError(bid, errorCode, errorText, failedUrl); + ifaces_[i]->LoadHandler_OnLoadError(bid, frame, errorCode, errorText, failedUrl); } - ifaces_[i]->LoadHandler_OnLoadError(bid, errorCode, errorText, failedUrl); + ifaces_[i]->LoadHandler_OnLoadError(bid, frame, errorCode, errorText, failedUrl); } - void DisplayHandler_OnAddressChange(const int32_t bid, const std::string& url) override { + void DisplayHandler_OnAddressChange(const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& url) override { size_t sz = ifaces_.size(); size_t i = 0; for (; i < (sz - 1); ++i) { - ifaces_[i]->DisplayHandler_OnAddressChange(bid, url); + ifaces_[i]->DisplayHandler_OnAddressChange(bid, frame, url); } - ifaces_[i]->DisplayHandler_OnAddressChange(bid, url); + ifaces_[i]->DisplayHandler_OnAddressChange(bid, frame, url); } void DisplayHandler_OnTitleChange(const int32_t bid, const std::string& title) override { @@ -5820,22 +5960,22 @@ class ClientHandlersMultiface : virtual public ClientHandlersIf { ifaces_[i]->FocusHandler_OnGotFocus(bid); } - bool RequestHandler_OnBeforeBrowse(const int32_t bid, const ::thrift_codegen::RObject& request, const bool user_gesture, const bool is_redirect) override { + bool RequestHandler_OnBeforeBrowse(const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const bool user_gesture, const bool is_redirect) override { size_t sz = ifaces_.size(); size_t i = 0; for (; i < (sz - 1); ++i) { - ifaces_[i]->RequestHandler_OnBeforeBrowse(bid, request, user_gesture, is_redirect); + ifaces_[i]->RequestHandler_OnBeforeBrowse(bid, frame, request, user_gesture, is_redirect); } - return ifaces_[i]->RequestHandler_OnBeforeBrowse(bid, request, user_gesture, is_redirect); + return ifaces_[i]->RequestHandler_OnBeforeBrowse(bid, frame, request, user_gesture, is_redirect); } - bool RequestHandler_OnOpenURLFromTab(const int32_t bid, const std::string& target_url, const bool user_gesture) override { + bool RequestHandler_OnOpenURLFromTab(const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& target_url, const bool user_gesture) override { size_t sz = ifaces_.size(); size_t i = 0; for (; i < (sz - 1); ++i) { - ifaces_[i]->RequestHandler_OnOpenURLFromTab(bid, target_url, user_gesture); + ifaces_[i]->RequestHandler_OnOpenURLFromTab(bid, frame, target_url, user_gesture); } - return ifaces_[i]->RequestHandler_OnOpenURLFromTab(bid, target_url, user_gesture); + return ifaces_[i]->RequestHandler_OnOpenURLFromTab(bid, frame, target_url, user_gesture); } bool RequestHandler_GetAuthCredentials(const int32_t bid, const std::string& origin_url, const bool isProxy, const std::string& host, const int32_t port, const std::string& realm, const std::string& scheme, const ::thrift_codegen::RObject& authCallback) override { @@ -5865,13 +6005,13 @@ class ClientHandlersMultiface : virtual public ClientHandlersIf { ifaces_[i]->RequestHandler_OnRenderProcessTerminated(bid, status); } - void RequestHandler_GetResourceRequestHandler( ::thrift_codegen::RObject& _return, const int32_t bid, const ::thrift_codegen::RObject& request, const bool isNavigation, const bool isDownload, const std::string& requestInitiator) override { + void RequestHandler_GetResourceRequestHandler( ::thrift_codegen::RObject& _return, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const bool isNavigation, const bool isDownload, const std::string& requestInitiator) override { size_t sz = ifaces_.size(); size_t i = 0; for (; i < (sz - 1); ++i) { - ifaces_[i]->RequestHandler_GetResourceRequestHandler(_return, bid, request, isNavigation, isDownload, requestInitiator); + ifaces_[i]->RequestHandler_GetResourceRequestHandler(_return, bid, frame, request, isNavigation, isDownload, requestInitiator); } - ifaces_[i]->RequestHandler_GetResourceRequestHandler(_return, bid, request, isNavigation, isDownload, requestInitiator); + ifaces_[i]->RequestHandler_GetResourceRequestHandler(_return, bid, frame, request, isNavigation, isDownload, requestInitiator); return; } @@ -5884,13 +6024,13 @@ class ClientHandlersMultiface : virtual public ClientHandlersIf { ifaces_[i]->ResourceRequestHandler_Dispose(rrHandler); } - void ResourceRequestHandler_GetCookieAccessFilter( ::thrift_codegen::RObject& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request) override { + void ResourceRequestHandler_GetCookieAccessFilter( ::thrift_codegen::RObject& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request) override { size_t sz = ifaces_.size(); size_t i = 0; for (; i < (sz - 1); ++i) { - ifaces_[i]->ResourceRequestHandler_GetCookieAccessFilter(_return, rrHandler, bid, request); + ifaces_[i]->ResourceRequestHandler_GetCookieAccessFilter(_return, rrHandler, bid, frame, request); } - ifaces_[i]->ResourceRequestHandler_GetCookieAccessFilter(_return, rrHandler, bid, request); + ifaces_[i]->ResourceRequestHandler_GetCookieAccessFilter(_return, rrHandler, bid, frame, request); return; } @@ -5903,40 +6043,40 @@ class ClientHandlersMultiface : virtual public ClientHandlersIf { ifaces_[i]->CookieAccessFilter_Dispose(filter); } - bool CookieAccessFilter_CanSendCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& request, const std::vector<std::string> & cookie) override { + bool CookieAccessFilter_CanSendCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const std::vector<std::string> & cookie) override { size_t sz = ifaces_.size(); size_t i = 0; for (; i < (sz - 1); ++i) { - ifaces_[i]->CookieAccessFilter_CanSendCookie(filter, bid, request, cookie); + ifaces_[i]->CookieAccessFilter_CanSendCookie(filter, bid, frame, request, cookie); } - return ifaces_[i]->CookieAccessFilter_CanSendCookie(filter, bid, request, cookie); + return ifaces_[i]->CookieAccessFilter_CanSendCookie(filter, bid, frame, request, cookie); } - bool CookieAccessFilter_CanSaveCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::vector<std::string> & cookie) override { + bool CookieAccessFilter_CanSaveCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::vector<std::string> & cookie) override { size_t sz = ifaces_.size(); size_t i = 0; for (; i < (sz - 1); ++i) { - ifaces_[i]->CookieAccessFilter_CanSaveCookie(filter, bid, request, response, cookie); + ifaces_[i]->CookieAccessFilter_CanSaveCookie(filter, bid, frame, request, response, cookie); } - return ifaces_[i]->CookieAccessFilter_CanSaveCookie(filter, bid, request, response, cookie); + return ifaces_[i]->CookieAccessFilter_CanSaveCookie(filter, bid, frame, request, response, cookie); } - bool ResourceRequestHandler_OnBeforeResourceLoad(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request) override { + bool ResourceRequestHandler_OnBeforeResourceLoad(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request) override { size_t sz = ifaces_.size(); size_t i = 0; for (; i < (sz - 1); ++i) { - ifaces_[i]->ResourceRequestHandler_OnBeforeResourceLoad(rrHandler, bid, request); + ifaces_[i]->ResourceRequestHandler_OnBeforeResourceLoad(rrHandler, bid, frame, request); } - return ifaces_[i]->ResourceRequestHandler_OnBeforeResourceLoad(rrHandler, bid, request); + return ifaces_[i]->ResourceRequestHandler_OnBeforeResourceLoad(rrHandler, bid, frame, request); } - void ResourceRequestHandler_GetResourceHandler( ::thrift_codegen::RObject& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request) override { + void ResourceRequestHandler_GetResourceHandler( ::thrift_codegen::RObject& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request) override { size_t sz = ifaces_.size(); size_t i = 0; for (; i < (sz - 1); ++i) { - ifaces_[i]->ResourceRequestHandler_GetResourceHandler(_return, rrHandler, bid, request); + ifaces_[i]->ResourceRequestHandler_GetResourceHandler(_return, rrHandler, bid, frame, request); } - ifaces_[i]->ResourceRequestHandler_GetResourceHandler(_return, rrHandler, bid, request); + ifaces_[i]->ResourceRequestHandler_GetResourceHandler(_return, rrHandler, bid, frame, request); return; } @@ -5987,59 +6127,59 @@ class ClientHandlersMultiface : virtual public ClientHandlersIf { ifaces_[i]->ResourceHandler_Cancel(resourceHandler); } - void ResourceRequestHandler_OnResourceRedirect(std::string& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& new_url) override { + void ResourceRequestHandler_OnResourceRedirect(std::string& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& new_url) override { size_t sz = ifaces_.size(); size_t i = 0; for (; i < (sz - 1); ++i) { - ifaces_[i]->ResourceRequestHandler_OnResourceRedirect(_return, rrHandler, bid, request, response, new_url); + ifaces_[i]->ResourceRequestHandler_OnResourceRedirect(_return, rrHandler, bid, frame, request, response, new_url); } - ifaces_[i]->ResourceRequestHandler_OnResourceRedirect(_return, rrHandler, bid, request, response, new_url); + ifaces_[i]->ResourceRequestHandler_OnResourceRedirect(_return, rrHandler, bid, frame, request, response, new_url); return; } - bool ResourceRequestHandler_OnResourceResponse(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response) override { + bool ResourceRequestHandler_OnResourceResponse(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response) override { size_t sz = ifaces_.size(); size_t i = 0; for (; i < (sz - 1); ++i) { - ifaces_[i]->ResourceRequestHandler_OnResourceResponse(rrHandler, bid, request, response); + ifaces_[i]->ResourceRequestHandler_OnResourceResponse(rrHandler, bid, frame, request, response); } - return ifaces_[i]->ResourceRequestHandler_OnResourceResponse(rrHandler, bid, request, response); + return ifaces_[i]->ResourceRequestHandler_OnResourceResponse(rrHandler, bid, frame, request, response); } - void ResourceRequestHandler_OnResourceLoadComplete(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& status, const int64_t receivedContentLength) override { + void ResourceRequestHandler_OnResourceLoadComplete(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& status, const int64_t receivedContentLength) override { size_t sz = ifaces_.size(); size_t i = 0; for (; i < (sz - 1); ++i) { - ifaces_[i]->ResourceRequestHandler_OnResourceLoadComplete(rrHandler, bid, request, response, status, receivedContentLength); + ifaces_[i]->ResourceRequestHandler_OnResourceLoadComplete(rrHandler, bid, frame, request, response, status, receivedContentLength); } - ifaces_[i]->ResourceRequestHandler_OnResourceLoadComplete(rrHandler, bid, request, response, status, receivedContentLength); + ifaces_[i]->ResourceRequestHandler_OnResourceLoadComplete(rrHandler, bid, frame, request, response, status, receivedContentLength); } - bool ResourceRequestHandler_OnProtocolExecution(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const bool allowOsExecution) override { + bool ResourceRequestHandler_OnProtocolExecution(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const bool allowOsExecution) override { size_t sz = ifaces_.size(); size_t i = 0; for (; i < (sz - 1); ++i) { - ifaces_[i]->ResourceRequestHandler_OnProtocolExecution(rrHandler, bid, request, allowOsExecution); + ifaces_[i]->ResourceRequestHandler_OnProtocolExecution(rrHandler, bid, frame, request, allowOsExecution); } - return ifaces_[i]->ResourceRequestHandler_OnProtocolExecution(rrHandler, bid, request, allowOsExecution); + return ifaces_[i]->ResourceRequestHandler_OnProtocolExecution(rrHandler, bid, frame, request, allowOsExecution); } - bool MessageRouterHandler_onQuery(const ::thrift_codegen::RObject& handler, const int32_t bid, const int64_t queryId, const std::string& request, const bool persistent, const ::thrift_codegen::RObject& queryCallback) override { + bool MessageRouterHandler_onQuery(const ::thrift_codegen::RObject& handler, const int32_t bid, const ::thrift_codegen::RObject& frame, const int64_t queryId, const std::string& request, const bool persistent, const ::thrift_codegen::RObject& queryCallback) override { size_t sz = ifaces_.size(); size_t i = 0; for (; i < (sz - 1); ++i) { - ifaces_[i]->MessageRouterHandler_onQuery(handler, bid, queryId, request, persistent, queryCallback); + ifaces_[i]->MessageRouterHandler_onQuery(handler, bid, frame, queryId, request, persistent, queryCallback); } - return ifaces_[i]->MessageRouterHandler_onQuery(handler, bid, queryId, request, persistent, queryCallback); + return ifaces_[i]->MessageRouterHandler_onQuery(handler, bid, frame, queryId, request, persistent, queryCallback); } - void MessageRouterHandler_onQueryCanceled(const ::thrift_codegen::RObject& handler, const int32_t bid, const int64_t queryId) override { + void MessageRouterHandler_onQueryCanceled(const ::thrift_codegen::RObject& handler, const int32_t bid, const ::thrift_codegen::RObject& frame, const int64_t queryId) override { size_t sz = ifaces_.size(); size_t i = 0; for (; i < (sz - 1); ++i) { - ifaces_[i]->MessageRouterHandler_onQueryCanceled(handler, bid, queryId); + ifaces_[i]->MessageRouterHandler_onQueryCanceled(handler, bid, frame, queryId); } - ifaces_[i]->MessageRouterHandler_onQueryCanceled(handler, bid, queryId); + ifaces_[i]->MessageRouterHandler_onQueryCanceled(handler, bid, frame, queryId); } void MessageRouterHandler_Dispose(const int32_t handler) override { @@ -6051,13 +6191,13 @@ class ClientHandlersMultiface : virtual public ClientHandlersIf { ifaces_[i]->MessageRouterHandler_Dispose(handler); } - void SchemeHandlerFactory_CreateHandler( ::thrift_codegen::RObject& _return, const int32_t schemeHandlerFactory, const int32_t bid, const std::string& scheme_name, const ::thrift_codegen::RObject& request) override { + void SchemeHandlerFactory_CreateHandler( ::thrift_codegen::RObject& _return, const int32_t schemeHandlerFactory, const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& scheme_name, const ::thrift_codegen::RObject& request) override { size_t sz = ifaces_.size(); size_t i = 0; for (; i < (sz - 1); ++i) { - ifaces_[i]->SchemeHandlerFactory_CreateHandler(_return, schemeHandlerFactory, bid, scheme_name, request); + ifaces_[i]->SchemeHandlerFactory_CreateHandler(_return, schemeHandlerFactory, bid, frame, scheme_name, request); } - ifaces_[i]->SchemeHandlerFactory_CreateHandler(_return, schemeHandlerFactory, bid, scheme_name, request); + ifaces_[i]->SchemeHandlerFactory_CreateHandler(_return, schemeHandlerFactory, bid, frame, scheme_name, request); return; } @@ -6121,8 +6261,8 @@ class ClientHandlersConcurrentClient : virtual public ClientHandlersIf { void RenderHandler_OnPaint(const int32_t bid, const bool popup, const int32_t dirtyRectsCount, const std::string& sharedMemName, const int64_t sharedMemHandle, const int32_t width, const int32_t height) override; int32_t send_RenderHandler_OnPaint(const int32_t bid, const bool popup, const int32_t dirtyRectsCount, const std::string& sharedMemName, const int64_t sharedMemHandle, const int32_t width, const int32_t height); void recv_RenderHandler_OnPaint(const int32_t seqid); - bool LifeSpanHandler_OnBeforePopup(const int32_t bid, const std::string& url, const std::string& frameName, const bool gesture) override; - int32_t send_LifeSpanHandler_OnBeforePopup(const int32_t bid, const std::string& url, const std::string& frameName, const bool gesture); + bool LifeSpanHandler_OnBeforePopup(const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& url, const std::string& frameName, const bool gesture) override; + int32_t send_LifeSpanHandler_OnBeforePopup(const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& url, const std::string& frameName, const bool gesture); bool recv_LifeSpanHandler_OnBeforePopup(const int32_t seqid); void LifeSpanHandler_OnAfterCreated(const int32_t bid, const int32_t nativeBrowserIdentifier) override; void send_LifeSpanHandler_OnAfterCreated(const int32_t bid, const int32_t nativeBrowserIdentifier); @@ -6133,14 +6273,14 @@ class ClientHandlersConcurrentClient : virtual public ClientHandlersIf { void send_LifeSpanHandler_OnBeforeClose(const int32_t bid); void LoadHandler_OnLoadingStateChange(const int32_t bid, const bool isLoading, const bool canGoBack, const bool canGoForward) override; void send_LoadHandler_OnLoadingStateChange(const int32_t bid, const bool isLoading, const bool canGoBack, const bool canGoForward); - void LoadHandler_OnLoadStart(const int32_t bid, const int32_t transition_type) override; - void send_LoadHandler_OnLoadStart(const int32_t bid, const int32_t transition_type); - void LoadHandler_OnLoadEnd(const int32_t bid, const int32_t httpStatusCode) override; - void send_LoadHandler_OnLoadEnd(const int32_t bid, const int32_t httpStatusCode); - void LoadHandler_OnLoadError(const int32_t bid, const int32_t errorCode, const std::string& errorText, const std::string& failedUrl) override; - void send_LoadHandler_OnLoadError(const int32_t bid, const int32_t errorCode, const std::string& errorText, const std::string& failedUrl); - void DisplayHandler_OnAddressChange(const int32_t bid, const std::string& url) override; - void send_DisplayHandler_OnAddressChange(const int32_t bid, const std::string& url); + void LoadHandler_OnLoadStart(const int32_t bid, const ::thrift_codegen::RObject& frame, const int32_t transition_type) override; + void send_LoadHandler_OnLoadStart(const int32_t bid, const ::thrift_codegen::RObject& frame, const int32_t transition_type); + void LoadHandler_OnLoadEnd(const int32_t bid, const ::thrift_codegen::RObject& frame, const int32_t httpStatusCode) override; + void send_LoadHandler_OnLoadEnd(const int32_t bid, const ::thrift_codegen::RObject& frame, const int32_t httpStatusCode); + void LoadHandler_OnLoadError(const int32_t bid, const ::thrift_codegen::RObject& frame, const int32_t errorCode, const std::string& errorText, const std::string& failedUrl) override; + void send_LoadHandler_OnLoadError(const int32_t bid, const ::thrift_codegen::RObject& frame, const int32_t errorCode, const std::string& errorText, const std::string& failedUrl); + void DisplayHandler_OnAddressChange(const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& url) override; + void send_DisplayHandler_OnAddressChange(const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& url); void DisplayHandler_OnTitleChange(const int32_t bid, const std::string& title) override; void send_DisplayHandler_OnTitleChange(const int32_t bid, const std::string& title); bool DisplayHandler_OnTooltip(const int32_t bid, const std::string& text) override; @@ -6164,11 +6304,11 @@ class ClientHandlersConcurrentClient : virtual public ClientHandlersIf { bool recv_FocusHandler_OnSetFocus(const int32_t seqid); void FocusHandler_OnGotFocus(const int32_t bid) override; void send_FocusHandler_OnGotFocus(const int32_t bid); - bool RequestHandler_OnBeforeBrowse(const int32_t bid, const ::thrift_codegen::RObject& request, const bool user_gesture, const bool is_redirect) override; - int32_t send_RequestHandler_OnBeforeBrowse(const int32_t bid, const ::thrift_codegen::RObject& request, const bool user_gesture, const bool is_redirect); + bool RequestHandler_OnBeforeBrowse(const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const bool user_gesture, const bool is_redirect) override; + int32_t send_RequestHandler_OnBeforeBrowse(const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const bool user_gesture, const bool is_redirect); bool recv_RequestHandler_OnBeforeBrowse(const int32_t seqid); - bool RequestHandler_OnOpenURLFromTab(const int32_t bid, const std::string& target_url, const bool user_gesture) override; - int32_t send_RequestHandler_OnOpenURLFromTab(const int32_t bid, const std::string& target_url, const bool user_gesture); + bool RequestHandler_OnOpenURLFromTab(const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& target_url, const bool user_gesture) override; + int32_t send_RequestHandler_OnOpenURLFromTab(const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& target_url, const bool user_gesture); bool recv_RequestHandler_OnOpenURLFromTab(const int32_t seqid); bool RequestHandler_GetAuthCredentials(const int32_t bid, const std::string& origin_url, const bool isProxy, const std::string& host, const int32_t port, const std::string& realm, const std::string& scheme, const ::thrift_codegen::RObject& authCallback) override; int32_t send_RequestHandler_GetAuthCredentials(const int32_t bid, const std::string& origin_url, const bool isProxy, const std::string& host, const int32_t port, const std::string& realm, const std::string& scheme, const ::thrift_codegen::RObject& authCallback); @@ -6178,27 +6318,27 @@ class ClientHandlersConcurrentClient : virtual public ClientHandlersIf { bool recv_RequestHandler_OnCertificateError(const int32_t seqid); void RequestHandler_OnRenderProcessTerminated(const int32_t bid, const std::string& status) override; void send_RequestHandler_OnRenderProcessTerminated(const int32_t bid, const std::string& status); - void RequestHandler_GetResourceRequestHandler( ::thrift_codegen::RObject& _return, const int32_t bid, const ::thrift_codegen::RObject& request, const bool isNavigation, const bool isDownload, const std::string& requestInitiator) override; - int32_t send_RequestHandler_GetResourceRequestHandler(const int32_t bid, const ::thrift_codegen::RObject& request, const bool isNavigation, const bool isDownload, const std::string& requestInitiator); + void RequestHandler_GetResourceRequestHandler( ::thrift_codegen::RObject& _return, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const bool isNavigation, const bool isDownload, const std::string& requestInitiator) override; + int32_t send_RequestHandler_GetResourceRequestHandler(const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const bool isNavigation, const bool isDownload, const std::string& requestInitiator); void recv_RequestHandler_GetResourceRequestHandler( ::thrift_codegen::RObject& _return, const int32_t seqid); void ResourceRequestHandler_Dispose(const int32_t rrHandler) override; void send_ResourceRequestHandler_Dispose(const int32_t rrHandler); - void ResourceRequestHandler_GetCookieAccessFilter( ::thrift_codegen::RObject& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request) override; - int32_t send_ResourceRequestHandler_GetCookieAccessFilter(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request); + void ResourceRequestHandler_GetCookieAccessFilter( ::thrift_codegen::RObject& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request) override; + int32_t send_ResourceRequestHandler_GetCookieAccessFilter(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request); void recv_ResourceRequestHandler_GetCookieAccessFilter( ::thrift_codegen::RObject& _return, const int32_t seqid); void CookieAccessFilter_Dispose(const int32_t filter) override; void send_CookieAccessFilter_Dispose(const int32_t filter); - bool CookieAccessFilter_CanSendCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& request, const std::vector<std::string> & cookie) override; - int32_t send_CookieAccessFilter_CanSendCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& request, const std::vector<std::string> & cookie); + bool CookieAccessFilter_CanSendCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const std::vector<std::string> & cookie) override; + int32_t send_CookieAccessFilter_CanSendCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const std::vector<std::string> & cookie); bool recv_CookieAccessFilter_CanSendCookie(const int32_t seqid); - bool CookieAccessFilter_CanSaveCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::vector<std::string> & cookie) override; - int32_t send_CookieAccessFilter_CanSaveCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::vector<std::string> & cookie); + bool CookieAccessFilter_CanSaveCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::vector<std::string> & cookie) override; + int32_t send_CookieAccessFilter_CanSaveCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::vector<std::string> & cookie); bool recv_CookieAccessFilter_CanSaveCookie(const int32_t seqid); - bool ResourceRequestHandler_OnBeforeResourceLoad(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request) override; - int32_t send_ResourceRequestHandler_OnBeforeResourceLoad(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request); + bool ResourceRequestHandler_OnBeforeResourceLoad(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request) override; + int32_t send_ResourceRequestHandler_OnBeforeResourceLoad(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request); bool recv_ResourceRequestHandler_OnBeforeResourceLoad(const int32_t seqid); - void ResourceRequestHandler_GetResourceHandler( ::thrift_codegen::RObject& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request) override; - int32_t send_ResourceRequestHandler_GetResourceHandler(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request); + void ResourceRequestHandler_GetResourceHandler( ::thrift_codegen::RObject& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request) override; + int32_t send_ResourceRequestHandler_GetResourceHandler(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request); void recv_ResourceRequestHandler_GetResourceHandler( ::thrift_codegen::RObject& _return, const int32_t seqid); void ResourceHandler_Dispose(const int32_t resourceHandler) override; void send_ResourceHandler_Dispose(const int32_t resourceHandler); @@ -6213,27 +6353,27 @@ class ClientHandlersConcurrentClient : virtual public ClientHandlersIf { void recv_ResourceHandler_ReadResponse( ::thrift_codegen::ResponseData& _return, const int32_t seqid); void ResourceHandler_Cancel(const int32_t resourceHandler) override; void send_ResourceHandler_Cancel(const int32_t resourceHandler); - void ResourceRequestHandler_OnResourceRedirect(std::string& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& new_url) override; - int32_t send_ResourceRequestHandler_OnResourceRedirect(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& new_url); + void ResourceRequestHandler_OnResourceRedirect(std::string& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& new_url) override; + int32_t send_ResourceRequestHandler_OnResourceRedirect(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& new_url); void recv_ResourceRequestHandler_OnResourceRedirect(std::string& _return, const int32_t seqid); - bool ResourceRequestHandler_OnResourceResponse(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response) override; - int32_t send_ResourceRequestHandler_OnResourceResponse(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response); + bool ResourceRequestHandler_OnResourceResponse(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response) override; + int32_t send_ResourceRequestHandler_OnResourceResponse(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response); bool recv_ResourceRequestHandler_OnResourceResponse(const int32_t seqid); - void ResourceRequestHandler_OnResourceLoadComplete(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& status, const int64_t receivedContentLength) override; - int32_t send_ResourceRequestHandler_OnResourceLoadComplete(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& status, const int64_t receivedContentLength); + void ResourceRequestHandler_OnResourceLoadComplete(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& status, const int64_t receivedContentLength) override; + int32_t send_ResourceRequestHandler_OnResourceLoadComplete(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& status, const int64_t receivedContentLength); void recv_ResourceRequestHandler_OnResourceLoadComplete(const int32_t seqid); - bool ResourceRequestHandler_OnProtocolExecution(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const bool allowOsExecution) override; - int32_t send_ResourceRequestHandler_OnProtocolExecution(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const bool allowOsExecution); + bool ResourceRequestHandler_OnProtocolExecution(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const bool allowOsExecution) override; + int32_t send_ResourceRequestHandler_OnProtocolExecution(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const bool allowOsExecution); bool recv_ResourceRequestHandler_OnProtocolExecution(const int32_t seqid); - bool MessageRouterHandler_onQuery(const ::thrift_codegen::RObject& handler, const int32_t bid, const int64_t queryId, const std::string& request, const bool persistent, const ::thrift_codegen::RObject& queryCallback) override; - int32_t send_MessageRouterHandler_onQuery(const ::thrift_codegen::RObject& handler, const int32_t bid, const int64_t queryId, const std::string& request, const bool persistent, const ::thrift_codegen::RObject& queryCallback); + bool MessageRouterHandler_onQuery(const ::thrift_codegen::RObject& handler, const int32_t bid, const ::thrift_codegen::RObject& frame, const int64_t queryId, const std::string& request, const bool persistent, const ::thrift_codegen::RObject& queryCallback) override; + int32_t send_MessageRouterHandler_onQuery(const ::thrift_codegen::RObject& handler, const int32_t bid, const ::thrift_codegen::RObject& frame, const int64_t queryId, const std::string& request, const bool persistent, const ::thrift_codegen::RObject& queryCallback); bool recv_MessageRouterHandler_onQuery(const int32_t seqid); - void MessageRouterHandler_onQueryCanceled(const ::thrift_codegen::RObject& handler, const int32_t bid, const int64_t queryId) override; - void send_MessageRouterHandler_onQueryCanceled(const ::thrift_codegen::RObject& handler, const int32_t bid, const int64_t queryId); + void MessageRouterHandler_onQueryCanceled(const ::thrift_codegen::RObject& handler, const int32_t bid, const ::thrift_codegen::RObject& frame, const int64_t queryId) override; + void send_MessageRouterHandler_onQueryCanceled(const ::thrift_codegen::RObject& handler, const int32_t bid, const ::thrift_codegen::RObject& frame, const int64_t queryId); void MessageRouterHandler_Dispose(const int32_t handler) override; void send_MessageRouterHandler_Dispose(const int32_t handler); - void SchemeHandlerFactory_CreateHandler( ::thrift_codegen::RObject& _return, const int32_t schemeHandlerFactory, const int32_t bid, const std::string& scheme_name, const ::thrift_codegen::RObject& request) override; - int32_t send_SchemeHandlerFactory_CreateHandler(const int32_t schemeHandlerFactory, const int32_t bid, const std::string& scheme_name, const ::thrift_codegen::RObject& request); + void SchemeHandlerFactory_CreateHandler( ::thrift_codegen::RObject& _return, const int32_t schemeHandlerFactory, const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& scheme_name, const ::thrift_codegen::RObject& request) override; + int32_t send_SchemeHandlerFactory_CreateHandler(const int32_t schemeHandlerFactory, const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& scheme_name, const ::thrift_codegen::RObject& request); void recv_SchemeHandlerFactory_CreateHandler( ::thrift_codegen::RObject& _return, const int32_t seqid); void SchemeHandlerFactory_Dispose(const int32_t schemeHandlerFactory) override; void send_SchemeHandlerFactory_Dispose(const int32_t schemeHandlerFactory); diff --git a/remote/gen-cpp/ClientHandlers_server.skeleton.cpp b/remote/gen-cpp/ClientHandlers_server.skeleton.cpp index 386726a..f35a3bb 100644 --- a/remote/gen-cpp/ClientHandlers_server.skeleton.cpp +++ b/remote/gen-cpp/ClientHandlers_server.skeleton.cpp @@ -55,7 +55,7 @@ class ClientHandlersHandler : virtual public ClientHandlersIf { printf("RenderHandler_OnPaint\n"); } - bool LifeSpanHandler_OnBeforePopup(const int32_t bid, const std::string& url, const std::string& frameName, const bool gesture) { + bool LifeSpanHandler_OnBeforePopup(const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& url, const std::string& frameName, const bool gesture) { // Your implementation goes here printf("LifeSpanHandler_OnBeforePopup\n"); } @@ -80,22 +80,22 @@ class ClientHandlersHandler : virtual public ClientHandlersIf { printf("LoadHandler_OnLoadingStateChange\n"); } - void LoadHandler_OnLoadStart(const int32_t bid, const int32_t transition_type) { + void LoadHandler_OnLoadStart(const int32_t bid, const ::thrift_codegen::RObject& frame, const int32_t transition_type) { // Your implementation goes here printf("LoadHandler_OnLoadStart\n"); } - void LoadHandler_OnLoadEnd(const int32_t bid, const int32_t httpStatusCode) { + void LoadHandler_OnLoadEnd(const int32_t bid, const ::thrift_codegen::RObject& frame, const int32_t httpStatusCode) { // Your implementation goes here printf("LoadHandler_OnLoadEnd\n"); } - void LoadHandler_OnLoadError(const int32_t bid, const int32_t errorCode, const std::string& errorText, const std::string& failedUrl) { + void LoadHandler_OnLoadError(const int32_t bid, const ::thrift_codegen::RObject& frame, const int32_t errorCode, const std::string& errorText, const std::string& failedUrl) { // Your implementation goes here printf("LoadHandler_OnLoadError\n"); } - void DisplayHandler_OnAddressChange(const int32_t bid, const std::string& url) { + void DisplayHandler_OnAddressChange(const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& url) { // Your implementation goes here printf("DisplayHandler_OnAddressChange\n"); } @@ -145,12 +145,12 @@ class ClientHandlersHandler : virtual public ClientHandlersIf { printf("FocusHandler_OnGotFocus\n"); } - bool RequestHandler_OnBeforeBrowse(const int32_t bid, const ::thrift_codegen::RObject& request, const bool user_gesture, const bool is_redirect) { + bool RequestHandler_OnBeforeBrowse(const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const bool user_gesture, const bool is_redirect) { // Your implementation goes here printf("RequestHandler_OnBeforeBrowse\n"); } - bool RequestHandler_OnOpenURLFromTab(const int32_t bid, const std::string& target_url, const bool user_gesture) { + bool RequestHandler_OnOpenURLFromTab(const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& target_url, const bool user_gesture) { // Your implementation goes here printf("RequestHandler_OnOpenURLFromTab\n"); } @@ -170,7 +170,7 @@ class ClientHandlersHandler : virtual public ClientHandlersIf { printf("RequestHandler_OnRenderProcessTerminated\n"); } - void RequestHandler_GetResourceRequestHandler( ::thrift_codegen::RObject& _return, const int32_t bid, const ::thrift_codegen::RObject& request, const bool isNavigation, const bool isDownload, const std::string& requestInitiator) { + void RequestHandler_GetResourceRequestHandler( ::thrift_codegen::RObject& _return, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const bool isNavigation, const bool isDownload, const std::string& requestInitiator) { // Your implementation goes here printf("RequestHandler_GetResourceRequestHandler\n"); } @@ -180,7 +180,7 @@ class ClientHandlersHandler : virtual public ClientHandlersIf { printf("ResourceRequestHandler_Dispose\n"); } - void ResourceRequestHandler_GetCookieAccessFilter( ::thrift_codegen::RObject& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request) { + void ResourceRequestHandler_GetCookieAccessFilter( ::thrift_codegen::RObject& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request) { // Your implementation goes here printf("ResourceRequestHandler_GetCookieAccessFilter\n"); } @@ -190,22 +190,22 @@ class ClientHandlersHandler : virtual public ClientHandlersIf { printf("CookieAccessFilter_Dispose\n"); } - bool CookieAccessFilter_CanSendCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& request, const std::vector<std::string> & cookie) { + bool CookieAccessFilter_CanSendCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const std::vector<std::string> & cookie) { // Your implementation goes here printf("CookieAccessFilter_CanSendCookie\n"); } - bool CookieAccessFilter_CanSaveCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::vector<std::string> & cookie) { + bool CookieAccessFilter_CanSaveCookie(const int32_t filter, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::vector<std::string> & cookie) { // Your implementation goes here printf("CookieAccessFilter_CanSaveCookie\n"); } - bool ResourceRequestHandler_OnBeforeResourceLoad(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request) { + bool ResourceRequestHandler_OnBeforeResourceLoad(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request) { // Your implementation goes here printf("ResourceRequestHandler_OnBeforeResourceLoad\n"); } - void ResourceRequestHandler_GetResourceHandler( ::thrift_codegen::RObject& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request) { + void ResourceRequestHandler_GetResourceHandler( ::thrift_codegen::RObject& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request) { // Your implementation goes here printf("ResourceRequestHandler_GetResourceHandler\n"); } @@ -235,32 +235,32 @@ class ClientHandlersHandler : virtual public ClientHandlersIf { printf("ResourceHandler_Cancel\n"); } - void ResourceRequestHandler_OnResourceRedirect(std::string& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& new_url) { + void ResourceRequestHandler_OnResourceRedirect(std::string& _return, const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& new_url) { // Your implementation goes here printf("ResourceRequestHandler_OnResourceRedirect\n"); } - bool ResourceRequestHandler_OnResourceResponse(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response) { + bool ResourceRequestHandler_OnResourceResponse(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response) { // Your implementation goes here printf("ResourceRequestHandler_OnResourceResponse\n"); } - void ResourceRequestHandler_OnResourceLoadComplete(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& status, const int64_t receivedContentLength) { + void ResourceRequestHandler_OnResourceLoadComplete(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const ::thrift_codegen::RObject& response, const std::string& status, const int64_t receivedContentLength) { // Your implementation goes here printf("ResourceRequestHandler_OnResourceLoadComplete\n"); } - bool ResourceRequestHandler_OnProtocolExecution(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& request, const bool allowOsExecution) { + bool ResourceRequestHandler_OnProtocolExecution(const int32_t rrHandler, const int32_t bid, const ::thrift_codegen::RObject& frame, const ::thrift_codegen::RObject& request, const bool allowOsExecution) { // Your implementation goes here printf("ResourceRequestHandler_OnProtocolExecution\n"); } - bool MessageRouterHandler_onQuery(const ::thrift_codegen::RObject& handler, const int32_t bid, const int64_t queryId, const std::string& request, const bool persistent, const ::thrift_codegen::RObject& queryCallback) { + bool MessageRouterHandler_onQuery(const ::thrift_codegen::RObject& handler, const int32_t bid, const ::thrift_codegen::RObject& frame, const int64_t queryId, const std::string& request, const bool persistent, const ::thrift_codegen::RObject& queryCallback) { // Your implementation goes here printf("MessageRouterHandler_onQuery\n"); } - void MessageRouterHandler_onQueryCanceled(const ::thrift_codegen::RObject& handler, const int32_t bid, const int64_t queryId) { + void MessageRouterHandler_onQueryCanceled(const ::thrift_codegen::RObject& handler, const int32_t bid, const ::thrift_codegen::RObject& frame, const int64_t queryId) { // Your implementation goes here printf("MessageRouterHandler_onQueryCanceled\n"); } @@ -270,7 +270,7 @@ class ClientHandlersHandler : virtual public ClientHandlersIf { printf("MessageRouterHandler_Dispose\n"); } - void SchemeHandlerFactory_CreateHandler( ::thrift_codegen::RObject& _return, const int32_t schemeHandlerFactory, const int32_t bid, const std::string& scheme_name, const ::thrift_codegen::RObject& request) { + void SchemeHandlerFactory_CreateHandler( ::thrift_codegen::RObject& _return, const int32_t schemeHandlerFactory, const int32_t bid, const ::thrift_codegen::RObject& frame, const std::string& scheme_name, const ::thrift_codegen::RObject& request) { // Your implementation goes here printf("SchemeHandlerFactory_CreateHandler\n"); } diff --git a/remote/gen-cpp/Server.cpp b/remote/gen-cpp/Server.cpp index dceb8ff..a0f5c70 100644 --- a/remote/gen-cpp/Server.cpp +++ b/remote/gen-cpp/Server.cpp @@ -5210,6 +5210,133 @@ uint32_t Server_Browser_SetFrameRate_pargs::write(::apache::thrift::protocol::TP } +Server_Frame_ExecuteJavaScript_args::~Server_Frame_ExecuteJavaScript_args() noexcept { +} + + +uint32_t Server_Frame_ExecuteJavaScript_args::read(::apache::thrift::protocol::TProtocol* iprot) { + + ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); + uint32_t xfer = 0; + std::string fname; + ::apache::thrift::protocol::TType ftype; + int16_t fid; + + xfer += iprot->readStructBegin(fname); + + using ::apache::thrift::protocol::TProtocolException; + + + while (true) + { + xfer += iprot->readFieldBegin(fname, ftype, fid); + if (ftype == ::apache::thrift::protocol::T_STOP) { + break; + } + switch (fid) + { + case 1: + if (ftype == ::apache::thrift::protocol::T_I32) { + xfer += iprot->readI32(this->frameId); + this->__isset.frameId = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 2: + if (ftype == ::apache::thrift::protocol::T_STRING) { + xfer += iprot->readString(this->code); + this->__isset.code = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 3: + if (ftype == ::apache::thrift::protocol::T_STRING) { + xfer += iprot->readString(this->url); + this->__isset.url = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 4: + if (ftype == ::apache::thrift::protocol::T_I32) { + xfer += iprot->readI32(this->line); + this->__isset.line = true; + } else { + xfer += iprot->skip(ftype); + } + break; + default: + xfer += iprot->skip(ftype); + break; + } + xfer += iprot->readFieldEnd(); + } + + xfer += iprot->readStructEnd(); + + return xfer; +} + +uint32_t Server_Frame_ExecuteJavaScript_args::write(::apache::thrift::protocol::TProtocol* oprot) const { + uint32_t xfer = 0; + ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); + xfer += oprot->writeStructBegin("Server_Frame_ExecuteJavaScript_args"); + + xfer += oprot->writeFieldBegin("frameId", ::apache::thrift::protocol::T_I32, 1); + xfer += oprot->writeI32(this->frameId); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("code", ::apache::thrift::protocol::T_STRING, 2); + xfer += oprot->writeString(this->code); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("url", ::apache::thrift::protocol::T_STRING, 3); + xfer += oprot->writeString(this->url); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("line", ::apache::thrift::protocol::T_I32, 4); + xfer += oprot->writeI32(this->line); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldStop(); + xfer += oprot->writeStructEnd(); + return xfer; +} + + +Server_Frame_ExecuteJavaScript_pargs::~Server_Frame_ExecuteJavaScript_pargs() noexcept { +} + + +uint32_t Server_Frame_ExecuteJavaScript_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const { + uint32_t xfer = 0; + ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); + xfer += oprot->writeStructBegin("Server_Frame_ExecuteJavaScript_pargs"); + + xfer += oprot->writeFieldBegin("frameId", ::apache::thrift::protocol::T_I32, 1); + xfer += oprot->writeI32((*(this->frameId))); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("code", ::apache::thrift::protocol::T_STRING, 2); + xfer += oprot->writeString((*(this->code))); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("url", ::apache::thrift::protocol::T_STRING, 3); + xfer += oprot->writeString((*(this->url))); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("line", ::apache::thrift::protocol::T_I32, 4); + xfer += oprot->writeI32((*(this->line))); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldStop(); + xfer += oprot->writeStructEnd(); + return xfer; +} + + Server_Request_Update_args::~Server_Request_Update_args() noexcept { } @@ -11283,6 +11410,28 @@ void ServerClient::send_Browser_SetFrameRate(const int32_t bid, const int32_t va oprot_->getTransport()->flush(); } +void ServerClient::Frame_ExecuteJavaScript(const int32_t frameId, const std::string& code, const std::string& url, const int32_t line) +{ + send_Frame_ExecuteJavaScript(frameId, code, url, line); +} + +void ServerClient::send_Frame_ExecuteJavaScript(const int32_t frameId, const std::string& code, const std::string& url, const int32_t line) +{ + int32_t cseqid = 0; + oprot_->writeMessageBegin("Frame_ExecuteJavaScript", ::apache::thrift::protocol::T_ONEWAY, cseqid); + + Server_Frame_ExecuteJavaScript_pargs args; + args.frameId = &frameId; + args.code = &code; + args.url = &url; + args.line = &line; + args.write(oprot_); + + oprot_->writeMessageEnd(); + oprot_->getTransport()->writeEnd(); + oprot_->getTransport()->flush(); +} + void ServerClient::Request_Update(const ::thrift_codegen::RObject& request) { send_Request_Update(request); @@ -14314,6 +14463,43 @@ void ServerProcessor::process_Browser_SetFrameRate(int32_t, ::apache::thrift::pr return; } +void ServerProcessor::process_Frame_ExecuteJavaScript(int32_t, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol*, void* callContext) +{ + void* ctx = nullptr; + if (this->eventHandler_.get() != nullptr) { + ctx = this->eventHandler_->getContext("Server.Frame_ExecuteJavaScript", callContext); + } + ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "Server.Frame_ExecuteJavaScript"); + + if (this->eventHandler_.get() != nullptr) { + this->eventHandler_->preRead(ctx, "Server.Frame_ExecuteJavaScript"); + } + + Server_Frame_ExecuteJavaScript_args args; + args.read(iprot); + iprot->readMessageEnd(); + uint32_t bytes = iprot->getTransport()->readEnd(); + + if (this->eventHandler_.get() != nullptr) { + this->eventHandler_->postRead(ctx, "Server.Frame_ExecuteJavaScript", bytes); + } + + try { + iface_->Frame_ExecuteJavaScript(args.frameId, args.code, args.url, args.line); + } catch (const std::exception&) { + if (this->eventHandler_.get() != nullptr) { + this->eventHandler_->handlerError(ctx, "Server.Frame_ExecuteJavaScript"); + } + return; + } + + if (this->eventHandler_.get() != nullptr) { + this->eventHandler_->asyncComplete(ctx, "Server.Frame_ExecuteJavaScript"); + } + + return; +} + void ServerProcessor::process_Request_Update(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext) { void* ctx = nullptr; @@ -17560,6 +17746,31 @@ void ServerConcurrentClient::send_Browser_SetFrameRate(const int32_t bid, const sentry.commit(); } +void ServerConcurrentClient::Frame_ExecuteJavaScript(const int32_t frameId, const std::string& code, const std::string& url, const int32_t line) +{ + send_Frame_ExecuteJavaScript(frameId, code, url, line); +} + +void ServerConcurrentClient::send_Frame_ExecuteJavaScript(const int32_t frameId, const std::string& code, const std::string& url, const int32_t line) +{ + int32_t cseqid = 0; + ::apache::thrift::async::TConcurrentSendSentry sentry(this->sync_.get()); + oprot_->writeMessageBegin("Frame_ExecuteJavaScript", ::apache::thrift::protocol::T_ONEWAY, cseqid); + + Server_Frame_ExecuteJavaScript_pargs args; + args.frameId = &frameId; + args.code = &code; + args.url = &url; + args.line = &line; + args.write(oprot_); + + oprot_->writeMessageEnd(); + oprot_->getTransport()->writeEnd(); + oprot_->getTransport()->flush(); + + sentry.commit(); +} + void ServerConcurrentClient::Request_Update(const ::thrift_codegen::RObject& request) { int32_t seqid = send_Request_Update(request); diff --git a/remote/gen-cpp/Server.h b/remote/gen-cpp/Server.h index ab79dd7..b16c33b 100644 --- a/remote/gen-cpp/Server.h +++ b/remote/gen-cpp/Server.h @@ -62,6 +62,7 @@ class ServerIf { virtual void Browser_StopFinding(const int32_t bid, const bool clearSelection) = 0; virtual void Browser_ReplaceMisspelling(const int32_t bid, const std::string& word) = 0; virtual void Browser_SetFrameRate(const int32_t bid, const int32_t val) = 0; + virtual void Frame_ExecuteJavaScript(const int32_t frameId, const std::string& code, const std::string& url, const int32_t line) = 0; virtual void Request_Update(const ::thrift_codegen::RObject& request) = 0; virtual void Request_GetPostData( ::thrift_codegen::PostData& _return, const ::thrift_codegen::RObject& request) = 0; virtual void Request_SetPostData(const ::thrift_codegen::RObject& request, const ::thrift_codegen::PostData& postData) = 0; @@ -252,6 +253,9 @@ class ServerNull : virtual public ServerIf { void Browser_SetFrameRate(const int32_t /* bid */, const int32_t /* val */) override { return; } + void Frame_ExecuteJavaScript(const int32_t /* frameId */, const std::string& /* code */, const std::string& /* url */, const int32_t /* line */) override { + return; + } void Request_Update(const ::thrift_codegen::RObject& /* request */) override { return; } @@ -3386,6 +3390,80 @@ class Server_Browser_SetFrameRate_pargs { }; +typedef struct _Server_Frame_ExecuteJavaScript_args__isset { + _Server_Frame_ExecuteJavaScript_args__isset() : frameId(false), code(false), url(false), line(false) {} + bool frameId :1; + bool code :1; + bool url :1; + bool line :1; +} _Server_Frame_ExecuteJavaScript_args__isset; + +class Server_Frame_ExecuteJavaScript_args { + public: + + Server_Frame_ExecuteJavaScript_args(const Server_Frame_ExecuteJavaScript_args&); + Server_Frame_ExecuteJavaScript_args& operator=(const Server_Frame_ExecuteJavaScript_args&); + Server_Frame_ExecuteJavaScript_args() noexcept + : frameId(0), + code(), + url(), + line(0) { + } + + virtual ~Server_Frame_ExecuteJavaScript_args() noexcept; + int32_t frameId; + std::string code; + std::string url; + int32_t line; + + _Server_Frame_ExecuteJavaScript_args__isset __isset; + + void __set_frameId(const int32_t val); + + void __set_code(const std::string& val); + + void __set_url(const std::string& val); + + void __set_line(const int32_t val); + + bool operator == (const Server_Frame_ExecuteJavaScript_args & rhs) const + { + if (!(frameId == rhs.frameId)) + return false; + if (!(code == rhs.code)) + return false; + if (!(url == rhs.url)) + return false; + if (!(line == rhs.line)) + return false; + return true; + } + bool operator != (const Server_Frame_ExecuteJavaScript_args &rhs) const { + return !(*this == rhs); + } + + bool operator < (const Server_Frame_ExecuteJavaScript_args & ) const; + + uint32_t read(::apache::thrift::protocol::TProtocol* iprot); + uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; + +}; + + +class Server_Frame_ExecuteJavaScript_pargs { + public: + + + virtual ~Server_Frame_ExecuteJavaScript_pargs() noexcept; + const int32_t* frameId; + const std::string* code; + const std::string* url; + const int32_t* line; + + uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; + +}; + typedef struct _Server_Request_Update_args__isset { _Server_Request_Update_args__isset() : request(false) {} bool request :1; @@ -6058,6 +6136,8 @@ class ServerClient : virtual public ServerIf { void send_Browser_ReplaceMisspelling(const int32_t bid, const std::string& word); void Browser_SetFrameRate(const int32_t bid, const int32_t val) override; void send_Browser_SetFrameRate(const int32_t bid, const int32_t val); + void Frame_ExecuteJavaScript(const int32_t frameId, const std::string& code, const std::string& url, const int32_t line) override; + void send_Frame_ExecuteJavaScript(const int32_t frameId, const std::string& code, const std::string& url, const int32_t line); void Request_Update(const ::thrift_codegen::RObject& request) override; void send_Request_Update(const ::thrift_codegen::RObject& request); void recv_Request_Update(); @@ -6194,6 +6274,7 @@ class ServerProcessor : public ::apache::thrift::TDispatchProcessor { void process_Browser_StopFinding(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext); void process_Browser_ReplaceMisspelling(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext); void process_Browser_SetFrameRate(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext); + void process_Frame_ExecuteJavaScript(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext); void process_Request_Update(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext); void process_Request_GetPostData(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext); void process_Request_SetPostData(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext); @@ -6268,6 +6349,7 @@ class ServerProcessor : public ::apache::thrift::TDispatchProcessor { processMap_["Browser_StopFinding"] = &ServerProcessor::process_Browser_StopFinding; processMap_["Browser_ReplaceMisspelling"] = &ServerProcessor::process_Browser_ReplaceMisspelling; processMap_["Browser_SetFrameRate"] = &ServerProcessor::process_Browser_SetFrameRate; + processMap_["Frame_ExecuteJavaScript"] = &ServerProcessor::process_Frame_ExecuteJavaScript; processMap_["Request_Update"] = &ServerProcessor::process_Request_Update; processMap_["Request_GetPostData"] = &ServerProcessor::process_Request_GetPostData; processMap_["Request_SetPostData"] = &ServerProcessor::process_Request_SetPostData; @@ -6691,6 +6773,15 @@ class ServerMultiface : virtual public ServerIf { ifaces_[i]->Browser_SetFrameRate(bid, val); } + void Frame_ExecuteJavaScript(const int32_t frameId, const std::string& code, const std::string& url, const int32_t line) override { + size_t sz = ifaces_.size(); + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->Frame_ExecuteJavaScript(frameId, code, url, line); + } + ifaces_[i]->Frame_ExecuteJavaScript(frameId, code, url, line); + } + void Request_Update(const ::thrift_codegen::RObject& request) override { size_t sz = ifaces_.size(); size_t i = 0; @@ -7102,6 +7193,8 @@ class ServerConcurrentClient : virtual public ServerIf { void send_Browser_ReplaceMisspelling(const int32_t bid, const std::string& word); void Browser_SetFrameRate(const int32_t bid, const int32_t val) override; void send_Browser_SetFrameRate(const int32_t bid, const int32_t val); + void Frame_ExecuteJavaScript(const int32_t frameId, const std::string& code, const std::string& url, const int32_t line) override; + void send_Frame_ExecuteJavaScript(const int32_t frameId, const std::string& code, const std::string& url, const int32_t line); void Request_Update(const ::thrift_codegen::RObject& request) override; int32_t send_Request_Update(const ::thrift_codegen::RObject& request); void recv_Request_Update(const int32_t seqid); diff --git a/remote/gen-cpp/Server_server.skeleton.cpp b/remote/gen-cpp/Server_server.skeleton.cpp index ab82e8b..0a78ddd 100644 --- a/remote/gen-cpp/Server_server.skeleton.cpp +++ b/remote/gen-cpp/Server_server.skeleton.cpp @@ -220,6 +220,11 @@ class ServerHandler : virtual public ServerIf { printf("Browser_SetFrameRate\n"); } + void Frame_ExecuteJavaScript(const int32_t frameId, const std::string& code, const std::string& url, const int32_t line) { + // Your implementation goes here + printf("Frame_ExecuteJavaScript\n"); + } + void Request_Update(const ::thrift_codegen::RObject& request) { // Your implementation goes here printf("Request_Update\n"); diff --git a/remote/handlers/RemoteDisplayHandler.cpp b/remote/handlers/RemoteDisplayHandler.cpp index 928506b..c0f0b46 100644 --- a/remote/handlers/RemoteDisplayHandler.cpp +++ b/remote/handlers/RemoteDisplayHandler.cpp @@ -1,5 +1,6 @@ #include "RemoteDisplayHandler.h" #include "RemoteClientHandler.h" +#include "../browser/RemoteFrame.h" RemoteDisplayHandler::RemoteDisplayHandler(int bid, std::shared_ptr<RpcExecutor> service) : myBid(bid), myService(service) {} @@ -8,8 +9,9 @@ void RemoteDisplayHandler::OnAddressChange(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, const CefString& url) { LNDCT(); + RemoteFrame::Holder frm(frame); myService->exec([&](const RpcExecutor::Service& s){ - s->DisplayHandler_OnAddressChange(myBid, url.ToString()); + s->DisplayHandler_OnAddressChange(myBid, frm.get()->serverIdWithMap(), url.ToString()); }); } diff --git a/remote/handlers/RemoteLifespanHandler.cpp b/remote/handlers/RemoteLifespanHandler.cpp index 4cc051c..156cc22 100644 --- a/remote/handlers/RemoteLifespanHandler.cpp +++ b/remote/handlers/RemoteLifespanHandler.cpp @@ -2,6 +2,7 @@ #include "RemoteClientHandler.h" #include "../log/Log.h" +#include "../browser/RemoteFrame.h" RemoteLifespanHandler::RemoteLifespanHandler( int bid, @@ -25,10 +26,11 @@ bool RemoteLifespanHandler::OnBeforePopup( bool* no_javascript_access) { //LNDCT(); + RemoteFrame::Holder frm(frame); return myService->exec<bool>([&](const RpcExecutor::Service& s){ // TODO: support other params and return values Log::error("Unimplemented some params transferring"); - return s->LifeSpanHandler_OnBeforePopup(myBid, target_url.ToString(), target_frame_name.ToString(), user_gesture); + return s->LifeSpanHandler_OnBeforePopup(myBid, frm.get()->serverIdWithMap(), target_url.ToString(), target_frame_name.ToString(), user_gesture); }, false); } diff --git a/remote/handlers/RemoteLoadHandler.cpp b/remote/handlers/RemoteLoadHandler.cpp index 7fee2fc..8d8322c 100644 --- a/remote/handlers/RemoteLoadHandler.cpp +++ b/remote/handlers/RemoteLoadHandler.cpp @@ -1,6 +1,7 @@ #include "RemoteLoadHandler.h" #include "../log/Log.h" #include "RemoteClientHandler.h" +#include "../browser/RemoteFrame.h" RemoteLoadHandler::RemoteLoadHandler(int bid, std::shared_ptr<RpcExecutor> service) : myBid(bid), myService(service) {} @@ -21,8 +22,9 @@ void RemoteLoadHandler::OnLoadStart(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefLoadHandler::TransitionType transition_type) { LNDCT(); + RemoteFrame::Holder frm(frame); myService->exec([&](const RpcExecutor::Service& s){ - s->LoadHandler_OnLoadStart(myBid, transition_type); + s->LoadHandler_OnLoadStart(myBid, frm.get()->serverIdWithMap(), transition_type); }); } @@ -30,8 +32,9 @@ void RemoteLoadHandler::OnLoadEnd(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, int httpStatusCode) { LNDCT(); + RemoteFrame::Holder frm(frame); myService->exec([&](const RpcExecutor::Service& s){ - s->LoadHandler_OnLoadEnd(myBid, httpStatusCode); + s->LoadHandler_OnLoadEnd(myBid, frm.get()->serverIdWithMap(), httpStatusCode); }); } @@ -41,7 +44,8 @@ void RemoteLoadHandler::OnLoadError(CefRefPtr<CefBrowser> browser, const CefString& errorText, const CefString& failedUrl) { LNDCT(); + RemoteFrame::Holder frm(frame); myService->exec([&](const RpcExecutor::Service& s){ - s->LoadHandler_OnLoadError(myBid, errorCode, errorText.ToString(), failedUrl.ToString()); + s->LoadHandler_OnLoadError(myBid, frm.get()->serverIdWithMap(), errorCode, errorText.ToString(), failedUrl.ToString()); }); } diff --git a/remote/network/RemoteCookieAccessFilter.cpp b/remote/network/RemoteCookieAccessFilter.cpp index 783e5bf..c6b273b 100644 --- a/remote/network/RemoteCookieAccessFilter.cpp +++ b/remote/network/RemoteCookieAccessFilter.cpp @@ -3,6 +3,7 @@ #include "../log/Log.h" #include "RemoteRequest.h" #include "RemoteResponse.h" +#include "../browser/RemoteFrame.h" namespace { std::vector<std::string> cookie2list(const CefCookie& cookie); @@ -40,8 +41,9 @@ bool RemoteCookieAccessFilter::CanSendCookie(CefRefPtr<CefBrowser> browser, ) { LNDCT(); RemoteRequest::Holder req(request); + RemoteFrame::Holder frm(frame); return myService->exec<bool>([&](RpcExecutor::Service s){ - return s->CookieAccessFilter_CanSendCookie(myPeerId, myBid, req.get()->serverIdWithMap(), cookie2list(cookie)); + return s->CookieAccessFilter_CanSendCookie(myPeerId, myBid, frm.get()->serverIdWithMap(), req.get()->serverIdWithMap(), cookie2list(cookie)); }, true); } @@ -63,8 +65,9 @@ bool RemoteCookieAccessFilter::CanSaveCookie(CefRefPtr<CefBrowser> browser, LNDCT(); RemoteRequest::Holder req(request); RemoteResponse::Holder resp(response); + RemoteFrame::Holder frm(frame); return myService->exec<bool>([&](RpcExecutor::Service s){ - return s->CookieAccessFilter_CanSaveCookie(myPeerId, myBid, req.get()->serverIdWithMap(), + return s->CookieAccessFilter_CanSaveCookie(myPeerId, myBid, frm.get()->serverIdWithMap(), req.get()->serverIdWithMap(), resp.get()->serverIdWithMap(), cookie2list(cookie)); }, true); } diff --git a/remote/network/RemoteRequestHandler.cpp b/remote/network/RemoteRequestHandler.cpp index 879a3f7..6a1c5e2 100644 --- a/remote/network/RemoteRequestHandler.cpp +++ b/remote/network/RemoteRequestHandler.cpp @@ -5,6 +5,7 @@ #include "../handlers/RemoteClientHandler.h" #include "RemoteRequest.h" #include "RemoteResourceRequestHandler.h" +#include "../browser/RemoteFrame.h" #include "include/cef_ssl_info.h" @@ -58,8 +59,9 @@ bool RemoteRequestHandler::OnBeforeBrowse(CefRefPtr<CefBrowser> browser, myRoutersManager->OnBeforeBrowse(browser, frame); RemoteRequest::Holder req(request); + RemoteFrame::Holder frm(frame); return myService->exec<bool>([&](RpcExecutor::Service s){ - return s->RequestHandler_OnBeforeBrowse(myBid, req.get()->serverIdWithMap(), user_gesture, is_redirect); + return s->RequestHandler_OnBeforeBrowse(myBid, frm.get()->serverIdWithMap(), req.get()->serverIdWithMap(), user_gesture, is_redirect); }, false); } @@ -70,8 +72,9 @@ bool RemoteRequestHandler::OnOpenURLFromTab(CefRefPtr<CefBrowser> browser, bool user_gesture ) { LNDCT(); + RemoteFrame::Holder frm(frame); return myService->exec<bool>([&](RpcExecutor::Service s){ - return s->RequestHandler_OnOpenURLFromTab(myBid, target_url.ToString(), user_gesture); + return s->RequestHandler_OnOpenURLFromTab(myBid, frm.get()->serverIdWithMap(), target_url.ToString(), user_gesture); }, false); } @@ -103,11 +106,12 @@ CefRefPtr<CefResourceRequestHandler> RemoteRequestHandler::GetResourceRequestHan LogNdc ndc(__FILE_NAME__, __FUNCTION__, 500, false, false, "ChromeIO"); RemoteRequest::Holder req(request); + RemoteFrame::Holder frm(frame); thrift_codegen::RObject peer; peer.__set_objId(-1); myServiceIO->exec([&](RpcExecutor::Service s){ s->RequestHandler_GetResourceRequestHandler( - peer, myBid, req.get()->serverIdWithMap(), is_navigation, is_download, request_initiator.ToString()); + peer, myBid, frm.get()->serverIdWithMap(), req.get()->serverIdWithMap(), is_navigation, is_download, request_initiator.ToString()); }); disable_default_handling = peer.__isset.flags ? peer.flags != 0 : false; diff --git a/remote/network/RemoteResourceRequestHandler.cpp b/remote/network/RemoteResourceRequestHandler.cpp index 9b6caa2..4134602 100644 --- a/remote/network/RemoteResourceRequestHandler.cpp +++ b/remote/network/RemoteResourceRequestHandler.cpp @@ -6,6 +6,7 @@ #include "RemoteRequest.h" #include "RemoteResourceHandler.h" #include "RemoteResponse.h" +#include "../browser/RemoteFrame.h" namespace { std::string status2str(cef_urlrequest_status_t type); @@ -44,10 +45,11 @@ CefRefPtr<CefCookieAccessFilter> RemoteResourceRequestHandler::GetCookieAccessFi LNDCT(); RemoteRequest::Holder req(request); + RemoteFrame::Holder frm(frame); thrift_codegen::RObject remoteHandler; myService->exec([&](RpcExecutor::Service s){ - s->ResourceRequestHandler_GetCookieAccessFilter(remoteHandler, myPeerId, myBid, req.get()->serverIdWithMap()); + s->ResourceRequestHandler_GetCookieAccessFilter(remoteHandler, myPeerId, myBid, frm.get()->serverIdWithMap(), req.get()->serverIdWithMap()); }); return remoteHandler.objId != -1 ? new RemoteCookieAccessFilter(myBid, myService, remoteHandler) : nullptr; } @@ -72,9 +74,10 @@ CefResourceRequestHandler::ReturnValue RemoteResourceRequestHandler::OnBeforeRes ) { LNDCT(); RemoteRequest::Holder req(request); + RemoteFrame::Holder frm(frame); CefResourceRequestHandler::ReturnValue result = RV_CONTINUE; myService->exec([&](RpcExecutor::Service s){ - bool boolRes = s->ResourceRequestHandler_OnBeforeResourceLoad(myPeerId, myBid, req.get()->serverIdWithMap()); + bool boolRes = s->ResourceRequestHandler_OnBeforeResourceLoad(myPeerId, myBid, frm.get()->serverIdWithMap(), req.get()->serverIdWithMap()); result = (boolRes ? RV_CANCEL : RV_CONTINUE); }); return result; @@ -97,9 +100,10 @@ CefRefPtr<CefResourceHandler> RemoteResourceRequestHandler::GetResourceHandler( LNDCT(); RemoteRequest::Holder req(request); + RemoteFrame::Holder frm(frame); thrift_codegen::RObject remoteHandler; myService->exec([&](RpcExecutor::Service s){ - s->ResourceRequestHandler_GetResourceHandler(remoteHandler, myPeerId, myBid, req.get()->serverIdWithMap()); + s->ResourceRequestHandler_GetResourceHandler(remoteHandler, myPeerId, myBid, frm.get()->serverIdWithMap(), req.get()->serverIdWithMap()); }); return remoteHandler.objId != -1 ? new RemoteResourceHandler(myBid, myService, remoteHandler) : nullptr; } @@ -125,9 +129,10 @@ void RemoteResourceRequestHandler::OnResourceRedirect( LNDCT(); RemoteRequest::Holder req(request); RemoteResponse::Holder resp(response); + RemoteFrame::Holder frm(frame); std::string result; myService->exec([&](RpcExecutor::Service s){ - s->ResourceRequestHandler_OnResourceRedirect(result, myPeerId, myBid, req.get()->serverIdWithMap(), + s->ResourceRequestHandler_OnResourceRedirect(result, myPeerId, myBid, frm.get()->serverIdWithMap(), req.get()->serverIdWithMap(), resp.get()->serverIdWithMap(), new_url.ToString()); }); CefString tmp(result); @@ -157,8 +162,9 @@ bool RemoteResourceRequestHandler::OnResourceResponse( LNDCT(); RemoteRequest::Holder req(request); RemoteResponse::Holder resp(response); + RemoteFrame::Holder frm(frame); return myService->exec<bool>([&](RpcExecutor::Service s){ - return s->ResourceRequestHandler_OnResourceResponse(myPeerId, myBid, req.get()->serverIdWithMap(), + return s->ResourceRequestHandler_OnResourceResponse(myPeerId, myBid, frm.get()->serverIdWithMap(), req.get()->serverIdWithMap(), resp.get()->serverIdWithMap()); }, false); } @@ -191,8 +197,9 @@ void RemoteResourceRequestHandler::OnResourceLoadComplete( LNDCT(); RemoteRequest::Holder req(request); RemoteResponse::Holder resp(response); + RemoteFrame::Holder frm(frame); myService->exec([&](RpcExecutor::Service s){ - s->ResourceRequestHandler_OnResourceLoadComplete(myPeerId, myBid, req.get()->serverIdWithMap(), + s->ResourceRequestHandler_OnResourceLoadComplete(myPeerId, myBid, frm.get()->serverIdWithMap(), req.get()->serverIdWithMap(), resp.get()->serverIdWithMap(), status2str(status), received_content_length); }); } @@ -215,8 +222,9 @@ void RemoteResourceRequestHandler::OnProtocolExecution( bool& allow_os_execution) { LNDCT(); RemoteRequest::Holder req(request); + RemoteFrame::Holder frm(frame); myService->exec([&](RpcExecutor::Service s){ - allow_os_execution = s->ResourceRequestHandler_OnProtocolExecution(myPeerId, myBid, req.get()->serverIdWithMap(), allow_os_execution); + allow_os_execution = s->ResourceRequestHandler_OnProtocolExecution(myPeerId, myBid, frm.get()->serverIdWithMap(), req.get()->serverIdWithMap(), allow_os_execution); }); } diff --git a/remote/router/RemoteMessageRouterHandler.cpp b/remote/router/RemoteMessageRouterHandler.cpp index e5838ec..2f99fb9 100644 --- a/remote/router/RemoteMessageRouterHandler.cpp +++ b/remote/router/RemoteMessageRouterHandler.cpp @@ -1,6 +1,7 @@ #include "RemoteMessageRouterHandler.h" #include "RemoteQueryCallback.h" #include "../browser/ClientsManager.h" +#include "../browser/RemoteFrame.h" // remove to enable tracing #ifdef TRACE @@ -51,9 +52,10 @@ bool RemoteMessageRouterHandler::OnQuery(CefRefPtr<CefBrowser> browser, Log::error("Can't find remote browser by cef-id %d", browser ? browser->GetIdentifier() : -1); return false; } + RemoteFrame::Holder frm(frame); RemoteQueryCallback* rcb = RemoteQueryCallback::wrapDelegate(callback); bool handled = myService->exec<bool>([&](RpcExecutor::Service s){ - return s->MessageRouterHandler_onQuery(javaId(), bid, query_id, request, persistent, rcb->serverId()); + return s->MessageRouterHandler_onQuery(javaId(), bid, frm.get()->serverIdWithMap(), query_id, request, persistent, rcb->serverId()); }, false); if (!handled) // NOTE: must delete callback when onQuery returns false RemoteQueryCallback::dispose(rcb->getId()); @@ -71,8 +73,9 @@ void RemoteMessageRouterHandler::OnQueryCanceled(CefRefPtr<CefBrowser> browser, Log::error("Can't find remote browser by cef-id %d", browser ? browser->GetIdentifier() : -1); return; } + RemoteFrame::Holder frm(frame); myService->exec([&](RpcExecutor::Service s){ - return s->MessageRouterHandler_onQueryCanceled(javaId(), bid, query_id); + return s->MessageRouterHandler_onQueryCanceled(javaId(), bid, frm.get()->serverIdWithMap(), query_id); }); } |