OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
446 | 446 |
447 void InspectorPageAgent::reload(ErrorString*, const bool* const optionalIgnoreCa
che, const String* optionalScriptToEvaluateOnLoad, const String* optionalScriptP
reprocessor) | 447 void InspectorPageAgent::reload(ErrorString*, const bool* const optionalIgnoreCa
che, const String* optionalScriptToEvaluateOnLoad, const String* optionalScriptP
reprocessor) |
448 { | 448 { |
449 m_pendingScriptToEvaluateOnLoadOnce = optionalScriptToEvaluateOnLoad ? *opti
onalScriptToEvaluateOnLoad : ""; | 449 m_pendingScriptToEvaluateOnLoadOnce = optionalScriptToEvaluateOnLoad ? *opti
onalScriptToEvaluateOnLoad : ""; |
450 m_pendingScriptPreprocessor = optionalScriptPreprocessor ? *optionalScriptPr
eprocessor : ""; | 450 m_pendingScriptPreprocessor = optionalScriptPreprocessor ? *optionalScriptPr
eprocessor : ""; |
451 m_page->mainFrame()->loader()->reload(optionalIgnoreCache ? *optionalIgnoreC
ache : false); | 451 m_page->mainFrame()->loader()->reload(optionalIgnoreCache ? *optionalIgnoreC
ache : false); |
452 } | 452 } |
453 | 453 |
454 void InspectorPageAgent::navigate(ErrorString*, const String& url) | 454 void InspectorPageAgent::navigate(ErrorString*, const String& url) |
455 { | 455 { |
456 UserGestureIndicator indicator(DefinitelyProcessingUserGesture); | 456 UserGestureIndicator indicator(DefinitelyProcessingNewUserGesture); |
457 Frame* frame = m_page->mainFrame(); | 457 Frame* frame = m_page->mainFrame(); |
458 frame->loader()->changeLocation(frame->document()->securityOrigin(), frame->
document()->completeURL(url), "", false, false); | 458 frame->loader()->changeLocation(frame->document()->securityOrigin(), frame->
document()->completeURL(url), "", false, false); |
459 } | 459 } |
460 | 460 |
461 static PassRefPtr<TypeBuilder::Page::Cookie> buildObjectForCookie(const Cookie&
cookie) | 461 static PassRefPtr<TypeBuilder::Page::Cookie> buildObjectForCookie(const Cookie&
cookie) |
462 { | 462 { |
463 return TypeBuilder::Page::Cookie::create() | 463 return TypeBuilder::Page::Cookie::create() |
464 .setName(cookie.name) | 464 .setName(cookie.name) |
465 .setValue(cookie.value) | 465 .setValue(cookie.value) |
466 .setDomain(cookie.domain) | 466 .setDomain(cookie.domain) |
(...skipping 801 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1268 | 1268 |
1269 void InspectorPageAgent::handleJavaScriptDialog(ErrorString* errorString, bool a
ccept) | 1269 void InspectorPageAgent::handleJavaScriptDialog(ErrorString* errorString, bool a
ccept) |
1270 { | 1270 { |
1271 if (!m_client->handleJavaScriptDialog(accept)) | 1271 if (!m_client->handleJavaScriptDialog(accept)) |
1272 *errorString = "Could not handle JavaScript dialog"; | 1272 *errorString = "Could not handle JavaScript dialog"; |
1273 } | 1273 } |
1274 | 1274 |
1275 } // namespace WebCore | 1275 } // namespace WebCore |
1276 | 1276 |
1277 #endif // ENABLE(INSPECTOR) | 1277 #endif // ENABLE(INSPECTOR) |
OLD | NEW |