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 1577 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1588 | 1588 |
1589 LoadAlternateHTMLString(failed_request.get(), std::string(), | 1589 LoadAlternateHTMLString(failed_request.get(), std::string(), |
1590 error.GetFailedURL(), replace); | 1590 error.GetFailedURL(), replace); |
1591 | 1591 |
1592 WebErrorImpl weberror_impl(error); | 1592 WebErrorImpl weberror_impl(error); |
1593 alt_error_page_fetcher_.reset( | 1593 alt_error_page_fetcher_.reset( |
1594 new AltErrorPageResourceFetcher(webview_impl_, weberror_impl, this, | 1594 new AltErrorPageResourceFetcher(webview_impl_, weberror_impl, this, |
1595 error_page_url)); | 1595 error_page_url)); |
1596 } | 1596 } |
1597 | 1597 |
| 1598 void WebFrameImpl::ExecuteJavaScript(const std::string& js_code, |
| 1599 const std::string& script_url) { |
| 1600 frame_->loader()->executeScript(webkit_glue::StdStringToString(script_url), |
| 1601 1, // base line number (for errors) |
| 1602 webkit_glue::StdStringToString(js_code)); |
| 1603 } |
| 1604 |
1598 std::wstring WebFrameImpl::GetName() { | 1605 std::wstring WebFrameImpl::GetName() { |
1599 return webkit_glue::StringToStdWString(frame_->tree()->name()); | 1606 return webkit_glue::StringToStdWString(frame_->tree()->name()); |
1600 } | 1607 } |
1601 | 1608 |
1602 WebTextInput* WebFrameImpl::GetTextInput() { | 1609 WebTextInput* WebFrameImpl::GetTextInput() { |
1603 if (!webtextinput_impl_.get()) { | 1610 if (!webtextinput_impl_.get()) { |
1604 webtextinput_impl_.reset(new WebTextInputImpl(this)); | 1611 webtextinput_impl_.reset(new WebTextInputImpl(this)); |
1605 } | 1612 } |
1606 return webtextinput_impl_.get(); | 1613 return webtextinput_impl_.get(); |
1607 } | 1614 } |
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1867 if (loader) { | 1874 if (loader) { |
1868 return WebCore::FrameLoadTypeReloadAllowingStaleData == | 1875 return WebCore::FrameLoadTypeReloadAllowingStaleData == |
1869 loader->policyLoadType(); | 1876 loader->policyLoadType(); |
1870 } | 1877 } |
1871 return false; | 1878 return false; |
1872 } | 1879 } |
1873 | 1880 |
1874 int WebFrameImpl::PendingFrameUnloadEventCount() const { | 1881 int WebFrameImpl::PendingFrameUnloadEventCount() const { |
1875 return frame()->eventHandler()->pendingFrameUnloadEventCount(); | 1882 return frame()->eventHandler()->pendingFrameUnloadEventCount(); |
1876 } | 1883 } |
OLD | NEW |