| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 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 20 matching lines...) Expand all Loading... |
| 31 #include "public/web/WebFrame.h" | 31 #include "public/web/WebFrame.h" |
| 32 | 32 |
| 33 #include "SkBitmap.h" | 33 #include "SkBitmap.h" |
| 34 #include "SkCanvas.h" | 34 #include "SkCanvas.h" |
| 35 #include "bindings/core/v8/SerializedScriptValueFactory.h" | 35 #include "bindings/core/v8/SerializedScriptValueFactory.h" |
| 36 #include "bindings/core/v8/V8Node.h" | 36 #include "bindings/core/v8/V8Node.h" |
| 37 #include "core/clipboard/DataTransfer.h" | 37 #include "core/clipboard/DataTransfer.h" |
| 38 #include "core/css/StyleSheetContents.h" | 38 #include "core/css/StyleSheetContents.h" |
| 39 #include "core/css/resolver/StyleResolver.h" | 39 #include "core/css/resolver/StyleResolver.h" |
| 40 #include "core/css/resolver/ViewportStyleResolver.h" | 40 #include "core/css/resolver/ViewportStyleResolver.h" |
| 41 #include "core/dom/Document.h" |
| 41 #include "core/dom/Fullscreen.h" | 42 #include "core/dom/Fullscreen.h" |
| 42 #include "core/dom/NodeComputedStyle.h" | 43 #include "core/dom/NodeComputedStyle.h" |
| 43 #include "core/dom/Range.h" | 44 #include "core/dom/Range.h" |
| 44 #include "core/editing/Editor.h" | 45 #include "core/editing/Editor.h" |
| 45 #include "core/editing/EphemeralRange.h" | 46 #include "core/editing/EphemeralRange.h" |
| 46 #include "core/editing/FrameSelection.h" | 47 #include "core/editing/FrameSelection.h" |
| 47 #include "core/editing/VisiblePosition.h" | 48 #include "core/editing/VisiblePosition.h" |
| 48 #include "core/editing/markers/DocumentMarkerController.h" | 49 #include "core/editing/markers/DocumentMarkerController.h" |
| 49 #include "core/editing/spellcheck/SpellChecker.h" | 50 #include "core/editing/spellcheck/SpellChecker.h" |
| 50 #include "core/events/MouseEvent.h" | 51 #include "core/events/MouseEvent.h" |
| 51 #include "core/fetch/FetchRequest.h" | 52 #include "core/fetch/FetchRequest.h" |
| 52 #include "core/fetch/MemoryCache.h" | 53 #include "core/fetch/MemoryCache.h" |
| 53 #include "core/fetch/ResourceFetcher.h" | 54 #include "core/fetch/ResourceFetcher.h" |
| 54 #include "core/frame/FrameHost.h" | 55 #include "core/frame/FrameHost.h" |
| 55 #include "core/frame/FrameView.h" | 56 #include "core/frame/FrameView.h" |
| 56 #include "core/frame/LocalFrame.h" | 57 #include "core/frame/LocalFrame.h" |
| 57 #include "core/frame/RemoteFrame.h" | 58 #include "core/frame/RemoteFrame.h" |
| 58 #include "core/frame/Settings.h" | 59 #include "core/frame/Settings.h" |
| 59 #include "core/frame/VisualViewport.h" | 60 #include "core/frame/VisualViewport.h" |
| 60 #include "core/html/HTMLBodyElement.h" | 61 #include "core/html/HTMLBodyElement.h" |
| 61 #include "core/html/HTMLDocument.h" | |
| 62 #include "core/html/HTMLFormElement.h" | 62 #include "core/html/HTMLFormElement.h" |
| 63 #include "core/html/HTMLMediaElement.h" | 63 #include "core/html/HTMLMediaElement.h" |
| 64 #include "core/html/ImageDocument.h" | 64 #include "core/html/ImageDocument.h" |
| 65 #include "core/input/EventHandler.h" | 65 #include "core/input/EventHandler.h" |
| 66 #include "core/layout/HitTestResult.h" | 66 #include "core/layout/HitTestResult.h" |
| 67 #include "core/layout/LayoutFullScreen.h" | 67 #include "core/layout/LayoutFullScreen.h" |
| 68 #include "core/layout/api/LayoutViewItem.h" | 68 #include "core/layout/api/LayoutViewItem.h" |
| 69 #include "core/layout/compositing/PaintLayerCompositor.h" | 69 #include "core/layout/compositing/PaintLayerCompositor.h" |
| 70 #include "core/loader/DocumentLoader.h" | 70 #include "core/loader/DocumentLoader.h" |
| 71 #include "core/loader/DocumentThreadableLoader.h" | 71 #include "core/loader/DocumentThreadableLoader.h" |
| (...skipping 8766 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 8838 request.setRequestorOrigin(WebSecurityOrigin::createUnique()); | 8838 request.setRequestorOrigin(WebSecurityOrigin::createUnique()); |
| 8839 helper.webView()->mainFrameImpl()->loadRequest(request); | 8839 helper.webView()->mainFrameImpl()->loadRequest(request); |
| 8840 | 8840 |
| 8841 // Normally, the result of the JS url replaces the existing contents on the | 8841 // Normally, the result of the JS url replaces the existing contents on the |
| 8842 // Document. However, if the JS triggers a navigation, the contents should | 8842 // Document. However, if the JS triggers a navigation, the contents should |
| 8843 // not be replaced. | 8843 // not be replaced. |
| 8844 EXPECT_EQ("", toLocalFrame(helper.webView()->page()->mainFrame())->document(
)->documentElement()->innerText()); | 8844 EXPECT_EQ("", toLocalFrame(helper.webView()->page()->mainFrame())->document(
)->documentElement()->innerText()); |
| 8845 } | 8845 } |
| 8846 | 8846 |
| 8847 } // namespace blink | 8847 } // namespace blink |
| OLD | NEW |