diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-17 14:49:09 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-23 18:54:17 +0100 |
| commit | 3fbf8910ec513d0a9c19e991c840c5a8242d73d0 (patch) | |
| tree | 13e485f54951ea5ff0ed5b5e2ca767dc64ea7dc8 | |
| parent | 0cae2b1e7dd111cf7081b49cf7411c0066b33cc6 (diff) | |
| download | external_webkit-3fbf8910ec513d0a9c19e991c840c5a8242d73d0.zip external_webkit-3fbf8910ec513d0a9c19e991c840c5a8242d73d0.tar.gz external_webkit-3fbf8910ec513d0a9c19e991c840c5a8242d73d0.tar.bz2 | |
Merge WebKit at r76408: Rename syncCompositingStateRecursive()
FrameView::syncCompositingStateRecursive() was rename
to FrameVuew::syncCompositingStateIncludingSubframes()
See http://trac.webkit.org/changeset/76196
Change-Id: I615cc9cccee03ac5259079aea47494746b586b25
| -rw-r--r-- | Source/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp b/Source/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp index 6f872b8..24eb945 100644 --- a/Source/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp +++ b/Source/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp @@ -65,7 +65,7 @@ WebCore::GraphicsLayer* ChromeClientAndroid::layersSync() { if (m_rootGraphicsLayer && m_needsLayerSync && m_webFrame) { if (FrameView* frameView = m_webFrame->page()->mainFrame()->view()) - frameView->syncCompositingStateRecursive(); + frameView->syncCompositingStateIncludingSubframes(); } m_needsLayerSync = false; return m_rootGraphicsLayer; |