| 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 |
| 11 * notice, this list of conditions and the following disclaimer in the | 11 * notice, this list of conditions and the following disclaimer in the |
| 12 * documentation and/or other materials provided with the distribution. | 12 * documentation and/or other materials provided with the distribution. |
| 13 * | 13 * |
| 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY | 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY |
| 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR |
| 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 25 */ | 25 */ |
| 26 | 26 |
| 27 #include "config.h" | 27 #include "config.h" |
| 28 #include "core/frame/LocalDOMWindow.h" | 28 #include "core/frame/LocalDOMWindow.h" |
| 29 | 29 |
| 30 #include "bindings/core/v8/Dictionary.h" |
| 30 #include "bindings/core/v8/ExceptionMessages.h" | 31 #include "bindings/core/v8/ExceptionMessages.h" |
| 31 #include "bindings/core/v8/ExceptionState.h" | 32 #include "bindings/core/v8/ExceptionState.h" |
| 32 #include "bindings/core/v8/ExceptionStatePlaceholder.h" | 33 #include "bindings/core/v8/ExceptionStatePlaceholder.h" |
| 33 #include "bindings/core/v8/ScriptCallStackFactory.h" | 34 #include "bindings/core/v8/ScriptCallStackFactory.h" |
| 34 #include "bindings/core/v8/ScriptController.h" | 35 #include "bindings/core/v8/ScriptController.h" |
| 35 #include "bindings/core/v8/SerializedScriptValue.h" | 36 #include "bindings/core/v8/SerializedScriptValue.h" |
| 36 #include "bindings/core/v8/V8DOMActivityLogger.h" | 37 #include "bindings/core/v8/V8DOMActivityLogger.h" |
| 37 #include "core/css/CSSComputedStyleDeclaration.h" | 38 #include "core/css/CSSComputedStyleDeclaration.h" |
| 38 #include "core/css/CSSRuleList.h" | 39 #include "core/css/CSSRuleList.h" |
| 39 #include "core/css/DOMWindowCSS.h" | 40 #include "core/css/DOMWindowCSS.h" |
| (...skipping 1319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1359 { | 1360 { |
| 1360 if (!m_frame) | 1361 if (!m_frame) |
| 1361 return 0.0; | 1362 return 0.0; |
| 1362 | 1363 |
| 1363 return m_frame->devicePixelRatio(); | 1364 return m_frame->devicePixelRatio(); |
| 1364 } | 1365 } |
| 1365 | 1366 |
| 1366 static bool scrollBehaviorFromScrollOptions(const Dictionary& scrollOptions, Scr
ollBehavior& scrollBehavior, ExceptionState& exceptionState) | 1367 static bool scrollBehaviorFromScrollOptions(const Dictionary& scrollOptions, Scr
ollBehavior& scrollBehavior, ExceptionState& exceptionState) |
| 1367 { | 1368 { |
| 1368 String scrollBehaviorString; | 1369 String scrollBehaviorString; |
| 1369 if (!scrollOptions.get("behavior", scrollBehaviorString)) { | 1370 if (!DictionaryHelper::get(scrollOptions, "behavior", scrollBehaviorString))
{ |
| 1370 scrollBehavior = ScrollBehaviorAuto; | 1371 scrollBehavior = ScrollBehaviorAuto; |
| 1371 return true; | 1372 return true; |
| 1372 } | 1373 } |
| 1373 | 1374 |
| 1374 if (ScrollableArea::scrollBehaviorFromString(scrollBehaviorString, scrollBeh
avior)) | 1375 if (ScrollableArea::scrollBehaviorFromString(scrollBehaviorString, scrollBeh
avior)) |
| 1375 return true; | 1376 return true; |
| 1376 | 1377 |
| 1377 exceptionState.throwTypeError("The ScrollBehavior provided is invalid."); | 1378 exceptionState.throwTypeError("The ScrollBehavior provided is invalid."); |
| 1378 return false; | 1379 return false; |
| 1379 } | 1380 } |
| (...skipping 546 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1926 visitor->trace(m_localStorage); | 1927 visitor->trace(m_localStorage); |
| 1927 visitor->trace(m_applicationCache); | 1928 visitor->trace(m_applicationCache); |
| 1928 visitor->trace(m_performance); | 1929 visitor->trace(m_performance); |
| 1929 visitor->trace(m_css); | 1930 visitor->trace(m_css); |
| 1930 visitor->trace(m_eventQueue); | 1931 visitor->trace(m_eventQueue); |
| 1931 WillBeHeapSupplementable<LocalDOMWindow>::trace(visitor); | 1932 WillBeHeapSupplementable<LocalDOMWindow>::trace(visitor); |
| 1932 EventTargetWithInlineData::trace(visitor); | 1933 EventTargetWithInlineData::trace(visitor); |
| 1933 } | 1934 } |
| 1934 | 1935 |
| 1935 } // namespace WebCore | 1936 } // namespace WebCore |
| OLD | NEW |