OLD | NEW |
---|---|
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 944 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
955 frame()->loader().client()->dispatchWillSendRequest(0, 0, request.toMutableR esourceRequest(), response); | 955 frame()->loader().client()->dispatchWillSendRequest(0, 0, request.toMutableR esourceRequest(), response); |
956 } | 956 } |
957 | 957 |
958 WebURLLoader* WebLocalFrameImpl::createAssociatedURLLoader(const WebURLLoaderOpt ions& options) | 958 WebURLLoader* WebLocalFrameImpl::createAssociatedURLLoader(const WebURLLoaderOpt ions& options) |
959 { | 959 { |
960 return new AssociatedURLLoader(this, options); | 960 return new AssociatedURLLoader(this, options); |
961 } | 961 } |
962 | 962 |
963 unsigned WebLocalFrameImpl::unloadListenerCount() const | 963 unsigned WebLocalFrameImpl::unloadListenerCount() const |
964 { | 964 { |
965 return frame()->domWindow()->pendingUnloadEventListeners(); | 965 return frame()->localDOMWindow()->pendingUnloadEventListeners(); |
haraken
2014/11/08 09:17:25
I'd propose to rename frame() to localFrame() to r
| |
966 } | 966 } |
967 | 967 |
968 void WebLocalFrameImpl::replaceSelection(const WebString& text) | 968 void WebLocalFrameImpl::replaceSelection(const WebString& text) |
969 { | 969 { |
970 bool selectReplacement = false; | 970 bool selectReplacement = false; |
971 bool smartReplace = true; | 971 bool smartReplace = true; |
972 frame()->editor().replaceSelectionWithText(text, selectReplacement, smartRep lace); | 972 frame()->editor().replaceSelectionWithText(text, selectReplacement, smartRep lace); |
973 } | 973 } |
974 | 974 |
975 void WebLocalFrameImpl::insertText(const WebString& text) | 975 void WebLocalFrameImpl::insertText(const WebString& text) |
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1406 } | 1406 } |
1407 | 1407 |
1408 void WebLocalFrameImpl::resetMatchCount() | 1408 void WebLocalFrameImpl::resetMatchCount() |
1409 { | 1409 { |
1410 ensureTextFinder().resetMatchCount(); | 1410 ensureTextFinder().resetMatchCount(); |
1411 } | 1411 } |
1412 | 1412 |
1413 void WebLocalFrameImpl::dispatchMessageEventWithOriginCheck(const WebSecurityOri gin& intendedTargetOrigin, const WebDOMEvent& event) | 1413 void WebLocalFrameImpl::dispatchMessageEventWithOriginCheck(const WebSecurityOri gin& intendedTargetOrigin, const WebDOMEvent& event) |
1414 { | 1414 { |
1415 ASSERT(!event.isNull()); | 1415 ASSERT(!event.isNull()); |
1416 frame()->domWindow()->dispatchMessageEventWithOriginCheck(intendedTargetOrig in.get(), event, nullptr); | 1416 frame()->localDOMWindow()->dispatchMessageEventWithOriginCheck(intendedTarge tOrigin.get(), event, nullptr); |
1417 } | 1417 } |
1418 | 1418 |
1419 int WebLocalFrameImpl::findMatchMarkersVersion() const | 1419 int WebLocalFrameImpl::findMatchMarkersVersion() const |
1420 { | 1420 { |
1421 ASSERT(!parent()); | 1421 ASSERT(!parent()); |
1422 | 1422 |
1423 if (m_textFinder) | 1423 if (m_textFinder) |
1424 return m_textFinder->findMatchMarkersVersion(); | 1424 return m_textFinder->findMatchMarkersVersion(); |
1425 return 0; | 1425 return 0; |
1426 } | 1426 } |
(...skipping 472 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1899 { | 1899 { |
1900 if (!frame()) | 1900 if (!frame()) |
1901 return; | 1901 return; |
1902 | 1902 |
1903 // Screen Orientation API | 1903 // Screen Orientation API |
1904 if (ScreenOrientationController::from(*frame())) | 1904 if (ScreenOrientationController::from(*frame())) |
1905 ScreenOrientationController::from(*frame())->notifyOrientationChanged(); | 1905 ScreenOrientationController::from(*frame())->notifyOrientationChanged(); |
1906 | 1906 |
1907 // Legacy window.orientation API | 1907 // Legacy window.orientation API |
1908 if (RuntimeEnabledFeatures::orientationEventEnabled() && frame()->domWindow( )) | 1908 if (RuntimeEnabledFeatures::orientationEventEnabled() && frame()->domWindow( )) |
1909 frame()->domWindow()->sendOrientationChangeEvent(); | 1909 frame()->localDOMWindow()->sendOrientationChangeEvent(); |
1910 } | 1910 } |
1911 | 1911 |
1912 v8::Handle<v8::Value> WebLocalFrameImpl::executeScriptAndReturnValueForTests(con st WebScriptSource& source) | 1912 v8::Handle<v8::Value> WebLocalFrameImpl::executeScriptAndReturnValueForTests(con st WebScriptSource& source) |
1913 { | 1913 { |
1914 // FIXME: This fake UserGestureIndicator is required for a bunch of browser | 1914 // FIXME: This fake UserGestureIndicator is required for a bunch of browser |
1915 // tests to pass. We should update the tests to simulate input and get rid | 1915 // tests to pass. We should update the tests to simulate input and get rid |
1916 // of this. | 1916 // of this. |
1917 // http://code.google.com/p/chromium/issues/detail?id=86397 | 1917 // http://code.google.com/p/chromium/issues/detail?id=86397 |
1918 UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture); | 1918 UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture); |
1919 return executeScriptAndReturnValue(source); | 1919 return executeScriptAndReturnValue(source); |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1969 | 1969 |
1970 void WebLocalFrameImpl::invalidateAll() const | 1970 void WebLocalFrameImpl::invalidateAll() const |
1971 { | 1971 { |
1972 ASSERT(frame() && frame()->view()); | 1972 ASSERT(frame() && frame()->view()); |
1973 FrameView* view = frame()->view(); | 1973 FrameView* view = frame()->view(); |
1974 view->invalidateRect(view->frameRect()); | 1974 view->invalidateRect(view->frameRect()); |
1975 invalidateScrollbar(); | 1975 invalidateScrollbar(); |
1976 } | 1976 } |
1977 | 1977 |
1978 } // namespace blink | 1978 } // namespace blink |
OLD | NEW |