Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 27 matching lines...) Expand all Loading... | |
| 38 { | 38 { |
| 39 LocalFrame* frame = document ? document->frame() : 0; | 39 LocalFrame* frame = document ? document->frame() : 0; |
| 40 scriptEnabled = frame && frame->script().canExecuteScripts(NotAboutToExecute Script); | 40 scriptEnabled = frame && frame->script().canExecuteScripts(NotAboutToExecute Script); |
| 41 pluginsEnabled = frame && frame->loader().allowPlugins(NotAboutToInstantiate Plugin); | 41 pluginsEnabled = frame && frame->loader().allowPlugins(NotAboutToInstantiate Plugin); |
| 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 and javascript: for compa tibility | 44 // We force the main-thread parser for about:blank and javascript: for compa tibility |
| 45 // with historical synchronous loading/parsing behavior. | 45 // with historical synchronous loading/parsing behavior. |
| 46 // FIXME: Gecko does not load javascript: urls synchronously, why do we? | 46 // FIXME: Gecko does not load javascript: urls synchronously, why do we? |
| 47 // See LayoutTests/loader/iframe-sync-loads.html | 47 // See LayoutTests/loader/iframe-sync-loads.html |
| 48 // FIXME: Use isAboutBlankURL() instead of protocolIsAbout() to not include about:srcdoc. | 48 useThreading = settings && settings->threadedHTMLParser() && !document->url( ).isAboutBlankURL(); |
|
abarth-chromium
2014/04/23 21:49:20
We should drop this setting too.
| |
| 49 useThreading = settings && settings->threadedHTMLParser() && !document->url( ).protocolIsAbout(); | |
| 50 } | 49 } |
| 51 | 50 |
| 52 } | 51 } |
| OLD | NEW |