Changeset 124186 in webkit
- Timestamp:
- Jul 31, 2012 3:08:45 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r124176 r124186 1 2012-07-31 Raul Hudea <rhudea@adobe.com> 2 3 Inspector crashes when trying to inspect a page with CSS region styling 4 https://bugs.webkit.org/show_bug.cgi?id=91503 5 6 Reviewed by Alexander Pavlov. 7 8 Test to make sure inspector is not crashing when having to parse @-webkit-region rules 9 10 * inspector/styles/region-style-crash-expected.txt: Added. 11 * inspector/styles/region-style-crash.html: Added. 12 * platform/chromium/TestExpectations: 13 1 14 2012-07-30 Keishi Hattori <keishi@webkit.org> 2 15 -
trunk/LayoutTests/platform/chromium/TestExpectations
r124176 r124186 2625 2625 BUGWK49142 : fast/regions/style-scoped-in-flow.html = PASS IMAGE IMAGE+TEXT TEXT MISSING 2626 2626 2627 BUGWK92131 SKIP : inspector/styles/region-style-crash.html = PASS 2628 2627 2629 BUGCR85755 : fast/js/exception-properties.html = TEXT 2628 2630 -
trunk/Source/WebCore/ChangeLog
r124185 r124186 1 2012-07-31 Raul Hudea <rhudea@adobe.com> 2 3 Inspector crashes when trying to inspect a page with CSS region styling 4 https://bugs.webkit.org/show_bug.cgi?id=91503 5 6 Reviewed by Alexander Pavlov. 7 8 Fix by making sure a CSSRuleSourceData is always created when parsing @-webkit-region rules. 9 10 Test: inspector/styles/region-style-crash.html 11 12 * css/CSSGrammar.y: Made ruleset called explicitly markRuleBodyStart instead of depending on updateLastSelectorLineAndPosition to call it. 13 * css/CSSParser.cpp: 14 (WebCore::CSSParser::updateLastSelectorLineAndPosition): markRuleBodyStart should be called via at_rule_body_start. 15 * css/CSSPropertySourceData.h: 16 1 17 2012-07-31 Sheriff Bot <webkit.review.bot@gmail.com> 2 18 -
trunk/Source/WebCore/css/CSSGrammar.y
r124099 r124186 870 870 ; 871 871 872 before_region_rule: 873 /* empty */ { 874 static_cast<CSSParser*>(parser)->markRuleHeaderStart(CSSRuleSourceData::REGION_RULE); 875 } 876 ; 877 872 878 region: 873 WEBKIT_REGION_RULE_SYM WHITESPACE region_selector '{' maybe_space block_rule_list save_block { 874 if ($3) 875 $$ = static_cast<CSSParser*>(parser)->createRegionRule($3, $6); 876 else 877 $$ = 0; 879 before_region_rule WEBKIT_REGION_RULE_SYM WHITESPACE region_selector at_rule_header_end '{' at_rule_body_start maybe_space block_rule_list save_block { 880 if ($4) 881 $$ = static_cast<CSSParser*>(parser)->createRegionRule($4, $9); 882 else { 883 $$ = 0; 884 static_cast<CSSParser*>(parser)->popRuleData(); 885 } 878 886 } 879 887 ; … … 914 922 915 923 ruleset: 916 before_selector_list selector_list at_rule_header_end '{' maybe_space_before_declaration declaration_list closing_brace {924 before_selector_list selector_list at_rule_header_end '{' at_rule_body_start maybe_space_before_declaration declaration_list closing_brace { 917 925 CSSParser* p = static_cast<CSSParser*>(parser); 918 926 $$ = p->createStyleRule($2); -
trunk/Source/WebCore/css/CSSParser.cpp
r124099 r124186 9748 9748 { 9749 9749 m_lastSelectorLineNumber = m_lineNumber; 9750 markRuleBodyStart();9751 9750 } 9752 9751 -
trunk/Source/WebCore/css/CSSPropertySourceData.h
r121551 r124186 94 94 FONT_FACE_RULE, 95 95 PAGE_RULE, 96 KEYFRAMES_RULE 96 KEYFRAMES_RULE, 97 REGION_RULE 97 98 }; 98 99
Note: See TracChangeset
for help on using the changeset viewer.