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

Side by Side Diff: Source/core/html/parser/HTMLParserOptions.cpp

Issue 33523002: Have Frame::script() return a reference (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase on master Created 7 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/html/HTMLPlugInElement.cpp ('k') | Source/core/inspector/InspectorAgent.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google, Inc. All Rights Reserved. 2 * Copyright (C) 2013 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 19 matching lines...) Expand all
30 #include "core/dom/Document.h" 30 #include "core/dom/Document.h"
31 #include "core/loader/FrameLoader.h" 31 #include "core/loader/FrameLoader.h"
32 #include "core/frame/Frame.h" 32 #include "core/frame/Frame.h"
33 #include "core/page/Settings.h" 33 #include "core/page/Settings.h"
34 34
35 namespace WebCore { 35 namespace WebCore {
36 36
37 HTMLParserOptions::HTMLParserOptions(Document* document) 37 HTMLParserOptions::HTMLParserOptions(Document* document)
38 { 38 {
39 Frame* frame = document ? document->frame() : 0; 39 Frame* frame = document ? document->frame() : 0;
40 scriptEnabled = frame && frame->script()->canExecuteScripts(NotAboutToExecut eScript); 40 scriptEnabled = frame && frame->script().canExecuteScripts(NotAboutToExecute Script);
41 pluginsEnabled = frame && frame->loader()->allowPlugins(NotAboutToInstantiat ePlugin); 41 pluginsEnabled = frame && frame->loader()->allowPlugins(NotAboutToInstantiat ePlugin);
42 42
43 Settings* settings = document ? document->settings() : 0; 43 Settings* settings = document ? document->settings() : 0;
44 // We force the main-thread parser for about:blank, javascript: and data: ur ls for compatibility 44 // We force the main-thread parser for about:blank, javascript: and data: ur ls for compatibility
45 // with historical synchronous loading/parsing behavior of those schemes. 45 // with historical synchronous loading/parsing behavior of those schemes.
46 useThreading = settings && settings->threadedHTMLParser() && !document->url( ).isBlankURL() 46 useThreading = settings && settings->threadedHTMLParser() && !document->url( ).isBlankURL()
47 && (settings->useThreadedHTMLParserForDataURLs() || !document->url().pro tocolIsData()); 47 && (settings->useThreadedHTMLParserForDataURLs() || !document->url().pro tocolIsData());
48 } 48 }
49 49
50 } 50 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLPlugInElement.cpp ('k') | Source/core/inspector/InspectorAgent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698