diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2020-01-16 07:32:48 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2020-01-16 07:32:48 -0500 |
| commit | ed60101550022a2650edc41cd3a63b35fea836c5 (patch) | |
| tree | e6967e47f27945599ec09c4401f7932751315beb /parser/html/nsHtml5MetaScanner.cpp | |
| parent | fa816e1ec69d865114b7d061905574038fbd425b (diff) | |
| parent | 927c386dd8c9526d8695d0202a08735984dc7b31 (diff) | |
| download | UXP-ed60101550022a2650edc41cd3a63b35fea836c5.tar UXP-ed60101550022a2650edc41cd3a63b35fea836c5.tar.gz UXP-ed60101550022a2650edc41cd3a63b35fea836c5.tar.lz UXP-ed60101550022a2650edc41cd3a63b35fea836c5.tar.xz UXP-ed60101550022a2650edc41cd3a63b35fea836c5.zip | |
Merge branch 'html5-parser-work'
Diffstat (limited to 'parser/html/nsHtml5MetaScanner.cpp')
| -rw-r--r-- | parser/html/nsHtml5MetaScanner.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/parser/html/nsHtml5MetaScanner.cpp b/parser/html/nsHtml5MetaScanner.cpp index 3449026f1..f22b77f0d 100644 --- a/parser/html/nsHtml5MetaScanner.cpp +++ b/parser/html/nsHtml5MetaScanner.cpp @@ -1,7 +1,8 @@ /* * Copyright (c) 2007 Henri Sivonen * Copyright (c) 2008-2015 Mozilla Foundation - * Copyright (c) 2019 Moonchild Productions + * Copyright (c) 2018-2020 Moonchild Productions + * Copyright (c) 2020 Binary Outcast * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -787,8 +788,7 @@ nsHtml5MetaScanner::handleTagInner() return true; } if (!!content && httpEquivState == NS_HTML5META_SCANNER_HTTP_EQUIV_CONTENT_TYPE) { - nsHtml5String extract = - nsHtml5TreeBuilder::extractCharsetFromContent(content, treeBuilder); + nsHtml5String extract = nsHtml5TreeBuilder::extractCharsetFromContent(content, treeBuilder); if (!extract) { return false; } |