diff options
| author | Patrick Scott <phanna@android.com> | 2011-01-18 13:36:15 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-18 13:36:15 -0800 |
| commit | bca79c07f17d228a8cb759491451476b79a0a212 (patch) | |
| tree | 66cf77a8091477711b71fa75a47fd7b8e93b51f6 /WebKit/android/jni/WebViewCore.cpp | |
| parent | 441bf4dacdc212d82753d4d52fed6a1bc3096239 (diff) | |
| parent | 211634993282bd9d5c18b26d70e7909aa4a3cfdc (diff) | |
| download | external_webkit-bca79c07f17d228a8cb759491451476b79a0a212.zip external_webkit-bca79c07f17d228a8cb759491451476b79a0a212.tar.gz external_webkit-bca79c07f17d228a8cb759491451476b79a0a212.tar.bz2 | |
Merge "Layout before creating the base layer." into honeycomb
Diffstat (limited to 'WebKit/android/jni/WebViewCore.cpp')
| -rw-r--r-- | WebKit/android/jni/WebViewCore.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp index 27ced0e..69585b2 100644 --- a/WebKit/android/jni/WebViewCore.cpp +++ b/WebKit/android/jni/WebViewCore.cpp @@ -863,6 +863,10 @@ BaseLayerAndroid* WebViewCore::createBaseLayer() BaseLayerAndroid* base = new BaseLayerAndroid(); base->setContent(m_content); + bool layoutSucceeded = layoutIfNeededRecursive(m_mainFrame); + // Layout only fails if called during a layout. + LOG_ASSERT(layoutSucceeded, "Can never be called recursively"); + #if USE(ACCELERATED_COMPOSITING) // We set the background color if (m_mainFrame && m_mainFrame->document() @@ -915,8 +919,8 @@ BaseLayerAndroid* WebViewCore::recordContent(SkRegion* region, SkIPoint* point) void WebViewCore::splitContent(PictureSet* content) { - bool layoutSuceeded = layoutIfNeededRecursive(m_mainFrame); - LOG_ASSERT(layoutSuceeded, "Can never be called recursively"); + bool layoutSucceeded = layoutIfNeededRecursive(m_mainFrame); + LOG_ASSERT(layoutSucceeded, "Can never be called recursively"); content->split(&m_content); rebuildPictureSet(&m_content); content->set(m_content); |