Merge 137939

Source/WebCore/history/CachedFrame.cpp

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 116 matching lines @@
     // Open the child CachedFrames in their respective FrameLoaders.
     for (unsigned i = 0; i < m_childFrames.size(); ++i)
         m_childFrames[i]->open();
 
     m_document->enqueuePageshowEvent(PageshowEventPersisted);
     
     HistoryItem* historyItem = frame->loader()->history()->currentItem();
     m_document->enqueuePopstateEvent(historyItem && historyItem->stateObject() ? historyItem->stateObject() : SerializedScriptValue::nullValue());
     
 #if ENABLE(TOUCH_EVENTS)
-    if (m_document->touchEventHandlerCount())
+    if (m_document->hasTouchEventHandlers())
         m_document->page()->chrome()->client()->needTouchEvents(true);
 #endif
 
     m_document->documentDidResumeFromPageCache();
 }
 
 CachedFrame::CachedFrame(Frame* frame)
     : CachedFrameBase(frame)
 {
 #ifndef NDEBUG
@@ skipping 142 matching lines @@
 int CachedFrame::descendantFrameCount() const
 {
     int count = m_childFrames.size();
     for (size_t i = 0; i < m_childFrames.size(); ++i)
         count += m_childFrames[i]->descendantFrameCount();
     
     return count;
 }
 
 } // namespace WebCore