| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). | 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). |
| 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 are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 212 return; | 212 return; |
| 213 | 213 |
| 214 WebNavigationPolicy policy = static_cast<WebNavigationPolicy>(navigationPoli
cy); | 214 WebNavigationPolicy policy = static_cast<WebNavigationPolicy>(navigationPoli
cy); |
| 215 if (policy == WebNavigationPolicyIgnore) | 215 if (policy == WebNavigationPolicyIgnore) |
| 216 policy = getNavigationPolicy(); | 216 policy = getNavigationPolicy(); |
| 217 m_webView->client()->show(policy); | 217 m_webView->client()->show(policy); |
| 218 } | 218 } |
| 219 | 219 |
| 220 bool ChromeClientImpl::shouldReportDetailedMessageForSource(const String& url) | 220 bool ChromeClientImpl::shouldReportDetailedMessageForSource(const String& url) |
| 221 { | 221 { |
| 222 WebLocalFrameImpl* webframe = m_webView->localFrameRootTemporary(); | 222 WebLocalFrameImpl* webframe = m_webView->mainFrameImpl(); |
| 223 return webframe->client() && webframe->client()->shouldReportDetailedMessage
ForSource(url); | 223 return webframe->client() && webframe->client()->shouldReportDetailedMessage
ForSource(url); |
| 224 } | 224 } |
| 225 | 225 |
| 226 inline static String messageLevelAsString(MessageLevel level) | 226 inline static String messageLevelAsString(MessageLevel level) |
| 227 { | 227 { |
| 228 switch(level) { | 228 switch(level) { |
| 229 case DebugMessageLevel: | 229 case DebugMessageLevel: |
| 230 return "DEBUG"; | 230 return "DEBUG"; |
| 231 case LogMessageLevel: | 231 case LogMessageLevel: |
| 232 return "LOG"; | 232 return "LOG"; |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 365 webFrame->client()->forwardInputEvent(&webEvent); | 365 webFrame->client()->forwardInputEvent(&webEvent); |
| 366 } else if (event->isWheelEvent()) { | 366 } else if (event->isWheelEvent()) { |
| 367 WebMouseWheelEventBuilder webEvent(webFrame->frameView(), 0, *static_cas
t<WheelEvent*>(event)); | 367 WebMouseWheelEventBuilder webEvent(webFrame->frameView(), 0, *static_cas
t<WheelEvent*>(event)); |
| 368 if (webEvent.type == WebInputEvent::Undefined) | 368 if (webEvent.type == WebInputEvent::Undefined) |
| 369 return; | 369 return; |
| 370 webFrame->client()->forwardInputEvent(&webEvent); | 370 webFrame->client()->forwardInputEvent(&webEvent); |
| 371 } | 371 } |
| 372 } | 372 } |
| 373 | 373 |
| 374 } // namespace blink | 374 } // namespace blink |
| OLD | NEW |