| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008, 2010 Apple 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 | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 1335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1346 { | 1346 { |
| 1347 if (!m_frame) | 1347 if (!m_frame) |
| 1348 return 0.0; | 1348 return 0.0; |
| 1349 | 1349 |
| 1350 return m_frame->devicePixelRatio(); | 1350 return m_frame->devicePixelRatio(); |
| 1351 } | 1351 } |
| 1352 | 1352 |
| 1353 static bool scrollBehaviorFromScrollOptions(const Dictionary& scrollOptions, Scr
ollBehavior& scrollBehavior, ExceptionState& exceptionState) | 1353 static bool scrollBehaviorFromScrollOptions(const Dictionary& scrollOptions, Scr
ollBehavior& scrollBehavior, ExceptionState& exceptionState) |
| 1354 { | 1354 { |
| 1355 String scrollBehaviorString; | 1355 String scrollBehaviorString; |
| 1356 if (!DictionaryHelper::get(scrollOptions, "behavior", scrollBehaviorString))
{ | 1356 if (!scrollOptions.get("behavior", scrollBehaviorString)) { |
| 1357 scrollBehavior = ScrollBehaviorAuto; | 1357 scrollBehavior = ScrollBehaviorAuto; |
| 1358 return true; | 1358 return true; |
| 1359 } | 1359 } |
| 1360 | 1360 |
| 1361 if (ScrollableArea::scrollBehaviorFromString(scrollBehaviorString, scrollBeh
avior)) | 1361 if (ScrollableArea::scrollBehaviorFromString(scrollBehaviorString, scrollBeh
avior)) |
| 1362 return true; | 1362 return true; |
| 1363 | 1363 |
| 1364 exceptionState.throwTypeError("The ScrollBehavior provided is invalid."); | 1364 exceptionState.throwTypeError("The ScrollBehavior provided is invalid."); |
| 1365 return false; | 1365 return false; |
| 1366 } | 1366 } |
| (...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1915 visitor->trace(m_applicationCache); | 1915 visitor->trace(m_applicationCache); |
| 1916 visitor->trace(m_performance); | 1916 visitor->trace(m_performance); |
| 1917 visitor->trace(m_css); | 1917 visitor->trace(m_css); |
| 1918 visitor->trace(m_eventQueue); | 1918 visitor->trace(m_eventQueue); |
| 1919 WillBeHeapSupplementable<LocalDOMWindow>::trace(visitor); | 1919 WillBeHeapSupplementable<LocalDOMWindow>::trace(visitor); |
| 1920 EventTargetWithInlineData::trace(visitor); | 1920 EventTargetWithInlineData::trace(visitor); |
| 1921 LifecycleContext<LocalDOMWindow>::trace(visitor); | 1921 LifecycleContext<LocalDOMWindow>::trace(visitor); |
| 1922 } | 1922 } |
| 1923 | 1923 |
| 1924 } // namespace blink | 1924 } // namespace blink |
| OLD | NEW |