OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) | 2 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) |
3 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. | 3 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
7 * are met: | 7 * are met: |
8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
(...skipping 1534 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1545 LoadAlternateHTMLString(failed_request.get(), std::string(), | 1545 LoadAlternateHTMLString(failed_request.get(), std::string(), |
1546 error.GetFailedURL(), replace); | 1546 error.GetFailedURL(), replace); |
1547 | 1547 |
1548 WebErrorImpl weberror_impl(error); | 1548 WebErrorImpl weberror_impl(error); |
1549 alt_error_page_fetcher_.reset( | 1549 alt_error_page_fetcher_.reset( |
1550 new AltErrorPageResourceFetcher(webview_impl_, weberror_impl, this, | 1550 new AltErrorPageResourceFetcher(webview_impl_, weberror_impl, this, |
1551 error_page_url)); | 1551 error_page_url)); |
1552 } | 1552 } |
1553 | 1553 |
1554 void WebFrameImpl::ExecuteJavaScript(const std::string& js_code, | 1554 void WebFrameImpl::ExecuteJavaScript(const std::string& js_code, |
1555 const GURL& script_url) { | 1555 const GURL& script_url, |
| 1556 int start_line) { |
1556 WebCore::ScriptSourceCode source_code( | 1557 WebCore::ScriptSourceCode source_code( |
1557 webkit_glue::StdStringToString(js_code), | 1558 webkit_glue::StdStringToString(js_code), |
1558 webkit_glue::GURLToKURL(script_url), | 1559 webkit_glue::GURLToKURL(script_url), |
1559 1); // base line number (for errors) | 1560 start_line); |
1560 frame_->loader()->executeScript(source_code); | 1561 frame_->loader()->executeScript(source_code); |
1561 } | 1562 } |
1562 | 1563 |
1563 std::wstring WebFrameImpl::GetName() { | 1564 std::wstring WebFrameImpl::GetName() { |
1564 return webkit_glue::StringToStdWString(frame_->tree()->name()); | 1565 return webkit_glue::StringToStdWString(frame_->tree()->name()); |
1565 } | 1566 } |
1566 | 1567 |
1567 WebTextInput* WebFrameImpl::GetTextInput() { | 1568 WebTextInput* WebFrameImpl::GetTextInput() { |
1568 if (!webtextinput_impl_.get()) { | 1569 if (!webtextinput_impl_.get()) { |
1569 webtextinput_impl_.reset(new WebTextInputImpl(this)); | 1570 webtextinput_impl_.reset(new WebTextInputImpl(this)); |
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1843 return password_listeners_.get(input_element); | 1844 return password_listeners_.get(input_element); |
1844 } | 1845 } |
1845 | 1846 |
1846 void WebFrameImpl::ClearPasswordListeners() { | 1847 void WebFrameImpl::ClearPasswordListeners() { |
1847 for (PasswordListenerMap::iterator iter = password_listeners_.begin(); | 1848 for (PasswordListenerMap::iterator iter = password_listeners_.begin(); |
1848 iter != password_listeners_.end(); ++iter) { | 1849 iter != password_listeners_.end(); ++iter) { |
1849 delete iter->second; | 1850 delete iter->second; |
1850 } | 1851 } |
1851 password_listeners_.clear(); | 1852 password_listeners_.clear(); |
1852 } | 1853 } |
OLD | NEW |