| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010, 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2010, 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 813 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 824 WebMediaPlayer* WebViewHost::createMediaPlayer(WebFrame* frame, WebMediaPlayerCl
ient* client) | 824 WebMediaPlayer* WebViewHost::createMediaPlayer(WebFrame* frame, WebMediaPlayerCl
ient* client) |
| 825 { | 825 { |
| 826 return webkit_support::CreateMediaPlayer(frame, client); | 826 return webkit_support::CreateMediaPlayer(frame, client); |
| 827 } | 827 } |
| 828 | 828 |
| 829 WebApplicationCacheHost* WebViewHost::createApplicationCacheHost(WebFrame* frame
, WebApplicationCacheHostClient* client) | 829 WebApplicationCacheHost* WebViewHost::createApplicationCacheHost(WebFrame* frame
, WebApplicationCacheHostClient* client) |
| 830 { | 830 { |
| 831 return webkit_support::CreateApplicationCacheHost(frame, client); | 831 return webkit_support::CreateApplicationCacheHost(frame, client); |
| 832 } | 832 } |
| 833 | 833 |
| 834 void WebViewHost::didUpdateLayout(WebFrame*) | 834 void WebViewHost::didUpdateLayout() |
| 835 { | 835 { |
| 836 #if OS(MAC_OS_X) | 836 #if OS(MAC_OS_X) |
| 837 static bool queryingPreferredSize = false; | 837 static bool queryingPreferredSize = false; |
| 838 if (queryingPreferredSize) | 838 if (queryingPreferredSize) |
| 839 return; | 839 return; |
| 840 | 840 |
| 841 queryingPreferredSize = true; | 841 queryingPreferredSize = true; |
| 842 // Query preferred width to emulate the same functionality in Chromium: | 842 // Query preferred width to emulate the same functionality in Chromium: |
| 843 // see RenderView::CheckPreferredSize (src/content/renderer/render_view.cc) | 843 // see RenderView::CheckPreferredSize (src/content/renderer/render_view.cc) |
| 844 // and TabContentsViewMac::RenderViewCreated (src/chrome/browser/tab_content
s/tab_contents_view_mac.mm) | 844 // and TabContentsViewMac::RenderViewCreated (src/chrome/browser/tab_content
s/tab_contents_view_mac.mm) |
| (...skipping 825 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1670 { | 1670 { |
| 1671 m_canvas.clear(); | 1671 m_canvas.clear(); |
| 1672 } | 1672 } |
| 1673 | 1673 |
| 1674 // Paints the entire canvas a semi-transparent black (grayish). This is used | 1674 // Paints the entire canvas a semi-transparent black (grayish). This is used |
| 1675 // by the layout tests in fast/repaint. The alpha value matches upstream. | 1675 // by the layout tests in fast/repaint. The alpha value matches upstream. |
| 1676 void WebViewHost::displayRepaintMask() | 1676 void WebViewHost::displayRepaintMask() |
| 1677 { | 1677 { |
| 1678 canvas()->drawARGB(167, 0, 0, 0); | 1678 canvas()->drawARGB(167, 0, 0, 0); |
| 1679 } | 1679 } |
| OLD | NEW |