Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add way to add multiple load handlers to CefClient #462

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add way to add multiple load handlers to CefClient #462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 19 additions & 11 deletions java/org/cef/CefClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.cef.handler.CefKeyboardHandler;
import org.cef.handler.CefLifeSpanHandler;
import org.cef.handler.CefLoadHandler;
import org.cef.handler.CefLoadHandlerCollection;
import org.cef.handler.CefPrintHandler;
import org.cef.handler.CefRenderHandler;
import org.cef.handler.CefRequestHandler;
Expand Down Expand Up @@ -78,7 +79,7 @@ public class CefClient extends CefClientHandler
private CefJSDialogHandler jsDialogHandler_ = null;
private CefKeyboardHandler keyboardHandler_ = null;
private CefLifeSpanHandler lifeSpanHandler_ = null;
private CefLoadHandler loadHandler_ = null;
private CefLoadHandlerCollection loadHandlers_ = null;
private CefPrintHandler printHandler_ = null;
private CefRequestHandler requestHandler_ = null;
private boolean isDisposed_ = false;
Expand Down Expand Up @@ -616,38 +617,45 @@ private void cleanupBrowser(int identifier) {
// CefLoadHandler

public CefClient addLoadHandler(CefLoadHandler handler) {
if (loadHandler_ == null) loadHandler_ = handler;
if (loadHandlers_ == null) loadHandlers_ = new CefLoadHandlerCollection();
loadHandlers_.add(handler);
return this;
}

public void removeLoadHandler() {
loadHandler_ = null;
loadHandlers_ = null;
}

@Override
public void removeLoadHandler(CefLoadHandler handler) {
if(loadHandlers_ == null) return;
loadHandlers_.remove(handler);
}

@Override
public void onLoadingStateChange(
CefBrowser browser, boolean isLoading, boolean canGoBack, boolean canGoForward) {
if (loadHandler_ != null && browser != null)
loadHandler_.onLoadingStateChange(browser, isLoading, canGoBack, canGoForward);
if (loadHandlers_ != null && browser != null)
loadHandlers_.onLoadingStateChange(browser, isLoading, canGoBack, canGoForward);
}

@Override
public void onLoadStart(CefBrowser browser, CefFrame frame, TransitionType transitionType) {
if (loadHandler_ != null && browser != null)
loadHandler_.onLoadStart(browser, frame, transitionType);
if (loadHandlers_ != null && browser != null)
loadHandlers_.onLoadStart(browser, frame, transitionType);
}

@Override
public void onLoadEnd(CefBrowser browser, CefFrame frame, int httpStatusCode) {
if (loadHandler_ != null && browser != null)
loadHandler_.onLoadEnd(browser, frame, httpStatusCode);
if (loadHandlers_ != null && browser != null)
loadHandlers_.onLoadEnd(browser, frame, httpStatusCode);
}

@Override
public void onLoadError(CefBrowser browser, CefFrame frame, ErrorCode errorCode,
String errorText, String failedUrl) {
if (loadHandler_ != null && browser != null)
loadHandler_.onLoadError(browser, frame, errorCode, errorText, failedUrl);
if (loadHandlers_ != null && browser != null)
loadHandlers_.onLoadError(browser, frame, errorCode, errorText, failedUrl);
}

// CefPrintHandler
Expand Down
46 changes: 46 additions & 0 deletions java/org/cef/handler/CefLoadHandlerCollection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
// Copyright (c) 2014 The Chromium Embedded Framework Authors. All rights
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.

package org.cef.handler;

import org.cef.browser.CefBrowser;
import org.cef.browser.CefFrame;
import org.cef.network.CefRequest;

import java.util.ArrayList;

/**
* Convenience class to handle multiple load handlers.
*/
public class CefLoadHandlerCollection extends ArrayList<CefLoadHandler> implements CefLoadHandler {

@Override
public void onLoadingStateChange(CefBrowser browser, boolean isLoading, boolean canGoBack, boolean canGoForward) {
for(CefLoadHandler handler:this){
handler.onLoadingStateChange(browser, isLoading, canGoBack, canGoForward);
}
}

@Override
public void onLoadStart(CefBrowser browser, CefFrame frame, CefRequest.TransitionType transitionType) {
for(CefLoadHandler handler:this){
handler.onLoadStart(browser, frame, transitionType);
}
}

@Override
public void onLoadEnd(CefBrowser browser, CefFrame frame, int httpStatusCode) {
for(CefLoadHandler handler:this){
handler.onLoadEnd(browser, frame, httpStatusCode);
}
}

@Override
public void onLoadError(CefBrowser browser, CefFrame frame, ErrorCode errorCode, String errorText, String failedUrl) {
for(CefLoadHandler handler:this){
handler.onLoadError(browser, frame, errorCode, errorText, failedUrl);
}
}

}