Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(54)

Side by Side Diff: Source/core/inspector/InspectorPageAgent.cpp

Issue 438843004: Move the user agent styles sheets to blink_resources.grd (Part 3) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Removed header inclusion. Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 17 matching lines...) Expand all
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "core/inspector/InspectorPageAgent.h" 32 #include "core/inspector/InspectorPageAgent.h"
33 33
34 #include "bindings/core/v8/DOMWrapperWorld.h" 34 #include "bindings/core/v8/DOMWrapperWorld.h"
35 #include "bindings/core/v8/ScriptController.h" 35 #include "bindings/core/v8/ScriptController.h"
36 #include "bindings/core/v8/ScriptRegexp.h" 36 #include "bindings/core/v8/ScriptRegexp.h"
37 #include "core/HTMLNames.h" 37 #include "core/HTMLNames.h"
38 #include "core/UserAgentStyleSheets.h"
39 #include "core/css/StyleSheetContents.h" 38 #include "core/css/StyleSheetContents.h"
40 #include "core/css/resolver/StyleResolver.h" 39 #include "core/css/resolver/StyleResolver.h"
41 #include "core/css/resolver/ViewportStyleResolver.h" 40 #include "core/css/resolver/ViewportStyleResolver.h"
42 #include "core/dom/DOMImplementation.h" 41 #include "core/dom/DOMImplementation.h"
43 #include "core/dom/Document.h" 42 #include "core/dom/Document.h"
44 #include "core/fetch/CSSStyleSheetResource.h" 43 #include "core/fetch/CSSStyleSheetResource.h"
45 #include "core/fetch/FontResource.h" 44 #include "core/fetch/FontResource.h"
46 #include "core/fetch/ImageResource.h" 45 #include "core/fetch/ImageResource.h"
47 #include "core/fetch/MemoryCache.h" 46 #include "core/fetch/MemoryCache.h"
48 #include "core/fetch/Resource.h" 47 #include "core/fetch/Resource.h"
(...skipping 18 matching lines...) Expand all
67 #include "core/inspector/InspectorResourceContentLoader.h" 66 #include "core/inspector/InspectorResourceContentLoader.h"
68 #include "core/inspector/InspectorState.h" 67 #include "core/inspector/InspectorState.h"
69 #include "core/inspector/InstrumentingAgents.h" 68 #include "core/inspector/InstrumentingAgents.h"
70 #include "core/loader/CookieJar.h" 69 #include "core/loader/CookieJar.h"
71 #include "core/loader/DocumentLoader.h" 70 #include "core/loader/DocumentLoader.h"
72 #include "core/loader/FrameLoadRequest.h" 71 #include "core/loader/FrameLoadRequest.h"
73 #include "core/loader/FrameLoader.h" 72 #include "core/loader/FrameLoader.h"
74 #include "core/page/Page.h" 73 #include "core/page/Page.h"
75 #include "platform/Cookie.h" 74 #include "platform/Cookie.h"
76 #include "platform/JSONValues.h" 75 #include "platform/JSONValues.h"
76 #include "platform/PlatformResourceLoader.h"
77 #include "platform/UserGestureIndicator.h" 77 #include "platform/UserGestureIndicator.h"
78 #include "platform/weborigin/SecurityOrigin.h" 78 #include "platform/weborigin/SecurityOrigin.h"
79 #include "wtf/CurrentTime.h" 79 #include "wtf/CurrentTime.h"
80 #include "wtf/ListHashSet.h" 80 #include "wtf/ListHashSet.h"
81 #include "wtf/Vector.h" 81 #include "wtf/Vector.h"
82 #include "wtf/text/Base64.h" 82 #include "wtf/text/Base64.h"
83 #include "wtf/text/TextEncoding.h" 83 #include "wtf/text/TextEncoding.h"
84 84
85 namespace blink { 85 namespace blink {
86 86
(...skipping 1303 matching lines...) Expand 10 before | Expand all | Expand 10 after
1390 document->updateLayout(); 1390 document->updateLayout();
1391 } 1391 }
1392 } 1392 }
1393 1393
1394 bool InspectorPageAgent::applyViewportStyleOverride(StyleResolver* resolver) 1394 bool InspectorPageAgent::applyViewportStyleOverride(StyleResolver* resolver)
1395 { 1395 {
1396 if (!m_deviceMetricsOverridden || !m_emulateMobileEnabled) 1396 if (!m_deviceMetricsOverridden || !m_emulateMobileEnabled)
1397 return false; 1397 return false;
1398 1398
1399 RefPtrWillBeRawPtr<StyleSheetContents> styleSheet = StyleSheetContents::crea te(CSSParserContext(UASheetMode, 0)); 1399 RefPtrWillBeRawPtr<StyleSheetContents> styleSheet = StyleSheetContents::crea te(CSSParserContext(UASheetMode, 0));
1400 styleSheet->parseString(String(viewportAndroidCss, sizeof(viewportAndroidCss ))); 1400 styleSheet->parseString(loadResourceAsASCIIString("viewportAndroid.css"));
1401 OwnPtrWillBeRawPtr<RuleSet> ruleSet = RuleSet::create(); 1401 OwnPtrWillBeRawPtr<RuleSet> ruleSet = RuleSet::create();
1402 ruleSet->addRulesFromSheet(styleSheet.get(), MediaQueryEvaluator("screen")); 1402 ruleSet->addRulesFromSheet(styleSheet.get(), MediaQueryEvaluator("screen"));
1403 resolver->viewportStyleResolver()->collectViewportRules(ruleSet.get(), Viewp ortStyleResolver::UserAgentOrigin); 1403 resolver->viewportStyleResolver()->collectViewportRules(ruleSet.get(), Viewp ortStyleResolver::UserAgentOrigin);
1404 return true; 1404 return true;
1405 } 1405 }
1406 1406
1407 void InspectorPageAgent::applyEmulatedMedia(String* media) 1407 void InspectorPageAgent::applyEmulatedMedia(String* media)
1408 { 1408 {
1409 String emulatedMedia = m_state->getString(PageAgentState::pageAgentEmulatedM edia); 1409 String emulatedMedia = m_state->getString(PageAgentState::pageAgentEmulatedM edia);
1410 if (!emulatedMedia.isEmpty()) 1410 if (!emulatedMedia.isEmpty())
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
1447 1447
1448 void InspectorPageAgent::trace(Visitor* visitor) 1448 void InspectorPageAgent::trace(Visitor* visitor)
1449 { 1449 {
1450 visitor->trace(m_page); 1450 visitor->trace(m_page);
1451 visitor->trace(m_injectedScriptManager); 1451 visitor->trace(m_injectedScriptManager);
1452 InspectorBaseAgent::trace(visitor); 1452 InspectorBaseAgent::trace(visitor);
1453 } 1453 }
1454 1454
1455 } // namespace blink 1455 } // namespace blink
1456 1456
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698