Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1098)

Side by Side Diff: third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp

Issue 2653673006: Move loadType() to DocumentLoader (Closed)
Patch Set: Rebase Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/inspector/InspectorInstrumentation.idl » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008, 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2008, 2009 Google Inc. All rights reserved.
3 * Copyright (C) 2009 Apple Inc. All rights reserved. 3 * Copyright (C) 2009 Apple Inc. All rights reserved.
4 * Copyright (C) 2014 Opera Software ASA. All rights reserved. 4 * Copyright (C) 2014 Opera Software ASA. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions are 7 * modification, are permitted provided that the following conditions are
8 * met: 8 * met:
9 * 9 *
10 * * Redistributions of source code must retain the above copyright 10 * * Redistributions of source code must retain the above copyright
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 !frame()->document()->contentSecurityPolicy()->allowJavaScriptURLs( 291 !frame()->document()->contentSecurityPolicy()->allowJavaScriptURLs(
292 element, frame()->document()->url(), 292 element, frame()->document()->url(),
293 eventHandlerPosition().m_line))) { 293 eventHandlerPosition().m_line))) {
294 return true; 294 return true;
295 } 295 }
296 296
297 bool progressNotificationsNeeded = 297 bool progressNotificationsNeeded =
298 frame()->loader().stateMachine()->isDisplayingInitialEmptyDocument() && 298 frame()->loader().stateMachine()->isDisplayingInitialEmptyDocument() &&
299 !frame()->isLoading(); 299 !frame()->isLoading();
300 if (progressNotificationsNeeded) 300 if (progressNotificationsNeeded)
301 frame()->loader().progress().progressStarted(); 301 frame()->loader().progress().progressStarted(FrameLoadTypeStandard);
302 302
303 Document* ownerDocument = frame()->document(); 303 Document* ownerDocument = frame()->document();
304 304
305 const int javascriptSchemeLength = sizeof("javascript:") - 1; 305 const int javascriptSchemeLength = sizeof("javascript:") - 1;
306 306
307 bool locationChangeBefore = 307 bool locationChangeBefore =
308 frame()->navigationScheduler().locationChangePending(); 308 frame()->navigationScheduler().locationChangePending();
309 309
310 String decodedURL = decodeURLEscapeSequences(url.getString()); 310 String decodedURL = decodeURLEscapeSequences(url.getString());
311 v8::HandleScope handleScope(isolate()); 311 v8::HandleScope handleScope(isolate());
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 for (size_t i = 0; i < resultArray->Length(); ++i) { 413 for (size_t i = 0; i < resultArray->Length(); ++i) {
414 v8::Local<v8::Value> value; 414 v8::Local<v8::Value> value;
415 if (!resultArray->Get(scriptState->context(), i).ToLocal(&value)) 415 if (!resultArray->Get(scriptState->context(), i).ToLocal(&value))
416 return; 416 return;
417 results->push_back(value); 417 results->push_back(value);
418 } 418 }
419 } 419 }
420 } 420 }
421 421
422 } // namespace blink 422 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/inspector/InspectorInstrumentation.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698