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

Side by Side Diff: Source/core/testing/Internals.cpp

Issue 720673002: Replace generic Dictionary with DictionaryPluginPlaceholderOptions (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « Source/core/testing/Internals.h ('k') | Source/core/testing/Internals.idl » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * Copyright (C) 2013 Apple Inc. All rights reserved. 3 * Copyright (C) 2013 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 #include "core/rendering/RenderView.h" 117 #include "core/rendering/RenderView.h"
118 #include "core/rendering/compositing/CompositedLayerMapping.h" 118 #include "core/rendering/compositing/CompositedLayerMapping.h"
119 #include "core/rendering/compositing/RenderLayerCompositor.h" 119 #include "core/rendering/compositing/RenderLayerCompositor.h"
120 #include "core/testing/DictionaryTest.h" 120 #include "core/testing/DictionaryTest.h"
121 #include "core/testing/GCObservation.h" 121 #include "core/testing/GCObservation.h"
122 #include "core/testing/InternalProfilers.h" 122 #include "core/testing/InternalProfilers.h"
123 #include "core/testing/InternalSettings.h" 123 #include "core/testing/InternalSettings.h"
124 #include "core/testing/LayerRect.h" 124 #include "core/testing/LayerRect.h"
125 #include "core/testing/LayerRectList.h" 125 #include "core/testing/LayerRectList.h"
126 #include "core/testing/MockPagePopupDriver.h" 126 #include "core/testing/MockPagePopupDriver.h"
127 #include "core/testing/PluginPlaceholderOptions.h"
127 #include "core/testing/PrivateScriptTest.h" 128 #include "core/testing/PrivateScriptTest.h"
128 #include "core/testing/TypeConversions.h" 129 #include "core/testing/TypeConversions.h"
129 #include "core/testing/UnionTypesTest.h" 130 #include "core/testing/UnionTypesTest.h"
130 #include "core/workers/WorkerThread.h" 131 #include "core/workers/WorkerThread.h"
131 #include "platform/Cursor.h" 132 #include "platform/Cursor.h"
132 #include "platform/Language.h" 133 #include "platform/Language.h"
133 #include "platform/RuntimeEnabledFeatures.h" 134 #include "platform/RuntimeEnabledFeatures.h"
134 #include "platform/TraceEvent.h" 135 #include "platform/TraceEvent.h"
135 #include "platform/geometry/IntRect.h" 136 #include "platform/geometry/IntRect.h"
136 #include "platform/geometry/LayoutRect.h" 137 #include "platform/geometry/LayoutRect.h"
(...skipping 2182 matching lines...) Expand 10 before | Expand all | Expand 10 after
2319 2320
2320 void Internals::forcePluginPlaceholder(HTMLElement* element, PassRefPtrWillBeRaw Ptr<DocumentFragment> fragment, ExceptionState& exceptionState) 2321 void Internals::forcePluginPlaceholder(HTMLElement* element, PassRefPtrWillBeRaw Ptr<DocumentFragment> fragment, ExceptionState& exceptionState)
2321 { 2322 {
2322 if (!element->isPluginElement()) { 2323 if (!element->isPluginElement()) {
2323 exceptionState.throwDOMException(InvalidNodeTypeError, "The element prov ided is not a plugin."); 2324 exceptionState.throwDOMException(InvalidNodeTypeError, "The element prov ided is not a plugin.");
2324 return; 2325 return;
2325 } 2326 }
2326 toHTMLPlugInElement(element)->setPlaceholder(DocumentFragmentPluginPlacehold er::create(fragment)); 2327 toHTMLPlugInElement(element)->setPlaceholder(DocumentFragmentPluginPlacehold er::create(fragment));
2327 } 2328 }
2328 2329
2329 void Internals::forcePluginPlaceholder(HTMLElement* element, const Dictionary& o ptions, ExceptionState& exceptionState) 2330 void Internals::forcePluginPlaceholder(HTMLElement* element, const PluginPlaceho lderOptions& options, ExceptionState& exceptionState)
2330 { 2331 {
2331 if (!element->isPluginElement()) { 2332 if (!element->isPluginElement()) {
2332 exceptionState.throwDOMException(InvalidNodeTypeError, "The element prov ided is not a plugin."); 2333 exceptionState.throwDOMException(InvalidNodeTypeError, "The element prov ided is not a plugin.");
2333 return; 2334 return;
2334 } 2335 }
2335 toHTMLPlugInElement(element)->setPlaceholder(DictionaryPluginPlaceholder::cr eate(element->document(), options)); 2336 toHTMLPlugInElement(element)->setPlaceholder(DictionaryPluginPlaceholder::cr eate(element->document(), options));
2336 } 2337 }
2337 2338
2338 Iterator* Internals::iterator(ScriptState* scriptState, ExceptionState& exceptio nState) 2339 Iterator* Internals::iterator(ScriptState* scriptState, ExceptionState& exceptio nState)
2339 { 2340 {
2340 return new InternalsIterator; 2341 return new InternalsIterator;
2341 } 2342 }
2342 2343
2343 } // namespace blink 2344 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/testing/Internals.h ('k') | Source/core/testing/Internals.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698