Changeset 72321 in webkit
- Timestamp:
- Nov 18, 2010 12:01:10 PM (13 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r72316 r72321 1 2010-11-18 Rob Buis <rwlbuis@gmail.com> 2 3 Reviewed by Simon Fraser. 4 5 Only inject fullscreen.css when in fullscreen 6 https://bugs.webkit.org/show_bug.cgi?id=49510 7 8 Refactor to only add fullscreen sheet rules when document is in fullscreen mode. 9 10 * css/CSSStyleSelector.cpp: 11 (WebCore::CSSStyleSelector::CSSStyleSelector): 12 (WebCore::loadFullDefaultStyle): 13 (WebCore::loadFullScreenRulesIfNeeded): 14 (WebCore::CSSStyleSelector::styleForElement): 15 1 16 2010-11-18 Steve Falkenburg <sfalken@apple.com> 2 17 -
trunk/WebCore/css/CSSStyleSelector.cpp
r72141 r72321 390 390 391 391 static void loadFullDefaultStyle(); 392 #if ENABLE(FULLSCREEN_API) 393 static void loadFullScreenRulesIfNeeded(Document*); 394 #endif 392 395 static void loadSimpleDefaultStyle(); 393 396 // FIXME: It would be nice to use some mechanism that guarantees this is in sync with the real UA stylesheet. … … 428 431 if (!root || elementCanUseSimpleDefaultStyle(root)) 429 432 loadSimpleDefaultStyle(); 430 else 433 else { 431 434 loadFullDefaultStyle(); 435 #if ENABLE(FULLSCREEN_API) 436 loadFullScreenRulesIfNeeded(document); 437 #endif 438 } 432 439 } 433 440 … … 535 542 CSSStyleSheet* quirksSheet = parseUASheet(quirksRules); 536 543 defaultQuirksStyle->addRulesFromSheet(quirksSheet, screenEval()); 537 544 } 545 538 546 #if ENABLE(FULLSCREEN_API) 547 static void loadFullScreenRulesIfNeeded(Document* document) 548 { 549 if (!document->webkitFullScreen()) 550 return; 539 551 // Full-screen rules. 540 552 String fullscreenRules = String(fullscreenUserAgentStyleSheet, sizeof(fullscreenUserAgentStyleSheet)) + RenderTheme::defaultTheme()->extraDefaultStyleSheet(); … … 542 554 defaultStyle->addRulesFromSheet(fullscreenSheet, screenEval()); 543 555 defaultQuirksStyle->addRulesFromSheet(fullscreenSheet, screenEval()); 556 } 544 557 #endif 545 }546 558 547 559 static void loadSimpleDefaultStyle() … … 1142 1154 } 1143 1155 1144 if (simpleDefaultStyleSheet && !elementCanUseSimpleDefaultStyle(e)) 1156 if (simpleDefaultStyleSheet && !elementCanUseSimpleDefaultStyle(e)) { 1145 1157 loadFullDefaultStyle(); 1158 #if ENABLE(FULLSCREEN_API) 1159 loadFullScreenRulesIfNeeded(e->document()); 1160 #endif 1161 } 1146 1162 1147 1163 #if ENABLE(SVG)
Note: See TracChangeset
for help on using the changeset viewer.