diff options
Diffstat (limited to 'WebCore/html')
-rw-r--r-- | WebCore/html/HTMLCollection.cpp | 8 | ||||
-rw-r--r-- | WebCore/html/HTMLSelectElement.h | 2 | ||||
-rw-r--r-- | WebCore/html/HTMLTokenizer.cpp | 7 |
3 files changed, 8 insertions, 9 deletions
diff --git a/WebCore/html/HTMLCollection.cpp b/WebCore/html/HTMLCollection.cpp index 76de60a..2b29589 100644 --- a/WebCore/html/HTMLCollection.cpp +++ b/WebCore/html/HTMLCollection.cpp @@ -251,15 +251,15 @@ Node* HTMLCollection::firstItem() const Node* HTMLCollection::nextItem() const { resetCollectionInfo(); - + #ifdef ANDROID_FIX - // resetCollectionInfo() can set info->current to be 0. If this is the - // case, we need to go back to the firstItem. Otherwise traverseNextItem + // resetCollectionInfo() can set info->current to be 0. If this is the + // case, we need to go back to the firstItem. Otherwise traverseNextItem // will crash. if (!m_info->current) return firstItem(); #endif - + // Look for the 'second' item. The first one is currentItem, already given back. Element* retval = itemAfter(m_info->current); m_info->current = retval; diff --git a/WebCore/html/HTMLSelectElement.h b/WebCore/html/HTMLSelectElement.h index d28f116..8f575d2 100644 --- a/WebCore/html/HTMLSelectElement.h +++ b/WebCore/html/HTMLSelectElement.h @@ -106,8 +106,8 @@ private: virtual RenderObject* createRenderer(RenderArena*, RenderStyle *); virtual bool appendFormData(FormDataList&, bool); - virtual int listToOptionIndex(int listIndex) const; virtual int optionToListIndex(int optionIndex) const; + virtual int listToOptionIndex(int listIndex) const; virtual void reset(); diff --git a/WebCore/html/HTMLTokenizer.cpp b/WebCore/html/HTMLTokenizer.cpp index 9215dc3..7c01f6a 100644 --- a/WebCore/html/HTMLTokenizer.cpp +++ b/WebCore/html/HTMLTokenizer.cpp @@ -24,6 +24,7 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + #include "config.h" #include "HTMLTokenizer.h" @@ -484,7 +485,7 @@ HTMLTokenizer::State HTMLTokenizer::scriptHandler(State state) #ifdef ANDROID_INSTRUMENT android::TimeCounter::recordNoCounter(android::TimeCounter::ParsingTimeCounter, __FUNCTION__); #endif - + if (!m_parser->skipMode() && !followingFrameset) { if (cs) { if (savedPrependingSrc) @@ -517,7 +518,7 @@ HTMLTokenizer::State HTMLTokenizer::scriptHandler(State state) #ifdef ANDROID_INSTRUMENT android::TimeCounter::start(android::TimeCounter::ParsingTimeCounter); #endif - + if (!m_executingScript && !state.loadingExtScript()) { m_src.append(m_pendingSrc); m_pendingSrc.clear(); @@ -541,7 +542,6 @@ HTMLTokenizer::State HTMLTokenizer::scriptHandler(State state) } } - #if PRELOAD_SCANNER_ENABLED if (!m_pendingScripts.isEmpty() && !m_executingScript) { if (!m_preloadScanner) @@ -1651,7 +1651,6 @@ void HTMLTokenizer::write(const SegmentedString& str, bool appendData) return; } - #if PRELOAD_SCANNER_ENABLED if (m_preloadScanner && m_preloadScanner->inProgress() && appendData) m_preloadScanner->end(); |