Changeset 134232 in webkit
- Timestamp:
- Nov 12, 2012 7:25:46 AM (11 years ago)
- Location:
- trunk/Source/WebKit/qt
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/qt/Api/qwebelement.cpp
r134231 r134232 826 826 827 827 Document* doc = m_element->document(); 828 if (RefPtr<CSSRuleList> rules = doc->styleResolver()->styleRulesForElement(m_element, /*authorOnly*/ true)) {828 if (RefPtr<CSSRuleList> rules = doc->styleResolver()->styleRulesForElement(m_element, StyleResolver::AuthorCSSRules | StyleResolver::CrossOriginCSSRules)) { 829 829 for (int i = rules->length(); i > 0; --i) { 830 830 CSSStyleRule* rule = static_cast<CSSStyleRule*>(rules->item(i - 1)); -
trunk/Source/WebKit/qt/ChangeLog
r134231 r134232 1 2012-11-09 Jocelyn Turcotte <jocelyn.turcotte@digia.com> 2 3 [Qt] tst_QWebElement::style() fails because QWebElement::CascadedStyle doesn't work as expected 4 https://bugs.webkit.org/show_bug.cgi?id=65244 5 6 Reviewed by Kenneth Rohde Christiansen. 7 8 StyleResolver::styleRulesForElement now takes flags as parameter instead of a bool to specify 9 that we want to exclude UI and user style sheets. 10 11 * Api/qwebelement.cpp: 12 (QWebElement::styleProperty): 13 * tests/qwebelement/tst_qwebelement.cpp: 14 (tst_QWebElement::style): 15 1 16 2012-11-09 Jocelyn Turcotte <jocelyn.turcotte@digia.com> 2 17 -
trunk/Source/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp
r125603 r134232 476 476 477 477 QCOMPARE(p.styleProperty("color", QWebElement::InlineStyle), QLatin1String("red")); 478 QEXPECT_FAIL("", "https://bugs.webkit.org/show_bug.cgi?id=65244", Continue);479 478 QCOMPARE(p.styleProperty("color", QWebElement::CascadedStyle), QLatin1String("yellow")); 480 479 QCOMPARE(p.styleProperty("cursor", QWebElement::InlineStyle), QLatin1String("auto")); … … 542 541 543 542 QCOMPARE(p.styleProperty("color", QWebElement::InlineStyle), QLatin1String("")); 544 QEXPECT_FAIL("", "https://bugs.webkit.org/show_bug.cgi?id=65244", Continue);545 543 QCOMPARE(p.styleProperty("color", QWebElement::CascadedStyle), QLatin1String("red")); 546 544 … … 563 561 p = m_mainFrame->documentElement().findAll("p").at(0); 564 562 QCOMPARE(p.styleProperty("color", QWebElement::InlineStyle), QLatin1String("blue")); 565 QEXPECT_FAIL("", "https://bugs.webkit.org/show_bug.cgi?id=65244", Continue);566 563 QCOMPARE(p.styleProperty("color", QWebElement::CascadedStyle), QLatin1String("black")); 567 564 … … 581 578 582 579 p = m_mainFrame->documentElement().findAll("p").at(0); 583 QEXPECT_FAIL("", "https://bugs.webkit.org/show_bug.cgi?id=65244", Continue);584 580 QCOMPARE(p.styleProperty("color", QWebElement::CascadedStyle), QLatin1String("black")); 585 581
Note: See TracChangeset
for help on using the changeset viewer.