| OLD | NEW |
| 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. |
| 11 * 2. Redistributions in binary form must reproduce the above copyright | 11 * 2. Redistributions in binary form must reproduce the above copyright |
| 12 * notice, this list of conditions and the following disclaimer in the | 12 * notice, this list of conditions and the following disclaimer in the |
| 13 * documentation and/or other materials provided with the distribution. | 13 * documentation and/or other materials provided with the distribution. |
| 14 * | 14 * |
| 15 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY | 15 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY |
| 16 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 16 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
| 17 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 17 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
| 18 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY | 18 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY |
| 19 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 19 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
| 20 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 20 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
| 21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
| 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| 24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 25 */ | 25 */ |
| 26 | 26 |
| 27 #include "config.h" | 27 #include "config.h" |
| 28 #include "Internals.h" | 28 #include "Internals.h" |
| 29 | 29 |
| 30 #include <v8.h> | |
| 31 #include "InternalProfilers.h" | 30 #include "InternalProfilers.h" |
| 32 #include "InternalRuntimeFlags.h" | 31 #include "InternalRuntimeFlags.h" |
| 33 #include "InternalSettings.h" | 32 #include "InternalSettings.h" |
| 34 #include "LayerRect.h" | 33 #include "LayerRect.h" |
| 35 #include "LayerRectList.h" | 34 #include "LayerRectList.h" |
| 36 #include "MallocStatistics.h" | 35 #include "MallocStatistics.h" |
| 37 #include "MockPagePopupDriver.h" | 36 #include "MockPagePopupDriver.h" |
| 38 #include "RuntimeEnabledFeatures.h" | 37 #include "RuntimeEnabledFeatures.h" |
| 39 #include "TypeConversions.h" | 38 #include "TypeConversions.h" |
| 40 #include "bindings/v8/ExceptionMessages.h" | 39 #include "bindings/v8/ExceptionMessages.h" |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 #include "platform/weborigin/SchemeRegistry.h" | 129 #include "platform/weborigin/SchemeRegistry.h" |
| 131 #include "public/platform/Platform.h" | 130 #include "public/platform/Platform.h" |
| 132 #include "public/platform/WebConnectionType.h" | 131 #include "public/platform/WebConnectionType.h" |
| 133 #include "public/platform/WebGraphicsContext3D.h" | 132 #include "public/platform/WebGraphicsContext3D.h" |
| 134 #include "public/platform/WebGraphicsContext3DProvider.h" | 133 #include "public/platform/WebGraphicsContext3DProvider.h" |
| 135 #include "public/platform/WebLayer.h" | 134 #include "public/platform/WebLayer.h" |
| 136 #include "wtf/InstanceCounter.h" | 135 #include "wtf/InstanceCounter.h" |
| 137 #include "wtf/PassOwnPtr.h" | 136 #include "wtf/PassOwnPtr.h" |
| 138 #include "wtf/dtoa.h" | 137 #include "wtf/dtoa.h" |
| 139 #include "wtf/text/StringBuffer.h" | 138 #include "wtf/text/StringBuffer.h" |
| 139 #include <v8.h> |
| 140 | 140 |
| 141 namespace WebCore { | 141 namespace WebCore { |
| 142 | 142 |
| 143 // FIXME: oilpan: These will be removed soon. | 143 // FIXME: oilpan: These will be removed soon. |
| 144 static MockPagePopupDriver* s_pagePopupDriver = 0; | 144 static MockPagePopupDriver* s_pagePopupDriver = 0; |
| 145 | 145 |
| 146 using namespace HTMLNames; | 146 using namespace HTMLNames; |
| 147 | 147 |
| 148 static bool markerTypesFrom(const String& markerType, DocumentMarker::MarkerType
s& result) | 148 static bool markerTypesFrom(const String& markerType, DocumentMarker::MarkerType
s& result) |
| 149 { | 149 { |
| (...skipping 2218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2368 } else if (type == "none") { | 2368 } else if (type == "none") { |
| 2369 webtype = blink::ConnectionTypeNone; | 2369 webtype = blink::ConnectionTypeNone; |
| 2370 } else { | 2370 } else { |
| 2371 exceptionState.throwDOMException(NotFoundError, ExceptionMessages::faile
dToEnumerate("connection type", type)); | 2371 exceptionState.throwDOMException(NotFoundError, ExceptionMessages::faile
dToEnumerate("connection type", type)); |
| 2372 return; | 2372 return; |
| 2373 } | 2373 } |
| 2374 networkStateNotifier().setWebConnectionTypeForTest(webtype); | 2374 networkStateNotifier().setWebConnectionTypeForTest(webtype); |
| 2375 } | 2375 } |
| 2376 | 2376 |
| 2377 } // namespace WebCore | 2377 } // namespace WebCore |
| OLD | NEW |