| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv
ed. | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv
ed. |
| 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
| 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) | 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) |
| 5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> | 5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> |
| 6 * Copyright (C) Research In Motion Limited 2009. All rights reserved. | 6 * Copyright (C) Research In Motion Limited 2009. All rights reserved. |
| 7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> | 7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> |
| 8 * Copyright (C) 2011 Google Inc. All rights reserved. | 8 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 9 * | 9 * |
| 10 * Redistribution and use in source and binary forms, with or without | 10 * Redistribution and use in source and binary forms, with or without |
| (...skipping 1544 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1555 PassOwnPtr<TracedValue> FrameLoader::toTracedValue() const | 1555 PassOwnPtr<TracedValue> FrameLoader::toTracedValue() const |
| 1556 { | 1556 { |
| 1557 OwnPtr<TracedValue> tracedValue = TracedValue::create(); | 1557 OwnPtr<TracedValue> tracedValue = TracedValue::create(); |
| 1558 tracedValue->beginDictionary("frame"); | 1558 tracedValue->beginDictionary("frame"); |
| 1559 tracedValue->setString("id_ref", String::format("0x%" PRIx64, static_cast<ui
nt64_t>(reinterpret_cast<uintptr_t>(m_frame.get())))); | 1559 tracedValue->setString("id_ref", String::format("0x%" PRIx64, static_cast<ui
nt64_t>(reinterpret_cast<uintptr_t>(m_frame.get())))); |
| 1560 tracedValue->endDictionary(); | 1560 tracedValue->endDictionary(); |
| 1561 tracedValue->setBoolean("isLoadingMainFrame", isLoadingMainFrame()); | 1561 tracedValue->setBoolean("isLoadingMainFrame", isLoadingMainFrame()); |
| 1562 tracedValue->setString("stateMachine", m_stateMachine.toString()); | 1562 tracedValue->setString("stateMachine", m_stateMachine.toString()); |
| 1563 tracedValue->setString("provisionalDocumentLoaderURL", m_provisionalDocument
Loader ? m_provisionalDocumentLoader->url() : String()); | 1563 tracedValue->setString("provisionalDocumentLoaderURL", m_provisionalDocument
Loader ? m_provisionalDocumentLoader->url() : String()); |
| 1564 tracedValue->setString("documentLoaderURL", m_documentLoader ? m_documentLoa
der->url() : String()); | 1564 tracedValue->setString("documentLoaderURL", m_documentLoader ? m_documentLoa
der->url() : String()); |
| 1565 return tracedValue.release(); | 1565 return tracedValue; |
| 1566 } | 1566 } |
| 1567 | 1567 |
| 1568 inline void FrameLoader::takeObjectSnapshot() const | 1568 inline void FrameLoader::takeObjectSnapshot() const |
| 1569 { | 1569 { |
| 1570 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, toTraced
Value()); | 1570 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, toTraced
Value()); |
| 1571 } | 1571 } |
| 1572 | 1572 |
| 1573 } // namespace blink | 1573 } // namespace blink |
| OLD | NEW |