| Index: Source/core/history/HistoryItem.cpp
|
| diff --git a/Source/core/history/HistoryItem.cpp b/Source/core/history/HistoryItem.cpp
|
| index f538b799ce3b03d5017e6aefb99419b7faf594f2..1a2c317a1d5ef685fe8e7ef743722f5c637be599 100644
|
| --- a/Source/core/history/HistoryItem.cpp
|
| +++ b/Source/core/history/HistoryItem.cpp
|
| @@ -20,7 +20,7 @@
|
| * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
|
| * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| #include "config.h"
|
| @@ -89,7 +89,7 @@ inline HistoryItem::HistoryItem(const HistoryItem& item)
|
| {
|
| if (item.m_formData)
|
| m_formData = item.m_formData->copy();
|
| -
|
| +
|
| unsigned size = item.m_children.size();
|
| m_children.reserveInitialCapacity(size);
|
| for (unsigned i = 0; i < size; ++i)
|
| @@ -371,10 +371,10 @@ bool HistoryItem::shouldDoSameDocumentNavigationTo(HistoryItem* otherItem) const
|
|
|
| if (stateObject() || otherItem->stateObject())
|
| return documentSequenceNumber() == otherItem->documentSequenceNumber();
|
| -
|
| +
|
| if ((url().hasFragmentIdentifier() || otherItem->url().hasFragmentIdentifier()) && equalIgnoringFragmentIdentifier(url(), otherItem->url()))
|
| - return documentSequenceNumber() == otherItem->documentSequenceNumber();
|
| -
|
| + return documentSequenceNumber() == otherItem->documentSequenceNumber();
|
| +
|
| return hasSameDocumentTree(otherItem);
|
| }
|
|
|
| @@ -384,7 +384,7 @@ bool HistoryItem::hasSameDocumentTree(HistoryItem* otherItem) const
|
| {
|
| if (documentSequenceNumber() != otherItem->documentSequenceNumber())
|
| return false;
|
| -
|
| +
|
| if (children().size() != otherItem->children().size())
|
| return false;
|
|
|
| @@ -404,7 +404,7 @@ bool HistoryItem::hasSameFrames(HistoryItem* otherItem) const
|
| {
|
| if (target() != otherItem->target())
|
| return false;
|
| -
|
| +
|
| if (children().size() != otherItem->children().size())
|
| return false;
|
|
|
| @@ -424,7 +424,7 @@ String HistoryItem::formContentType() const
|
| void HistoryItem::setFormInfoFromRequest(const ResourceRequest& request)
|
| {
|
| m_referrer = request.httpReferrer();
|
| -
|
| +
|
| if (equalIgnoringCase(request.httpMethod(), "POST")) {
|
| // FIXME: Eventually we have to make this smart enough to handle the case where
|
| // we have a stream for the body to handle the "data interspersed with files" feature.
|
| @@ -472,7 +472,7 @@ int HistoryItem::showTreeWithIndent(unsigned indentLevel) const
|
| prefix.append("\0", 1);
|
|
|
| fprintf(stderr, "%s+-%s (%p)\n", prefix.data(), m_urlString.utf8().data(), this);
|
| -
|
| +
|
| int totalSubItems = 0;
|
| for (unsigned i = 0; i < m_children.size(); ++i)
|
| totalSubItems += m_children[i]->showTreeWithIndent(indentLevel + 1);
|
| @@ -480,7 +480,7 @@ int HistoryItem::showTreeWithIndent(unsigned indentLevel) const
|
| }
|
|
|
| #endif
|
| -
|
| +
|
| } // namespace WebCore
|
|
|
| #ifndef NDEBUG
|
|
|