| Index: Source/core/loader/FrameLoader.h
|
| diff --git a/Source/core/loader/FrameLoader.h b/Source/core/loader/FrameLoader.h
|
| index d110bc2a6fa51bbd3dbd98702833033260c6f889..4b8cd264f0189052022c90dfe5f1cd909f04887f 100644
|
| --- a/Source/core/loader/FrameLoader.h
|
| +++ b/Source/core/loader/FrameLoader.h
|
| @@ -9,13 +9,13 @@
|
| * are met:
|
| *
|
| * 1. Redistributions of source code must retain the above copyright
|
| - * notice, this list of conditions and the following disclaimer.
|
| + * 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
|
| - * documentation and/or other materials provided with the distribution.
|
| + * documentation and/or other materials provided with the distribution.
|
| * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
|
| * its contributors may be used to endorse or promote products derived
|
| - * from this software without specific prior written permission.
|
| + * from this software without specific prior written permission.
|
| *
|
| * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
|
| * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
| @@ -174,7 +174,7 @@ public:
|
| void detachViewsAndDocumentLoader();
|
|
|
| void addExtraFieldsToRequest(ResourceRequest&);
|
| -
|
| +
|
| static void addHTTPOriginIfNeeded(ResourceRequest&, const String& origin);
|
|
|
| FrameLoaderClient* client() const { return m_client; }
|
| @@ -237,7 +237,7 @@ public:
|
| bool suppressOpenerInNewFrame() const { return m_suppressOpenerInNewFrame; }
|
|
|
| bool shouldClose();
|
| -
|
| +
|
| void started();
|
|
|
| enum PageDismissalType {
|
| @@ -252,7 +252,7 @@ private:
|
| bool allChildrenAreComplete() const; // immediate children, not all descendants
|
|
|
| void checkTimerFired(Timer<FrameLoader>*);
|
| -
|
| +
|
| void loadSameDocumentItem(HistoryItem*);
|
| void loadDifferentDocumentItem(HistoryItem*);
|
| void insertDummyHistoryItem();
|
| @@ -266,7 +266,7 @@ private:
|
| void frameLoadCompleted();
|
|
|
| SubstituteData defaultSubstituteDataForURL(const KURL&);
|
| -
|
| +
|
| bool fireBeforeUnloadEvent(Chrome&, FrameLoader*);
|
| bool hasAllowedNavigationViaBeforeUnloadConfirmationPanel() const { return m_hasAllowedNavigationViaBeforeUnloadConfirmationPanel; }
|
| void didAllowNavigationViaBeforeUnloadConfirmationPanel() { m_hasAllowedNavigationViaBeforeUnloadConfirmationPanel = true; }
|
| @@ -329,7 +329,7 @@ private:
|
| FrameState m_state;
|
| FrameLoadType m_loadType;
|
|
|
| - // Document loaders for the three phases of frame loading. Note that while
|
| + // Document loaders for the three phases of frame loading. Note that while
|
| // a new request is being loaded, the old document loader may still be referenced.
|
| // E.g. while a new request is in the "policy" state, the old document loader may
|
| // be consulted in particular as it makes sense to imply certain settings on the new loader.
|
|
|