diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-01 16:53:12 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-01 16:53:12 +0000 |
| commit | f1fda807df0c92c3dc19287bf14f435d0ca4ca91 (patch) | |
| tree | 41592d1c6a09b5a603eb098f51b6ce6548539fb2 /content | |
| parent | 06134b8c8ce6562dfdf6deacfcb650a383c8e646 (diff) | |
| download | chromium_src-f1fda807df0c92c3dc19287bf14f435d0ca4ca91.zip chromium_src-f1fda807df0c92c3dc19287bf14f435d0ca4ca91.tar.gz chromium_src-f1fda807df0c92c3dc19287bf14f435d0ca4ca91.tar.bz2 | |
Fix crash in webkit_unit_tests on Windows.
Sometimes the theme engine is null (commonly,
RenderTableCellDeathTest.CanSetColumn crashes in
WebCore::ScrollbarThemeAuraOrGtk::scrollbarThickness)
because we're skipping over the implementation of themeEngine()
in WebKitPlatformSupportChildImpl.
BUG=None
R=scottmg@chromium.org, sky@chromium.org
Review URL: https://codereview.chromium.org/25040004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226250 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/test/test_webkit_platform_support.cc | 2 | ||||
| -rw-r--r-- | content/test/test_webkit_platform_support.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/content/test/test_webkit_platform_support.cc b/content/test/test_webkit_platform_support.cc index 5bc6b71..f8a6e0e 100644 --- a/content/test/test_webkit_platform_support.cc +++ b/content/test/test_webkit_platform_support.cc @@ -204,7 +204,7 @@ WebKit::WebString TestWebKitPlatformSupport::defaultLocale() { #if defined(OS_WIN) || defined(OS_MACOSX) void TestWebKitPlatformSupport::SetThemeEngine(WebKit::WebThemeEngine* engine) { active_theme_engine_ = engine ? - engine : WebKitPlatformSupportImpl::themeEngine(); + engine : WebKitPlatformSupportChildImpl::themeEngine(); } WebKit::WebThemeEngine* TestWebKitPlatformSupport::themeEngine() { diff --git a/content/test/test_webkit_platform_support.h b/content/test/test_webkit_platform_support.h index 055dd3f..01dce33 100644 --- a/content/test/test_webkit_platform_support.h +++ b/content/test/test_webkit_platform_support.h @@ -47,7 +47,7 @@ class TestWebKitPlatformSupport : #if defined(OS_WIN) || defined(OS_MACOSX) void SetThemeEngine(WebKit::WebThemeEngine* engine); - virtual WebKit::WebThemeEngine *themeEngine(); + virtual WebKit::WebThemeEngine* themeEngine(); #endif virtual WebKit::WebCompositorSupport* compositorSupport(); |