Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(173)

Side by Side Diff: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

Issue 2625773002: Reenable framebusting (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 2029 matching lines...) Expand 10 before | Expand all | Expand 10 after
2040 intervalInSeconds); 2040 intervalInSeconds);
2041 } 2041 }
2042 2042
2043 void WebLocalFrameImpl::setCommittedFirstRealLoad() { 2043 void WebLocalFrameImpl::setCommittedFirstRealLoad() {
2044 DCHECK(frame()); 2044 DCHECK(frame());
2045 ensureFrameLoaderHasCommitted(frame()->loader()); 2045 ensureFrameLoaderHasCommitted(frame()->loader());
2046 } 2046 }
2047 2047
2048 void WebLocalFrameImpl::setHasReceivedUserGesture() { 2048 void WebLocalFrameImpl::setHasReceivedUserGesture() {
2049 if (frame()) 2049 if (frame())
2050 frame()->document()->setHasReceivedUserGesture(); 2050 frame()->setDocumentHasReceivedUserGesture();
2051 } 2051 }
2052 2052
2053 void WebLocalFrameImpl::sendOrientationChangeEvent() { 2053 void WebLocalFrameImpl::sendOrientationChangeEvent() {
2054 if (!frame()) 2054 if (!frame())
2055 return; 2055 return;
2056 2056
2057 // Screen Orientation API 2057 // Screen Orientation API
2058 if (ScreenOrientationControllerImpl::from(*frame())) 2058 if (ScreenOrientationControllerImpl::from(*frame()))
2059 ScreenOrientationControllerImpl::from(*frame())->notifyOrientationChanged(); 2059 ScreenOrientationControllerImpl::from(*frame())->notifyOrientationChanged();
2060 2060
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
2359 ->frameScheduler() 2359 ->frameScheduler()
2360 ->unthrottledTaskRunner() 2360 ->unthrottledTaskRunner()
2361 ->toSingleThreadTaskRunner(); 2361 ->toSingleThreadTaskRunner();
2362 } 2362 }
2363 2363
2364 WebInputMethodControllerImpl* WebLocalFrameImpl::inputMethodController() const { 2364 WebInputMethodControllerImpl* WebLocalFrameImpl::inputMethodController() const {
2365 return m_inputMethodController.get(); 2365 return m_inputMethodController.get();
2366 } 2366 }
2367 2367
2368 } // namespace blink 2368 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698