OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2011, 2012 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 #include "core/input/EventHandler.h" | 68 #include "core/input/EventHandler.h" |
69 #include "core/input/TouchActionUtil.h" | 69 #include "core/input/TouchActionUtil.h" |
70 #include "core/layout/LayoutPart.h" | 70 #include "core/layout/LayoutPart.h" |
71 #include "core/layout/LayoutView.h" | 71 #include "core/layout/LayoutView.h" |
72 #include "core/layout/TextAutosizer.h" | 72 #include "core/layout/TextAutosizer.h" |
73 #include "core/layout/compositing/DeprecatedPaintLayerCompositor.h" | 73 #include "core/layout/compositing/DeprecatedPaintLayerCompositor.h" |
74 #include "core/loader/DocumentLoader.h" | 74 #include "core/loader/DocumentLoader.h" |
75 #include "core/loader/FrameLoadRequest.h" | 75 #include "core/loader/FrameLoadRequest.h" |
76 #include "core/loader/FrameLoader.h" | 76 #include "core/loader/FrameLoader.h" |
77 #include "core/loader/FrameLoaderClient.h" | 77 #include "core/loader/FrameLoaderClient.h" |
| 78 #include "core/loader/FrameLoaderStateMachine.h" |
78 #include "core/page/ContextMenuController.h" | 79 #include "core/page/ContextMenuController.h" |
79 #include "core/page/ContextMenuProvider.h" | 80 #include "core/page/ContextMenuProvider.h" |
80 #include "core/page/DragController.h" | 81 #include "core/page/DragController.h" |
81 #include "core/page/DragData.h" | 82 #include "core/page/DragData.h" |
82 #include "core/page/DragSession.h" | 83 #include "core/page/DragSession.h" |
83 #include "core/page/FocusController.h" | 84 #include "core/page/FocusController.h" |
84 #include "core/page/FrameTree.h" | 85 #include "core/page/FrameTree.h" |
85 #include "core/page/Page.h" | 86 #include "core/page/Page.h" |
86 #include "core/page/PagePopupClient.h" | 87 #include "core/page/PagePopupClient.h" |
87 #include "core/page/PointerLockController.h" | 88 #include "core/page/PointerLockController.h" |
(...skipping 3815 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3903 return; | 3904 return; |
3904 | 3905 |
3905 // If we have no more stylesheets to load and we're past the body tag, | 3906 // If we have no more stylesheets to load and we're past the body tag, |
3906 // we should have something to paint and should start as soon as possible. | 3907 // we should have something to paint and should start as soon as possible. |
3907 if (m_page->deprecatedLocalMainFrame()->document()->body()) | 3908 if (m_page->deprecatedLocalMainFrame()->document()->body()) |
3908 resumeTreeViewCommits(); | 3909 resumeTreeViewCommits(); |
3909 } | 3910 } |
3910 | 3911 |
3911 void WebViewImpl::resumeTreeViewCommits() | 3912 void WebViewImpl::resumeTreeViewCommits() |
3912 { | 3913 { |
| 3914 if (!mainFrameImpl()->frame()->loader().stateMachine()->committedFirstRealDo
cumentLoad()) |
| 3915 return; |
3913 if (m_layerTreeView) | 3916 if (m_layerTreeView) |
3914 m_layerTreeView->setDeferCommits(false); | 3917 m_layerTreeView->setDeferCommits(false); |
3915 } | 3918 } |
3916 | 3919 |
3917 void WebViewImpl::postLayoutResize(WebLocalFrameImpl* webframe) | 3920 void WebViewImpl::postLayoutResize(WebLocalFrameImpl* webframe) |
3918 { | 3921 { |
3919 FrameView* view = webframe->frame()->view(); | 3922 FrameView* view = webframe->frame()->view(); |
3920 if (webframe == mainFrame()) | 3923 if (webframe == mainFrame()) |
3921 view->resize(mainFrameSize()); | 3924 view->resize(mainFrameSize()); |
3922 else | 3925 else |
(...skipping 508 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4431 if (m_pageColorOverlay) | 4434 if (m_pageColorOverlay) |
4432 m_pageColorOverlay->update(); | 4435 m_pageColorOverlay->update(); |
4433 if (m_inspectorOverlay) { | 4436 if (m_inspectorOverlay) { |
4434 PageOverlay* inspectorPageOverlay = m_inspectorOverlay->pageOverlay(); | 4437 PageOverlay* inspectorPageOverlay = m_inspectorOverlay->pageOverlay(); |
4435 if (inspectorPageOverlay) | 4438 if (inspectorPageOverlay) |
4436 inspectorPageOverlay->update(); | 4439 inspectorPageOverlay->update(); |
4437 } | 4440 } |
4438 } | 4441 } |
4439 | 4442 |
4440 } // namespace blink | 4443 } // namespace blink |
OLD | NEW |