| 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 1902 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1913 return; | 1913 return; |
| 1914 String scriptResult = toCoreString(v8::Local<v8::String>::Cast(result)); | 1914 String scriptResult = toCoreString(v8::Local<v8::String>::Cast(result)); |
| 1915 if (!frame()->navigationScheduler().locationChangePending()) | 1915 if (!frame()->navigationScheduler().locationChangePending()) |
| 1916 frame()->loader().replaceDocumentWhileExecutingJavaScriptURL(scriptResult, | 1916 frame()->loader().replaceDocumentWhileExecutingJavaScriptURL(scriptResult, |
| 1917 ownerDocument); | 1917 ownerDocument); |
| 1918 } | 1918 } |
| 1919 | 1919 |
| 1920 HitTestResult WebLocalFrameImpl::hitTestResultForVisualViewportPos( | 1920 HitTestResult WebLocalFrameImpl::hitTestResultForVisualViewportPos( |
| 1921 const IntPoint& posInViewport) { | 1921 const IntPoint& posInViewport) { |
| 1922 IntPoint rootFramePoint( | 1922 IntPoint rootFramePoint( |
| 1923 frame()->host()->visualViewport().viewportToRootFrame(posInViewport)); | 1923 frame()->page()->visualViewport().viewportToRootFrame(posInViewport)); |
| 1924 IntPoint docPoint(frame()->view()->rootFrameToContents(rootFramePoint)); | 1924 IntPoint docPoint(frame()->view()->rootFrameToContents(rootFramePoint)); |
| 1925 HitTestResult result = frame()->eventHandler().hitTestResultAtPoint( | 1925 HitTestResult result = frame()->eventHandler().hitTestResultAtPoint( |
| 1926 docPoint, HitTestRequest::ReadOnly | HitTestRequest::Active); | 1926 docPoint, HitTestRequest::ReadOnly | HitTestRequest::Active); |
| 1927 result.setToShadowHostIfInUserAgentShadowRoot(); | 1927 result.setToShadowHostIfInUserAgentShadowRoot(); |
| 1928 return result; | 1928 return result; |
| 1929 } | 1929 } |
| 1930 | 1930 |
| 1931 static void ensureFrameLoaderHasCommitted(FrameLoader& frameLoader) { | 1931 static void ensureFrameLoaderHasCommitted(FrameLoader& frameLoader) { |
| 1932 // Internally, Blink uses CommittedMultipleRealLoads to track whether the | 1932 // Internally, Blink uses CommittedMultipleRealLoads to track whether the |
| 1933 // next commit should create a new history item or not. Ensure we have | 1933 // next commit should create a new history item or not. Ensure we have |
| (...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2460 createMarkup(startPosition, endPosition, AnnotateForInterchange, | 2460 createMarkup(startPosition, endPosition, AnnotateForInterchange, |
| 2461 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); | 2461 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); |
| 2462 } else { | 2462 } else { |
| 2463 clipHtml = | 2463 clipHtml = |
| 2464 createMarkup(endPosition, startPosition, AnnotateForInterchange, | 2464 createMarkup(endPosition, startPosition, AnnotateForInterchange, |
| 2465 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); | 2465 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); |
| 2466 } | 2466 } |
| 2467 } | 2467 } |
| 2468 | 2468 |
| 2469 } // namespace blink | 2469 } // namespace blink |
| OLD | NEW |