Cancel javascript: URL navigations if the frame was navigated.

third_party/WebKit/Source/core/loader/NavigationScheduler.h

 /*
  * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2009 Adam Barth. 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
@@ skipping 57 matching lines @@
     void schedulePageBlock(Document*);
     void scheduleFormSubmission(Document*, PassRefPtrWillBeRawPtr<FormSubmission>);
     void scheduleReload();
 
     void startTimer();
     void cancel();
 
     DECLARE_TRACE();
 
 private:
-    friend class FrameNavigationDisabler;
     explicit NavigationScheduler(LocalFrame*);
 
-    void disableFrameNavigation() { ++m_navigationDisableCount; }
-    void enableFrameNavigation() { --m_navigationDisableCount; }
-    bool isFrameNavigationAllowed() const { return !m_navigationDisableCount; }
-
     bool shouldScheduleReload() const;
     bool shouldScheduleNavigation(const String& url) const;
 
     void navigateTask();
     void schedule(PassOwnPtrWillBeRawPtr<ScheduledNavigation>);
 
     static bool mustReplaceCurrentItem(LocalFrame* targetFrame);
 
     RawPtrWillBeMember<LocalFrame> m_frame;
     OwnPtr<CancellableTaskFactory> m_navigateTaskFactory;
     OwnPtrWillBeMember<ScheduledNavigation> m_redirect;
-    int m_navigationDisableCount;
 };
 
 class NavigationDisablerForBeforeUnload {
     WTF_MAKE_NONCOPYABLE(NavigationDisablerForBeforeUnload);
     STACK_ALLOCATED();
 public:
     NavigationDisablerForBeforeUnload()
     {
         s_navigationDisableCount++;
     }
     ~NavigationDisablerForBeforeUnload()
     {
         ASSERT(s_navigationDisableCount);
         s_navigationDisableCount--;
     }
     static bool isNavigationAllowed() { return !s_navigationDisableCount; }
 
 private:
     static unsigned s_navigationDisableCount;
 };
 
-class FrameNavigationDisabler {
-    WTF_MAKE_NONCOPYABLE(FrameNavigationDisabler);
-    STACK_ALLOCATED();
-public:
-    explicit FrameNavigationDisabler(LocalFrame*);
-    ~FrameNavigationDisabler();
-
-private:
-    RawPtrWillBeMember<NavigationScheduler> m_navigationScheduler;
-};
-
 } // namespace blink
 
 #endif // NavigationScheduler_h