WebKit merge 41447:41498 [third_party/WebKit]

third_party/WebKit/WebCore/page/Page.h

 /*
  * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 197 matching lines @@
 
         OwnPtr<Chrome> m_chrome;
         OwnPtr<SelectionController> m_dragCaretController;
         OwnPtr<DragController> m_dragController;
         OwnPtr<FocusController> m_focusController;
         OwnPtr<ContextMenuController> m_contextMenuController;
 #if USE(V8)
         // To fix crash in inspector window (Bug 904340)
         RefPtr<InspectorController> m_inspectorController;
 #else
-        OwnPtr<InspectorController> m_inspectorController;
 #endif
         OwnPtr<Settings> m_settings;
         OwnPtr<ProgressTracker> m_progress;
         
         RefPtr<BackForwardList> m_backForwardList;
         RefPtr<Frame> m_mainFrame;
 
         RefPtr<HistoryItem> m_globalHistoryItem;
 
         mutable RefPtr<PluginData> m_pluginData;
@@ skipping 42 matching lines @@
 #if ENABLE(WML)
         OwnPtr<WMLPageState> m_wmlPageState;
 #endif
     };
 
 } // namespace WebCore
     
 #endif // Page_h