| 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 #include "core/frame/FrameConsole.h" | 63 #include "core/frame/FrameConsole.h" |
| 64 #include "core/frame/FrameHost.h" | 64 #include "core/frame/FrameHost.h" |
| 65 #include "core/frame/FrameView.h" | 65 #include "core/frame/FrameView.h" |
| 66 #include "core/frame/History.h" | 66 #include "core/frame/History.h" |
| 67 #include "core/frame/LocalFrame.h" | 67 #include "core/frame/LocalFrame.h" |
| 68 #include "core/frame/Location.h" | 68 #include "core/frame/Location.h" |
| 69 #include "core/frame/Navigator.h" | 69 #include "core/frame/Navigator.h" |
| 70 #include "core/frame/Screen.h" | 70 #include "core/frame/Screen.h" |
| 71 #include "core/frame/ScrollToOptions.h" | 71 #include "core/frame/ScrollToOptions.h" |
| 72 #include "core/frame/Settings.h" | 72 #include "core/frame/Settings.h" |
| 73 #include "core/frame/SuspendableTimer.h" |
| 73 #include "core/html/HTMLFrameOwnerElement.h" | 74 #include "core/html/HTMLFrameOwnerElement.h" |
| 74 #include "core/inspector/ConsoleMessage.h" | 75 #include "core/inspector/ConsoleMessage.h" |
| 75 #include "core/inspector/ConsoleMessageStorage.h" | 76 #include "core/inspector/ConsoleMessageStorage.h" |
| 76 #include "core/inspector/InspectorInstrumentation.h" | 77 #include "core/inspector/InspectorInstrumentation.h" |
| 77 #include "core/inspector/InspectorTraceEvents.h" | 78 #include "core/inspector/InspectorTraceEvents.h" |
| 78 #include "core/inspector/ScriptCallStack.h" | 79 #include "core/inspector/ScriptCallStack.h" |
| 79 #include "core/loader/DocumentLoader.h" | 80 #include "core/loader/DocumentLoader.h" |
| 80 #include "core/loader/FrameLoadRequest.h" | 81 #include "core/loader/FrameLoadRequest.h" |
| 81 #include "core/loader/FrameLoader.h" | 82 #include "core/loader/FrameLoader.h" |
| 82 #include "core/loader/FrameLoaderClient.h" | 83 #include "core/loader/FrameLoaderClient.h" |
| (...skipping 1832 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1915 return m_frameObserver->frame(); | 1916 return m_frameObserver->frame(); |
| 1916 } | 1917 } |
| 1917 | 1918 |
| 1918 v8::Handle<v8::Object> LocalDOMWindow::wrap(v8::Handle<v8::Object> creationConte
xt, v8::Isolate* isolate) | 1919 v8::Handle<v8::Object> LocalDOMWindow::wrap(v8::Handle<v8::Object> creationConte
xt, v8::Isolate* isolate) |
| 1919 { | 1920 { |
| 1920 ASSERT_NOT_REACHED(); // LocalDOMWindow has [Custom=ToV8]. | 1921 ASSERT_NOT_REACHED(); // LocalDOMWindow has [Custom=ToV8]. |
| 1921 return v8::Handle<v8::Object>(); | 1922 return v8::Handle<v8::Object>(); |
| 1922 } | 1923 } |
| 1923 | 1924 |
| 1924 } // namespace blink | 1925 } // namespace blink |
| OLD | NEW |