| 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 330 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 341 | 341 |
| 342 ClearDocument(); | 342 ClearDocument(); |
| 343 | 343 |
| 344 document_ = CreateDocument(mime_type, init, force_xhtml); | 344 document_ = CreateDocument(mime_type, init, force_xhtml); |
| 345 event_queue_ = DOMWindowEventQueue::Create(document_.Get()); | 345 event_queue_ = DOMWindowEventQueue::Create(document_.Get()); |
| 346 document_->Initialize(); | 346 document_->Initialize(); |
| 347 | 347 |
| 348 if (!GetFrame()) | 348 if (!GetFrame()) |
| 349 return document_; | 349 return document_; |
| 350 | 350 |
| 351 GetFrame()->Script().UpdateDocument(); | 351 GetFrame()->GetScriptController().UpdateDocument(); |
| 352 document_->UpdateViewportDescription(); | 352 document_->UpdateViewportDescription(); |
| 353 | 353 |
| 354 if (GetFrame()->GetPage() && GetFrame()->View()) { | 354 if (GetFrame()->GetPage() && GetFrame()->View()) { |
| 355 if (ScrollingCoordinator* scrolling_coordinator = | 355 if (ScrollingCoordinator* scrolling_coordinator = |
| 356 GetFrame()->GetPage()->GetScrollingCoordinator()) { | 356 GetFrame()->GetPage()->GetScrollingCoordinator()) { |
| 357 scrolling_coordinator->ScrollableAreaScrollbarLayerDidChange( | 357 scrolling_coordinator->ScrollableAreaScrollbarLayerDidChange( |
| 358 GetFrame()->View(), kHorizontalScrollbar); | 358 GetFrame()->View(), kHorizontalScrollbar); |
| 359 scrolling_coordinator->ScrollableAreaScrollbarLayerDidChange( | 359 scrolling_coordinator->ScrollableAreaScrollbarLayerDidChange( |
| 360 GetFrame()->View(), kVerticalScrollbar); | 360 GetFrame()->View(), kVerticalScrollbar); |
| 361 scrolling_coordinator->ScrollableAreaScrollLayerDidChange( | 361 scrolling_coordinator->ScrollableAreaScrollLayerDidChange( |
| (...skipping 1305 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1667 DOMWindow::Trace(visitor); | 1667 DOMWindow::Trace(visitor); |
| 1668 Supplementable<LocalDOMWindow>::Trace(visitor); | 1668 Supplementable<LocalDOMWindow>::Trace(visitor); |
| 1669 } | 1669 } |
| 1670 | 1670 |
| 1671 DEFINE_TRACE_WRAPPERS(LocalDOMWindow) { | 1671 DEFINE_TRACE_WRAPPERS(LocalDOMWindow) { |
| 1672 visitor->TraceWrappers(custom_elements_); | 1672 visitor->TraceWrappers(custom_elements_); |
| 1673 DOMWindow::TraceWrappers(visitor); | 1673 DOMWindow::TraceWrappers(visitor); |
| 1674 } | 1674 } |
| 1675 | 1675 |
| 1676 } // namespace blink | 1676 } // namespace blink |
| OLD | NEW |