OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 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 781 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
792 bool WebViewHost::allowPlugins(WebFrame* frame, bool enabledPerSettings) | 792 bool WebViewHost::allowPlugins(WebFrame* frame, bool enabledPerSettings) |
793 { | 793 { |
794 return enabledPerSettings; | 794 return enabledPerSettings; |
795 } | 795 } |
796 | 796 |
797 bool WebViewHost::allowImages(WebFrame* frame, bool enabledPerSettings) | 797 bool WebViewHost::allowImages(WebFrame* frame, bool enabledPerSettings) |
798 { | 798 { |
799 return enabledPerSettings; | 799 return enabledPerSettings; |
800 } | 800 } |
801 | 801 |
802 void WebViewHost::loadURLExternally(WebFrame*, const WebURLRequest& request, Web
NavigationPolicy policy) | 802 void WebViewHost::loadURLExternally(WebFrame* frame, const WebURLRequest& reques
t, WebNavigationPolicy policy) |
| 803 { |
| 804 loadURLExternally(frame, request, policy, WebString()); |
| 805 } |
| 806 |
| 807 void WebViewHost::loadURLExternally(WebFrame*, const WebURLRequest& request, Web
NavigationPolicy policy, const WebString& downloadName) |
803 { | 808 { |
804 ASSERT(policy != WebKit::WebNavigationPolicyCurrentTab); | 809 ASSERT(policy != WebKit::WebNavigationPolicyCurrentTab); |
805 WebViewHost* another = m_shell->createNewWindow(request.url()); | 810 WebViewHost* another = m_shell->createNewWindow(request.url()); |
806 if (another) | 811 if (another) |
807 another->show(policy); | 812 another->show(policy); |
808 } | 813 } |
809 | 814 |
810 WebNavigationPolicy WebViewHost::decidePolicyForNavigation( | 815 WebNavigationPolicy WebViewHost::decidePolicyForNavigation( |
811 WebFrame*, const WebURLRequest& request, | 816 WebFrame*, const WebURLRequest& request, |
812 WebNavigationType type, const WebNode& originatingNode, | 817 WebNavigationType type, const WebNode& originatingNode, |
(...skipping 737 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1550 { | 1555 { |
1551 m_canvas.clear(); | 1556 m_canvas.clear(); |
1552 } | 1557 } |
1553 | 1558 |
1554 // Paints the entire canvas a semi-transparent black (grayish). This is used | 1559 // Paints the entire canvas a semi-transparent black (grayish). This is used |
1555 // by the layout tests in fast/repaint. The alpha value matches upstream. | 1560 // by the layout tests in fast/repaint. The alpha value matches upstream. |
1556 void WebViewHost::displayRepaintMask() | 1561 void WebViewHost::displayRepaintMask() |
1557 { | 1562 { |
1558 canvas()->drawARGB(167, 0, 0, 0); | 1563 canvas()->drawARGB(167, 0, 0, 0); |
1559 } | 1564 } |
OLD | NEW |