Generic code cleanup

Adding some comments, removing unused items, and renaming handler.go to
target.go to reflect the internal type name changes.
This commit is contained in:
Kenneth Shaw 2019-04-03 07:05:46 +07:00 committed by Daniel Martí
parent ece2b3ab92
commit 65a198c84e
5 changed files with 10 additions and 9 deletions

View File

@ -41,6 +41,7 @@ func NewAllocator(parent context.Context, opts ...AllocatorOption) (context.Cont
return ctx, cancel return ctx, cancel
} }
// AllocatorOption is a allocator option.
type AllocatorOption func(*Allocator) type AllocatorOption func(*Allocator)
// WithExecAllocator returns an AllocatorOption which sets up an ExecAllocator. // WithExecAllocator returns an AllocatorOption which sets up an ExecAllocator.
@ -59,6 +60,7 @@ func WithExecAllocator(opts ...ExecAllocatorOption) func(*Allocator) {
} }
} }
// ExecAllocatorOption is a exec allocator option.
type ExecAllocatorOption func(*ExecAllocator) type ExecAllocatorOption func(*ExecAllocator)
// ExecAllocator is an Allocator which starts new browser processes on the host // ExecAllocator is an Allocator which starts new browser processes on the host
@ -70,6 +72,7 @@ type ExecAllocator struct {
wg sync.WaitGroup wg sync.WaitGroup
} }
// Allocate satisfies the Allocator interface.
func (p *ExecAllocator) Allocate(ctx context.Context) (*Browser, error) { func (p *ExecAllocator) Allocate(ctx context.Context) (*Browser, error) {
var args []string var args []string
for name, value := range p.initFlags { for name, value := range p.initFlags {
@ -146,6 +149,7 @@ func (p *ExecAllocator) Allocate(ctx context.Context) (*Browser, error) {
return browser, nil return browser, nil
} }
// Wait satisfies the Allocator interface.
func (p *ExecAllocator) Wait() { func (p *ExecAllocator) Wait() {
p.wg.Wait() p.wg.Wait()
} }
@ -172,6 +176,7 @@ func findExecPath() string {
for _, path := range [...]string{ for _, path := range [...]string{
// Unix-like // Unix-like
"headless_shell", "headless_shell",
"headless-shell",
"chromium", "chromium",
"chromium-browser", "chromium-browser",
"google-chrome", "google-chrome",

View File

@ -12,11 +12,12 @@ import (
"log" "log"
"sync/atomic" "sync/atomic"
"github.com/mailru/easyjson"
"github.com/chromedp/cdproto" "github.com/chromedp/cdproto"
"github.com/chromedp/cdproto/cdp" "github.com/chromedp/cdproto/cdp"
"github.com/chromedp/cdproto/runtime" "github.com/chromedp/cdproto/runtime"
"github.com/chromedp/cdproto/target" "github.com/chromedp/cdproto/target"
"github.com/mailru/easyjson"
) )
// Browser is the high-level Chrome DevTools Protocol browser manager, handling // Browser is the high-level Chrome DevTools Protocol browser manager, handling

View File

@ -11,7 +11,7 @@ import (
// Evaluate is an action to evaluate the Javascript expression, unmarshaling // Evaluate is an action to evaluate the Javascript expression, unmarshaling
// the result of the script evaluation to res. // the result of the script evaluation to res.
// //
// When res is a type other than *[]byte, or **chromedp/cdp/runtime.RemoteObject, // When res is a type other than *[]byte, or **chromedp/cdproto/runtime.RemoteObject,
// then the result of the script evaluation will be returned "by value" (ie, // then the result of the script evaluation will be returned "by value" (ie,
// JSON-encoded), and subsequently an attempt will be made to json.Unmarshal // JSON-encoded), and subsequently an attempt will be made to json.Unmarshal
// the script result to res. // the script result to res.

View File

@ -227,6 +227,8 @@ func (t *Target) pageEvent(ev interface{}) {
return return
case *page.EventLifecycleEvent: case *page.EventLifecycleEvent:
return return
case *page.EventNavigatedWithinDocument:
return
default: default:
t.errf("unhandled page event %T", ev) t.errf("unhandled page event %T", ev)

View File

@ -1,17 +1,10 @@
package chromedp package chromedp
import ( import (
"time"
"github.com/chromedp/cdproto" "github.com/chromedp/cdproto"
"github.com/chromedp/cdproto/cdp" "github.com/chromedp/cdproto/cdp"
) )
const (
// DefaultCheckDuration is the default time to sleep between a check.
DefaultCheckDuration = 50 * time.Millisecond
)
// frameOp is a frame manipulation operation. // frameOp is a frame manipulation operation.
type frameOp func(*cdp.Frame) type frameOp func(*cdp.Frame)