| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 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 1731 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1742 client()->didFinishLoad(this); | 1742 client()->didFinishLoad(this); |
| 1743 } | 1743 } |
| 1744 | 1744 |
| 1745 void WebLocalFrameImpl::setCanHaveScrollbars(bool canHaveScrollbars) | 1745 void WebLocalFrameImpl::setCanHaveScrollbars(bool canHaveScrollbars) |
| 1746 { | 1746 { |
| 1747 frame()->view()->setCanHaveScrollbars(canHaveScrollbars); | 1747 frame()->view()->setCanHaveScrollbars(canHaveScrollbars); |
| 1748 } | 1748 } |
| 1749 | 1749 |
| 1750 void WebLocalFrameImpl::setInputEventsTransformForEmulation(const IntSize& offse
t, float contentScaleFactor) | 1750 void WebLocalFrameImpl::setInputEventsTransformForEmulation(const IntSize& offse
t, float contentScaleFactor) |
| 1751 { | 1751 { |
| 1752 if (m_inputEventsOffsetForEmulation == offset && m_inputEventsScaleFactorFor
Emulation == contentScaleFactor) |
| 1753 return; |
| 1752 m_inputEventsOffsetForEmulation = offset; | 1754 m_inputEventsOffsetForEmulation = offset; |
| 1753 m_inputEventsScaleFactorForEmulation = contentScaleFactor; | 1755 m_inputEventsScaleFactorForEmulation = contentScaleFactor; |
| 1754 if (frame()->view()) | 1756 if (frame()->view()) |
| 1755 frame()->view()->setInputEventsTransformForEmulation(m_inputEventsOffset
ForEmulation, m_inputEventsScaleFactorForEmulation); | 1757 frame()->view()->setInputEventsTransformForEmulation(m_inputEventsOffset
ForEmulation, m_inputEventsScaleFactorForEmulation); |
| 1756 } | 1758 } |
| 1757 | 1759 |
| 1758 void WebLocalFrameImpl::loadJavaScriptURL(const KURL& url) | 1760 void WebLocalFrameImpl::loadJavaScriptURL(const KURL& url) |
| 1759 { | 1761 { |
| 1760 // This is copied from ScriptController::executeScriptIfJavaScriptURL. | 1762 // This is copied from ScriptController::executeScriptIfJavaScriptURL. |
| 1761 // Unfortunately, we cannot just use that method since it is private, and | 1763 // Unfortunately, we cannot just use that method since it is private, and |
| (...skipping 478 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2240 feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol; | 2242 feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol; |
| 2241 } else if (metric == "wasAlternateProtocolAvailable") { | 2243 } else if (metric == "wasAlternateProtocolAvailable") { |
| 2242 feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable; | 2244 feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable; |
| 2243 } else if (metric == "connectionInfo") { | 2245 } else if (metric == "connectionInfo") { |
| 2244 feature = UseCounter::ChromeLoadTimesConnectionInfo; | 2246 feature = UseCounter::ChromeLoadTimesConnectionInfo; |
| 2245 } | 2247 } |
| 2246 UseCounter::count(frame(), feature); | 2248 UseCounter::count(frame(), feature); |
| 2247 } | 2249 } |
| 2248 | 2250 |
| 2249 } // namespace blink | 2251 } // namespace blink |
| OLD | NEW |