OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2010, 2011, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2010, 2011, 2012 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 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
202 { | 202 { |
203 return true; | 203 return true; |
204 } | 204 } |
205 | 205 |
206 void WebViewHost::showContextMenu(WebFrame*, const WebContextMenuData& contextMe
nuData) | 206 void WebViewHost::showContextMenu(WebFrame*, const WebContextMenuData& contextMe
nuData) |
207 { | 207 { |
208 } | 208 } |
209 | 209 |
210 void WebViewHost::didUpdateLayout() | 210 void WebViewHost::didUpdateLayout() |
211 { | 211 { |
212 #if OS(MAC_OS_X) | 212 #if OS(DARWIN) |
213 static bool queryingPreferredSize = false; | 213 static bool queryingPreferredSize = false; |
214 if (queryingPreferredSize) | 214 if (queryingPreferredSize) |
215 return; | 215 return; |
216 | 216 |
217 queryingPreferredSize = true; | 217 queryingPreferredSize = true; |
218 // Query preferred width to emulate the same functionality in Chromium: | 218 // Query preferred width to emulate the same functionality in Chromium: |
219 // see RenderView::CheckPreferredSize (src/content/renderer/render_view.cc) | 219 // see RenderView::CheckPreferredSize (src/content/renderer/render_view.cc) |
220 // and TabContentsViewMac::RenderViewCreated (src/chrome/browser/tab_content
s/tab_contents_view_mac.mm) | 220 // and TabContentsViewMac::RenderViewCreated (src/chrome/browser/tab_content
s/tab_contents_view_mac.mm) |
221 webView()->mainFrame()->contentsPreferredWidth(); | 221 webView()->mainFrame()->contentsPreferredWidth(); |
222 webView()->mainFrame()->documentElementScrollHeight(); | 222 webView()->mainFrame()->documentElementScrollHeight(); |
(...skipping 770 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
993 } | 993 } |
994 | 994 |
995 #if ENABLE(MEDIA_STREAM) | 995 #if ENABLE(MEDIA_STREAM) |
996 webkit_support::TestMediaStreamClient* WebViewHost::testMediaStreamClient() | 996 webkit_support::TestMediaStreamClient* WebViewHost::testMediaStreamClient() |
997 { | 997 { |
998 if (!m_testMediaStreamClient.get()) | 998 if (!m_testMediaStreamClient.get()) |
999 m_testMediaStreamClient = adoptPtr(new webkit_support::TestMediaStreamCl
ient()); | 999 m_testMediaStreamClient = adoptPtr(new webkit_support::TestMediaStreamCl
ient()); |
1000 return m_testMediaStreamClient.get(); | 1000 return m_testMediaStreamClient.get(); |
1001 } | 1001 } |
1002 #endif | 1002 #endif |
OLD | NEW |