Title: [122946] trunk/Source/WebCore
- Revision
- 122946
- Author
- [email protected]
- Date
- 2012-07-18 04:30:37 -0700 (Wed, 18 Jul 2012)
Log Message
[EFL][WK2] Too early assertion failure if default theme is not available
https://bugs.webkit.org/show_bug.cgi?id=91608
Patch by Dominik Röttsches <[email protected]> on 2012-07-18
Reviewed by Kenneth Rohde Christiansen.
After bug 90107 we're setting a default theme path, which leads to a
themeChanged() call initializing edje in createEdje() - if that theme
path is not available we run into a premature assertion failure.
We need to give the embedder a chance to override the default theme path
before failing - so only the usages of m_edje should be guarded with assertions.
No new tests, no change in rendering behavior.
* platform/efl/RenderThemeEfl.cpp:
(WebCore::RenderThemeEfl::themePartCacheEntryReset): Adding an assertion to ensure m_edje is present - so that all usages of m_edje are now guarded.
(WebCore::RenderThemeEfl::createEdje): Not hitting assertion if theme path doesn't contain the theme object file, allowing the embedder to override with a new path.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (122945 => 122946)
--- trunk/Source/WebCore/ChangeLog 2012-07-18 11:30:31 UTC (rev 122945)
+++ trunk/Source/WebCore/ChangeLog 2012-07-18 11:30:37 UTC (rev 122946)
@@ -1,3 +1,22 @@
+2012-07-18 Dominik Röttsches <[email protected]>
+
+ [EFL][WK2] Too early assertion failure if default theme is not available
+ https://bugs.webkit.org/show_bug.cgi?id=91608
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ After bug 90107 we're setting a default theme path, which leads to a
+ themeChanged() call initializing edje in createEdje() - if that theme
+ path is not available we run into a premature assertion failure.
+ We need to give the embedder a chance to override the default theme path
+ before failing - so only the usages of m_edje should be guarded with assertions.
+
+ No new tests, no change in rendering behavior.
+
+ * platform/efl/RenderThemeEfl.cpp:
+ (WebCore::RenderThemeEfl::themePartCacheEntryReset): Adding an assertion to ensure m_edje is present - so that all usages of m_edje are now guarded.
+ (WebCore::RenderThemeEfl::createEdje): Not hitting assertion if theme path doesn't contain the theme object file, allowing the embedder to override with a new path.
+
2012-07-18 Vsevolod Vlasov <[email protected]>
IndexedDB: IDBLevelDBBackingStore compilation fails because of unused variable.
Modified: trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp (122945 => 122946)
--- trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp 2012-07-18 11:30:31 UTC (rev 122945)
+++ trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp 2012-07-18 11:30:37 UTC (rev 122946)
@@ -100,6 +100,7 @@
const char *file, *group;
ASSERT(entry);
+ ASSERT(m_edje);
edje_object_file_get(m_edje, &file, 0);
group = edjeGroupFromFormType(type);
@@ -464,7 +465,6 @@
#undef CONNECT
}
}
- ASSERT(m_edje);
}
void RenderThemeEfl::applyEdjeColors()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
