From 470286ecfe79d59df14944e5b5d34630fc739391 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 22 Nov 2012 09:09:45 +0100 Subject: Imported WebKit commit e89504fa9195b2063b2530961d4b73dd08de3242 (http://svn.webkit.org/repository/webkit/trunk@135485) Change-Id: I03774e5ac79721c13ffa30d152537a74d0b12e66 Reviewed-by: Simon Hausmann --- Source/WebKit/chromium/ChangeLog | 1789 ++++++++++++++++++++ Source/WebKit/chromium/DEPS | 4 +- Source/WebKit/chromium/WebKit.gyp | 12 +- Source/WebKit/chromium/WebKit.gypi | 4 +- Source/WebKit/chromium/WebKitUnitTests.gyp | 1 + Source/WebKit/chromium/features.gypi | 9 +- .../WebKit/chromium/public/WebAccessibilityRole.h | 1 + Source/WebKit/chromium/public/WebContextMenuData.h | 2 + Source/WebKit/chromium/public/WebCursorInfo.h | 2 + Source/WebKit/chromium/public/WebDOMCustomEvent.h | 49 + .../chromium/public/WebDateTimeChooserCompletion.h | 51 + .../chromium/public/WebDateTimeChooserParams.h | 86 + Source/WebKit/chromium/public/WebFrameClient.h | 13 + Source/WebKit/chromium/public/WebIDBDatabase.h | 6 - Source/WebKit/chromium/public/WebIDBObjectStore.h | 9 - Source/WebKit/chromium/public/WebIDBTransaction.h | 5 - Source/WebKit/chromium/public/WebInputElement.h | 1 + Source/WebKit/chromium/public/WebNode.h | 2 + .../WebKit/chromium/public/WebPasswordFormData.h | 8 + Source/WebKit/chromium/public/WebPluginContainer.h | 12 + Source/WebKit/chromium/public/WebRuntimeFeatures.h | 5 - Source/WebKit/chromium/public/WebSettings.h | 10 +- Source/WebKit/chromium/public/WebView.h | 2 + Source/WebKit/chromium/public/WebViewClient.h | 9 + .../public/platform/WebICECandidateDescriptor.h | 26 - .../chromium/public/platform/WebICEOptions.h | 26 - .../chromium/public/platform/WebMediaHints.h | 26 - .../public/platform/WebPeerConnection00Handler.h | 26 - .../platform/WebPeerConnection00HandlerClient.h | 26 - .../public/platform/WebPeerConnectionHandler.h | 26 - .../platform/WebPeerConnectionHandlerClient.h | 26 - .../platform/WebSessionDescriptionDescriptor.h | 26 - .../public/platform/default/WebThemeEngine.h | 31 + Source/WebKit/chromium/skia_webkit.gyp | 4 +- Source/WebKit/chromium/src/AssertMatchingEnums.cpp | 138 +- Source/WebKit/chromium/src/ChromeClientImpl.cpp | 40 +- .../chromium/src/ColorChooserPopupUIController.cpp | 157 ++ .../chromium/src/ColorChooserPopupUIController.h | 72 + .../chromium/src/ColorChooserUIController.cpp | 101 +- .../WebKit/chromium/src/ColorChooserUIController.h | 22 +- .../WebKit/chromium/src/ContextMenuClientImpl.cpp | 13 +- Source/WebKit/chromium/src/DateTimeChooserImpl.cpp | 20 +- .../chromium/src/ExternalDateTimeChooser.cpp | 137 ++ .../WebKit/chromium/src/ExternalDateTimeChooser.h | 64 + .../WebKit/chromium/src/FrameLoaderClientImpl.cpp | 16 + Source/WebKit/chromium/src/FrameLoaderClientImpl.h | 5 + .../chromium/src/FrameNetworkingContextImpl.cpp | 51 + .../chromium/src/FrameNetworkingContextImpl.h | 3 + Source/WebKit/chromium/src/IDBCallbacksProxy.cpp | 1 + .../chromium/src/IDBDatabaseBackendProxy.cpp | 19 - .../WebKit/chromium/src/IDBDatabaseBackendProxy.h | 2 - .../chromium/src/IDBObjectStoreBackendProxy.cpp | 55 - .../chromium/src/IDBObjectStoreBackendProxy.h | 6 - .../chromium/src/IDBTransactionBackendProxy.cpp | 8 - .../chromium/src/IDBTransactionBackendProxy.h | 1 - Source/WebKit/chromium/src/InspectorClientImpl.cpp | 10 + Source/WebKit/chromium/src/InspectorClientImpl.h | 3 + Source/WebKit/chromium/src/LinkHighlight.cpp | 12 +- Source/WebKit/chromium/src/LinkHighlight.h | 1 + Source/WebKit/chromium/src/PageWidgetDelegate.cpp | 8 +- Source/WebKit/chromium/src/PageWidgetDelegate.h | 2 +- Source/WebKit/chromium/src/PlatformSupport.cpp | 94 +- Source/WebKit/chromium/src/WebArrayBuffer.cpp | 2 +- Source/WebKit/chromium/src/WebBlob.cpp | 2 +- .../chromium/src/WebCompositorInputHandlerImpl.cpp | 30 +- .../chromium/src/WebCompositorInputHandlerImpl.h | 12 +- Source/WebKit/chromium/src/WebCursorInfo.cpp | 11 +- Source/WebKit/chromium/src/WebDOMCustomEvent.cpp | 51 + Source/WebKit/chromium/src/WebDocument.cpp | 5 +- Source/WebKit/chromium/src/WebElement.cpp | 7 +- Source/WebKit/chromium/src/WebFrameImpl.cpp | 26 +- Source/WebKit/chromium/src/WebIDBDatabaseImpl.cpp | 16 - Source/WebKit/chromium/src/WebIDBDatabaseImpl.h | 2 - Source/WebKit/chromium/src/WebIDBKey.cpp | 1 - .../WebKit/chromium/src/WebIDBObjectStoreImpl.cpp | 54 - Source/WebKit/chromium/src/WebIDBObjectStoreImpl.h | 5 - .../WebKit/chromium/src/WebIDBTransactionImpl.cpp | 8 - Source/WebKit/chromium/src/WebIDBTransactionImpl.h | 1 - Source/WebKit/chromium/src/WebInputElement.cpp | 5 + Source/WebKit/chromium/src/WebNode.cpp | 24 +- Source/WebKit/chromium/src/WebPagePopupImpl.cpp | 4 +- Source/WebKit/chromium/src/WebPasswordFormData.cpp | 1 + .../WebKit/chromium/src/WebPluginContainerImpl.cpp | 39 +- .../WebKit/chromium/src/WebPluginContainerImpl.h | 4 + Source/WebKit/chromium/src/WebRuntimeFeatures.cpp | 36 - .../src/WebSessionDescriptionDescriptor.cpp | 92 - Source/WebKit/chromium/src/WebSettingsImpl.cpp | 26 +- Source/WebKit/chromium/src/WebSettingsImpl.h | 18 +- Source/WebKit/chromium/src/WebViewImpl.cpp | 123 +- Source/WebKit/chromium/src/WebViewImpl.h | 27 +- Source/WebKit/chromium/tests/DecimalTest.cpp | 8 +- .../chromium/tests/DeferredImageDecoderTest.cpp | 118 +- Source/WebKit/chromium/tests/FakeWebPlugin.cpp | 60 + Source/WebKit/chromium/tests/FakeWebPlugin.h | 78 + .../chromium/tests/GraphicsLayerChromiumTest.cpp | 2 - .../chromium/tests/IDBAbortOnCorruptTest.cpp | 1 + .../chromium/tests/IDBBindingUtilitiesTest.cpp | 4 +- Source/WebKit/chromium/tests/IDBFakeBackingStore.h | 13 +- .../WebKit/chromium/tests/IDBLevelDBCodingTest.cpp | 19 +- Source/WebKit/chromium/tests/IDBRequestTest.cpp | 1 + Source/WebKit/chromium/tests/LevelDBTest.cpp | 95 +- Source/WebKit/chromium/tests/LocaleMacTest.cpp | 31 + .../chromium/tests/MemoryInstrumentationTest.cpp | 104 -- Source/WebKit/chromium/tests/MockImageDecoder.h | 14 +- .../WebKit/chromium/tests/TransparencyWinTest.cpp | 8 +- .../tests/WebCompositorInputHandlerImplTest.cpp | 34 +- Source/WebKit/chromium/tests/WebFrameTest.cpp | 51 +- .../chromium/tests/WebPluginContainerTest.cpp | 117 ++ .../chromium/tests/data/plugin_container.html | 24 + .../chromium/tests/data/scale_oscillate.html | 16 + 110 files changed, 3668 insertions(+), 1158 deletions(-) create mode 100644 Source/WebKit/chromium/public/WebDOMCustomEvent.h create mode 100644 Source/WebKit/chromium/public/WebDateTimeChooserCompletion.h create mode 100644 Source/WebKit/chromium/public/WebDateTimeChooserParams.h delete mode 100644 Source/WebKit/chromium/public/platform/WebICECandidateDescriptor.h delete mode 100644 Source/WebKit/chromium/public/platform/WebICEOptions.h delete mode 100644 Source/WebKit/chromium/public/platform/WebMediaHints.h delete mode 100644 Source/WebKit/chromium/public/platform/WebPeerConnection00Handler.h delete mode 100644 Source/WebKit/chromium/public/platform/WebPeerConnection00HandlerClient.h delete mode 100644 Source/WebKit/chromium/public/platform/WebPeerConnectionHandler.h delete mode 100644 Source/WebKit/chromium/public/platform/WebPeerConnectionHandlerClient.h delete mode 100644 Source/WebKit/chromium/public/platform/WebSessionDescriptionDescriptor.h create mode 100644 Source/WebKit/chromium/public/platform/default/WebThemeEngine.h create mode 100644 Source/WebKit/chromium/src/ColorChooserPopupUIController.cpp create mode 100644 Source/WebKit/chromium/src/ColorChooserPopupUIController.h create mode 100644 Source/WebKit/chromium/src/ExternalDateTimeChooser.cpp create mode 100644 Source/WebKit/chromium/src/ExternalDateTimeChooser.h create mode 100644 Source/WebKit/chromium/src/FrameNetworkingContextImpl.cpp create mode 100644 Source/WebKit/chromium/src/WebDOMCustomEvent.cpp delete mode 100644 Source/WebKit/chromium/src/WebSessionDescriptionDescriptor.cpp create mode 100644 Source/WebKit/chromium/tests/FakeWebPlugin.cpp create mode 100644 Source/WebKit/chromium/tests/FakeWebPlugin.h delete mode 100644 Source/WebKit/chromium/tests/MemoryInstrumentationTest.cpp create mode 100644 Source/WebKit/chromium/tests/WebPluginContainerTest.cpp create mode 100644 Source/WebKit/chromium/tests/data/plugin_container.html create mode 100644 Source/WebKit/chromium/tests/data/scale_oscillate.html (limited to 'Source/WebKit/chromium') diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog index b6dc5c975..d4d3171f0 100644 --- a/Source/WebKit/chromium/ChangeLog +++ b/Source/WebKit/chromium/ChangeLog @@ -1,3 +1,1792 @@ +2012-11-21 Tien-Ren Chen + + [chromium] Device scale factor should be no-op when applyDeviceScaleFactorInCompositor == 0 + https://bugs.webkit.org/show_bug.cgi?id=100061 + + Reviewed by Adam Barth. + + On Android we're using a different pixel scaling implementation + (WebCore::Settings::applyDefaultDeviceScaleFactorInCompositor() == 0) than other + platforms. In this mode, we don't make use of device-independent pixels. Device + scale factor is provided to WebKit and get merged into page scale factor. Other + than that device scale factor should have no effects on rendering. + + * src/PageWidgetDelegate.cpp: + (WebKit::PageWidgetDelegate::paint): + * src/PageWidgetDelegate.h: + * src/WebPagePopupImpl.cpp: + (WebKit::WebPagePopupImpl::paint): + * src/WebViewImpl.cpp: + (WebKit::WebViewImpl::paint): + (WebKit::WebViewImpl::shouldApplyDeviceScaleFactorInCompositor): + (WebKit): + * src/WebViewImpl.h: + (WebViewImpl): + +2012-11-21 Tien-Ren Chen + + Use m_webView->size() for viewport update + https://bugs.webkit.org/show_bug.cgi?id=102764 + + Reviewed by Adam Barth. + + m_webView->client()->windowRect() returns the outer rect of the browser + window, which includes the decorations such as the title bar. + We should use the size of the WebView for layout and rendering purpose. + + Existing tests are updated to work without windowRect(). + + * src/ChromeClientImpl.cpp: + (WebKit::ChromeClientImpl::dispatchViewportPropertiesDidChange): + * tests/WebFrameTest.cpp: + +2012-11-21 Peter Beverloo + + [Chromium] webkit_unit_tests should depend on forwarder2 for Android + https://bugs.webkit.org/show_bug.cgi?id=102934 + + Reviewed by Tony Chang. + + Running webkit_unit_tests and TestWebKitAPI in the WebKit tree will defer + to the test runner used by Chromium, which in turn relies on forwarder2. + forwarder2 will eventually be required by layout tests as well. + + * WebKitUnitTests.gyp: + +2012-11-21 Sheriff Bot + + Unreviewed, rolling out r135409. + http://trac.webkit.org/changeset/135409 + https://bugs.webkit.org/show_bug.cgi?id=102959 + + This patch causes compiling error to Chromium build (Requested + by jianli_ on #webkit). + + * tests/IDBRequestTest.cpp: + (WebCore::TEST): + +2012-11-21 Kevin Ellis + + [chromium] Add flag to enable/disable touch adjustment at runtime. + https://bugs.webkit.org/show_bug.cgi?id=102534 + + Reviewed by Antonio Gomes. + + Add setting for enabling or disabling touch adjustment. + For touch adjustemnt to apply, the compile option must + also be enabled. + + * public/WebSettings.h: + * src/WebSettingsImpl.cpp: + (WebKit::WebSettingsImpl::setEnableTouchAdjustment): + (WebKit): + * src/WebSettingsImpl.h: + (WebSettingsImpl): + +2012-11-21 Dan Carney + + IDBRequestTest needs a v8 context + https://bugs.webkit.org/show_bug.cgi?id=102941 + + Reviewed by Jochen Eisinger. + + Added v8 context to IDBRequestTest tests. + + * tests/IDBRequestTest.cpp: + (IDBRequestTest): + (WebKit::IDBRequestTest::IDBRequestTest): + (WebKit::IDBRequestTest::context): + (WebKit::IDBRequestTest::scriptExecutionContext): + (WebKit): + (WebKit::TEST_F): + +2012-11-21 Peter Beverloo + + Unreviewed. Rolled DEPS. + + * DEPS: + +2012-11-21 Allan Sandfeld Jensen + + Disambiguate innerNodeFramePoint and mainFramePoint + https://bugs.webkit.org/show_bug.cgi?id=98139 + + Reviewed by Julien Chaffraix. + + * src/ChromeClientImpl.cpp: + (WebKit::ChromeClientImpl::mouseDidMoveOverElement): + * src/ContextMenuClientImpl.cpp: + (WebKit::selectMisspelledWord): + (WebKit::ContextMenuClientImpl::getCustomMenuFromDefaultItems): + * src/WebFrameImpl.cpp: + (WebKit::WebFrameImpl::characterIndexForPoint): + +2012-11-21 W. James MacLean + + [chromium] Link highlight should display for at least 100ms, and fadeout on GestureTap/Longpress. + https://bugs.webkit.org/show_bug.cgi?id=102823 + + Reviewed by Adrienne Walker. + + Link highlights sometimes disappear so quickly they barely display. Modify + so that the highlight is displayed for minimum 100ms before fading out, and + also fadeout (as opposed to abrupt clear) on GestureTap and GestureLongPress. + + * src/LinkHighlight.cpp: + (WebKit::LinkHighlight::LinkHighlight): + (WebKit::LinkHighlight::startHighlightAnimationIfNeeded): Check if min duration achieved, if not add time to fadeout animation. + * src/LinkHighlight.h: + (LinkHighlight): + * src/WebViewImpl.cpp: + (WebKit::WebViewImpl::handleGestureEvent): Fadeout instead of clear on GestureTap and GestureLongPress. + +2012-11-21 Yury Semikhatsky + + Unreviewed. Now that offending patch has been rolled out reenable IDBRequestTest.EventsAfterStopping + https://bugs.webkit.org/show_bug.cgi?id=102929 + + * tests/IDBRequestTest.cpp: + (WebCore::TEST): + +2012-11-21 Yury Semikhatsky + + Unreviewed. Disable failing test. + https://bugs.webkit.org/show_bug.cgi?id=102929 + + * tests/IDBRequestTest.cpp: + (WebCore::TEST): + +2012-11-21 Florin Malita + + [Skia] Encapsulate access to PlatformContextSkia's SkCanvas + https://bugs.webkit.org/show_bug.cgi?id=102694 + + Reviewed by Stephen White. + + Use PlatformContextSkia's wrapper methods instead of accessing the canvas directly. + + * tests/TransparencyWinTest.cpp: + (WebCore::getPixelAt): + (WebCore::clearTopLayerAlphaChannel): + (WebCore::clearTopLayerAlphaPixel): + (WebCore::TEST): + +2012-11-20 Rachel Blum + + [Chromium] Need spellcheck suggestions even if continuous check is off. + https://bugs.webkit.org/show_bug.cgi?id=102535 + + Reviewed by Hajime Morita. + + Make sure the context menu always has suggestions for misspelled words. + + * src/ContextMenuClientImpl.cpp: + (WebKit::ContextMenuClientImpl::getCustomMenuFromDefaultItems): + +2012-11-20 Robert Kroeger + + [chromium] Use embedder-supported gesture curves + https://bugs.webkit.org/show_bug.cgi?id=100884 + + Reviewed by James Robinson. + + Use embedder-provided gesture animation curves via WebKit api interfaces. + Tested by existing tests. + + * src/WebCompositorInputHandlerImpl.cpp: + (WebKit::WebCompositorInputHandlerImpl::handleGestureFling): + (WebKit::WebCompositorInputHandlerImpl::scrollBy): + * src/WebCompositorInputHandlerImpl.h: + (WebCompositorInputHandlerImpl): + * src/WebViewImpl.cpp: + (WebKit::WebViewImpl::scrollBy): + (WebKit::WebViewImpl::handleGestureEvent): + (WebKit::WebViewImpl::transferActiveWheelFlingAnimation): + * src/WebViewImpl.h: + (WebCore): + (WebKit): + (WebViewImpl): + +2012-11-20 Tony Chang + + When calling DocumentStyleSheetCollection::addUserSheet, pass in a user sheet + https://bugs.webkit.org/show_bug.cgi?id=102835 + + Reviewed by Ojan Vafai. + + After r135082, Chromium browser_tests were triggering the ASSERT in + StyleResolver::collectRulesFromUserStyleSheets. Add an ASSERT that will + trigger earlier and make it clear in the Chromium code that we're always + inserting user level styles. + + * src/WebDocument.cpp: + (WebKit::WebDocument::insertUserStyleSheet): + +2012-11-20 Istiaque Ahmed + + Provide page/window coordinates to plugin's local coordinates translation in WebPluginContainer. + https://bugs.webkit.org/show_bug.cgi?id=102339 + + Reviewed by Adam Barth. + + This change will allow converting a page's window coordinates to plugins's local coordinates, + taking CSS transformations into account. Embedder page of the plugin can use this information + for targetting elements inside the plugin (e.g. devtools can inspect a specific element at the + local coordinate position inside plugin). + + * WebKit.gyp: + * WebKit.gypi: + * public/WebNode.h: + (WebKit): + * public/WebPluginContainer.h: + (WebKit): + (WebPluginContainer): + * src/WebFrameImpl.cpp: + (WebKit::WebFrameImpl::executeCommand): + (WebKit::WebFrameImpl::printBegin): + (WebKit::WebFrameImpl::isPrintScalingDisabledForPlugin): + * src/WebNode.cpp: + (WebKit::WebNode::pluginContainer): + (WebKit): + * src/WebPluginContainerImpl.cpp: + (WebKit::WebPluginContainerImpl::windowToLocalPoint): + (WebKit): + * src/WebPluginContainerImpl.h: + (WebPluginContainerImpl): + * tests/FakeWebPlugin.cpp: Added. + (WebKit): + (WebKit::FakeWebPlugin::FakeWebPlugin): + (WebKit::FakeWebPlugin::~FakeWebPlugin): + (WebKit::FakeWebPlugin::initialize): + (WebKit::FakeWebPlugin::destroy): + * tests/FakeWebPlugin.h: Added. + (WebKit): + (FakeWebPlugin): + * tests/WebPluginContainerTest.cpp: Added. + (WebKit): + (WebPluginContainerTest): + (WebKit::WebPluginContainerTest::WebPluginContainerTest): + (WebKit::WebPluginContainerTest::TearDown): + (WebKit::getWebPluginContainer): + (WebKit::TEST_F): + * tests/data/plugin_container.html: Added. + +2012-11-20 Alpha Lam + + [chromium] Make lazy image decoding thread-safe + https://bugs.webkit.org/show_bug.cgi?id=102721 + + Reviewed by Stephen White. + + Added a new unit test to verify that lazy image decoding operates + correctly on non-main threads. + + * tests/DeferredImageDecoderTest.cpp: + (Rasterizer): + (WebCore): + (WebCore::rasterizeMain): + (WebCore::TEST_F): + +2012-11-20 Sheriff Bot + + Unreviewed, rolling out r135295. + http://trac.webkit.org/changeset/135295 + https://bugs.webkit.org/show_bug.cgi?id=102834 + + This patch causes assertion to some layout tests on chromium + (Requested by jianli on #webkit). + + * src/WebFrameImpl.cpp: + (WebKit::WebFrameImpl::loadRequest): + (WebKit::WebFrameImpl::loadData): + * src/WebSharedWorkerImpl.cpp: + (WebKit::WebSharedWorkerImpl::initializeLoader): + +2012-11-20 Eberhard Graether + + [Chromium] fix FPS counter disappearing when changing page + https://bugs.webkit.org/show_bug.cgi?id=102532 + + Reviewed by Pavel Feldman. + + When changing the page with opened WebInspector and active FPS counter the WebInspector is + reloaded before the WebView switches to accelerated compositing, so the showFPSCounter call + to WebLayerTreeView is not yet possible. This fix saves the showFPSCounter value in the + WebSettings so it can be read when accelerated compositing is activated. + + * src/WebViewImpl.cpp: + (WebKit::WebViewImpl::setShowFPSCounter): + +2012-11-20 James Simonsen + + Consolidate FrameLoader::load() into one function taking a FrameLoadRequest + https://bugs.webkit.org/show_bug.cgi?id=102151 + + Reviewed by Adam Barth. + + * src/WebFrameImpl.cpp: + (WebKit::WebFrameImpl::loadRequest): + (WebKit::WebFrameImpl::loadData): + * src/WebSharedWorkerImpl.cpp: + (WebKit::WebSharedWorkerImpl::initializeLoader): + +2012-11-19 Yury Semikhatsky + + Unreviewed. Fix Chromium Win compilation after r135196. + https://bugs.webkit.org/show_bug.cgi?id=102021 + + * tests/DeferredImageDecoderTest.cpp: changed char to unsigned char in the array + declaration to avoid 'warning C4309' on MSVS when initializing from hex literals. + (WebCore): + +2012-11-19 Miguel Garcia + + [Chromium] Remove the dependency of INPUT_TYPE_COLOR on PAGE_POPUP + https://bugs.webkit.org/show_bug.cgi?id=102525 + + Reviewed by Kent Tamura. + + INPUT_TYPE_COLOR should not depend on PAGE_POPUP, with this change we allow platforms like android to implement the former without depending on the latter. + + Tested by compiling chromium with and without ENABLE_PAGE_POPUP and made sure that forms with input type color would load in both cases. + + * WebKit.gyp: + * src/ChromeClientImpl.cpp: + (WebKit::ChromeClientImpl::createColorChooser): + * src/ColorChooserUIController.cpp: + (WebKit::ColorChooserUIController::ColorChooserUIController): + (WebKit::ColorChooserUIController::openUI): + (WebKit): + (WebKit::ColorChooserUIController::endChooser): + * src/ColorChooserUIController.h: + (ColorChooserUIController): + +2012-11-19 Alpha Lam + + [chromium] Lazy image decoding without cache + https://bugs.webkit.org/show_bug.cgi?id=102021 + + Reviewed by Stephen White. + + Updated two test cases using real image data. + + The tests demonstrates that original image decoder is not used and + image is decoded lazily with correct pixel results. + + * tests/DeferredImageDecoderTest.cpp: + (WebCore): + (WebCore::DeferredImageDecoderTest::SetUp): + (WebCore::DeferredImageDecoderTest::decoderBeingDestroyed): + (DeferredImageDecoderTest): + (WebCore::TEST_F): + * tests/MockImageDecoder.h: + (MockImageDecoderClient): + (WebCore): + (WebCore::MockImageDecoder::MockImageDecoder): + (WebCore::MockImageDecoder::~MockImageDecoder): + (MockImageDecoder): + +2012-11-19 Sheriff Bot + + Unreviewed, rolling out r135180. + http://trac.webkit.org/changeset/135180 + https://bugs.webkit.org/show_bug.cgi?id=102700 + + breaks ui/compositor build (Requested by danakj on #webkit). + + * tests/GraphicsLayerChromiumTest.cpp: + (WebKit::GraphicsLayerChromiumTest::GraphicsLayerChromiumTest): + +2012-11-19 Yusuke Sato + + [Chromium] Flash cannot receive scroll events when threaded compositing is in use + https://bugs.webkit.org/show_bug.cgi?id=101423 + + Reviewed by James Robinson. + + Add setWantsWheelEvents() to Chromium's WebPluginContainer interface so that a plugin can tell the + container that the plugin always wants to handle wheel events even when a scroll bar is not shown. + + * public/WebPluginContainer.h: + (WebPluginContainer): + * src/WebPluginContainerImpl.cpp: + (WebKit::WebPluginContainerImpl::setWantsWheelEvents): + (WebKit): + (WebKit::WebPluginContainerImpl::wantsWheelEvents): + (WebKit::WebPluginContainerImpl::WebPluginContainerImpl): + * src/WebPluginContainerImpl.h: + (WebPluginContainerImpl): + +2012-11-19 Alec Flett + + IndexedDB: simplify RecordIdentifier + https://bugs.webkit.org/show_bug.cgi?id=102018 + + Reviewed by Tony Chang. + + Update IDBFakeBackingStore to match its parent class. + + * tests/IDBFakeBackingStore.h: + +2012-11-19 Vincent Scheib + + [Chromium] Remove WebKit::WebRuntimeFeatures::enablePointerLock. + https://bugs.webkit.org/show_bug.cgi?id=96946 + + Reviewed by Adam Barth. + + The runtime flag functionality has already been removed. + Now that Chromium no longer has a compile dependency on this + API, it can be removed as well. + + * public/WebRuntimeFeatures.h: + (WebRuntimeFeatures): + * src/WebRuntimeFeatures.cpp: + +2012-11-19 Kihong Kwon + + Add PROXIMITY_EVENTS feature + https://bugs.webkit.org/show_bug.cgi?id=102658 + + Reviewed by Kentaro Hara. + + Add PROXIMITY_EVENTS feature to chromium port. + + * features.gypi: + +2012-11-19 Sami Kyostila + + [chromium] Use devicePixelRatio instead of screen DPI for computing viewport attributes + https://bugs.webkit.org/show_bug.cgi?id=101767 + + Reviewed by Adam Barth. + + Use the newly introduced device scale factor to calculate viewport properties + instead of using the screen DPI. No functional changes, because Chromium + platforms that have VIEWPORT enabled now also initialize the device scale + factor accordingly. + + * src/ChromeClientImpl.cpp: + (WebKit::ChromeClientImpl::dispatchViewportPropertiesDidChange): + * tests/WebFrameTest.cpp: + +2012-11-18 Kentaro Hara + + Unreviewed, rolling out r135047. + http://trac.webkit.org/changeset/135047 + https://bugs.webkit.org/show_bug.cgi?id=102339 + + it broke Chromium Windows/Mac build + + * WebKit.gyp: + * WebKit.gypi: + * public/WebNode.h: + (WebKit): + * public/WebPluginContainer.h: + (WebKit): + (WebPluginContainer): + * src/WebFrameImpl.cpp: + (WebKit::pluginContainerFromNode): + (WebKit): + (WebKit::WebFrameImpl::executeCommand): + (WebKit::WebFrameImpl::printBegin): + (WebKit::WebFrameImpl::isPrintScalingDisabledForPlugin): + * src/WebNode.cpp: + * src/WebPluginContainerImpl.cpp: + * src/WebPluginContainerImpl.h: + (WebPluginContainerImpl): + * tests/FakeWebPlugin.cpp: Removed. + * tests/FakeWebPlugin.h: Removed. + * tests/WebPluginContainerTest.cpp: Removed. + * tests/data/plugin_container.html: Removed. + +2012-11-18 Rick Byers + + [chromium] add WebCursorInfo::imageScaleFactor + https://bugs.webkit.org/show_bug.cgi?id=102612 + + Reviewed by Adam Barth. + + Add cursor image scale factor (currently always 1) to chromium API, in preparation for + high-dpi cursor support in bug 99493. + + * public/WebCursorInfo.h: + (WebKit::WebCursorInfo::WebCursorInfo): + * src/WebCursorInfo.cpp: + (WebKit::WebCursorInfo::WebCursorInfo): + +2012-11-17 Sheriff Bot + + Unreviewed. Rolled DEPS. + + * DEPS: + +2012-11-17 Istiaque Ahmed + + Provide page/window coordinates to plugin's local coordinates translation in WebPluginContainer. + https://bugs.webkit.org/show_bug.cgi?id=102339 + + Reviewed by Adam Barth. + + This change will allow converting a page's window coordinates to plugins's local coordinates, + taking CSS transformations into account. Embedder page of the plugin can use this information + for targetting elements inside the plugin (e.g. devtools can inspect a specific element at the + local coordinate position inside plugin). + Attempting to re-land after Windows build fix. + + * WebKit.gyp: + * WebKit.gypi: + * public/WebNode.h: + (WebKit): + * public/WebPluginContainer.h: + (WebKit): + (WebPluginContainer): + * src/WebFrameImpl.cpp: + (WebKit::WebFrameImpl::executeCommand): + (WebKit::WebFrameImpl::printBegin): + (WebKit::WebFrameImpl::isPrintScalingDisabledForPlugin): + * src/WebNode.cpp: + (WebKit::WebNode::pluginContainer): + (WebKit): + * src/WebPluginContainerImpl.cpp: + (WebKit::WebPluginContainerImpl::windowToLocalPoint): + (WebKit): + * src/WebPluginContainerImpl.h: + (WebPluginContainerImpl): + * tests/FakeWebPlugin.cpp: Added. + (WebKit): + (WebKit::FakeWebPlugin::FakeWebPlugin): + (WebKit::FakeWebPlugin::~FakeWebPlugin): + (WebKit::FakeWebPlugin::initialize): + (WebKit::FakeWebPlugin::destroy): + * tests/FakeWebPlugin.h: Added. + (WebKit): + (FakeWebPlugin): + * tests/WebPluginContainerTest.cpp: Added. + (WebKit): + (WebPluginContainerTest): + (WebKit::WebPluginContainerTest::WebPluginContainerTest): + (WebKit::WebPluginContainerTest::TearDown): + (WebKit::getWebPluginContainer): + (WebKit::TEST_F): + * tests/data/plugin_container.html: Added. + +2012-11-16 Raman Kumar + + Add setChecked API in WebInputElement + https://bugs.webkit.org/show_bug.cgi?id=102422 + + Reviewed by Adam Barth. + + * public/WebInputElement.h: + (WebInputElement): Add setChecked(bool, bool) API + * src/WebInputElement.cpp: + (WebKit::WebInputElement::setChecked): Implement setChecked by calling + underlying HTMLInputElement's setChecked. + (WebKit): + +2012-11-16 Tony Chang + + Remove ENABLE_CSS_HIERARCHIES since it's no longer in use + https://bugs.webkit.org/show_bug.cgi?id=102554 + + Reviewed by Andreas Kling. + + As mentioned in https://bugs.webkit.org/show_bug.cgi?id=79939#c41 , + we're going to revist this feature once additional vendor support is + achieved. + + * features.gypi: + +2012-11-16 Mark Pilgrim + + [Chromium] Remove cookie-related functions from PlatformSupport + https://bugs.webkit.org/show_bug.cgi?id=99340 + + Reviewed by Adam Barth. + + Move cookie-related functions out of PlatformSupport and implement + new PlatformCookieJar interface via NetworkContext. + + * WebKit.gyp: + * src/FrameNetworkingContextImpl.cpp: Added. + (WebKit): + (WebKit::FrameNetworkingContextImpl::cookieJar): + * src/FrameNetworkingContextImpl.h: + (FrameNetworkingContextImpl): + * src/PlatformSupport.cpp: + +2012-11-16 Tien-Ren Chen + + Rename applyDefaultDeviceScaleFactorInCompositor to setApplyDeviceScaleFactorInCompositor + https://bugs.webkit.org/show_bug.cgi?id=102462 + + Reviewed by James Robinson. + + As we no longer have this "default" device scale factor. + + * public/WebSettings.h: + (WebKit::WebSettings::setApplyDefaultDeviceScaleFactorInCompositor): + * src/WebSettingsImpl.cpp: + (WebKit::WebSettingsImpl::WebSettingsImpl): + (WebKit::WebSettingsImpl::setApplyDeviceScaleFactorInCompositor): + * src/WebSettingsImpl.h: + (WebSettingsImpl): + (WebKit::WebSettingsImpl::applyDeviceScaleFactorInCompositor): + * src/WebViewImpl.cpp: + (WebKit::WebViewImpl::setDeviceScaleFactor): + (WebKit::WebViewImpl::setIsAcceleratedCompositingActive): + +2012-11-16 Jon Lee + + Fix build error on Chromium due to r134995. + + * src/WebNode.cpp: + (WebKit::WebNode::simulateClick): Pass in NULL pointer instead. + +2012-11-16 Michael Pruett + + IndexedDB: Propagate DOMRequestState to IndexedDB binding utility functions + https://bugs.webkit.org/show_bug.cgi?id=102430 + + Reviewed by Adam Barth. + + DOMRequestState is currently propagated to some but not all of + the IndexedDB binding utility functions. In order to implement + these functions for JSC, this state must be propagated to all + of the utility functions. + + * tests/IDBBindingUtilitiesTest.cpp: + (WebKit::checkKeyFromValueAndKeyPathInternal): + (WebKit::injectKey): + +2012-11-16 Tommy Widenflycht + + MediaStream API: Update RTCPeerConnection states to match the latest editors draft + https://bugs.webkit.org/show_bug.cgi?id=102382 + + Reviewed by Adam Barth. + + Updating readyState & iceState, and adding iceGatheringState. + + * src/AssertMatchingEnums.cpp: + +2012-11-16 Dimitri Glazkov + + Unreviewed, rolling out r134973. + http://trac.webkit.org/changeset/134973 + https://bugs.webkit.org/show_bug.cgi?id=99340 + + Broke compile on at least Mac and Linux. + + * WebKit.gyp: + * src/FrameNetworkingContextImpl.h: + * src/PlatformSupport.cpp: + (WebCore::getCookieJar): + (WebCore): + (WebCore::PlatformSupport::setCookies): + (WebCore::PlatformSupport::cookies): + (WebCore::PlatformSupport::cookieRequestHeaderFieldValue): + (WebCore::PlatformSupport::rawCookies): + (WebCore::PlatformSupport::deleteCookie): + (WebCore::PlatformSupport::cookiesEnabled): + +2012-11-16 Mark Pilgrim + + [Chromium] Remove cookie-related functions from PlatformSupport + https://bugs.webkit.org/show_bug.cgi?id=99340 + + Reviewed by Adam Barth. + + Move cookie-related functions out of PlatformSupport and implement + new PlatformCookieJar interface via NetworkContext. + + * WebKit.gyp: + * src/FrameNetworkingContextImpl.cpp: Added. + (WebKit): + (WebKit::FrameNetworkingContextImpl::cookieJar): + * src/FrameNetworkingContextImpl.h: + (FrameNetworkingContextImpl): + * src/PlatformSupport.cpp: + +2012-11-16 Scott Violet + + [chromium] Copy linux theme related files to default + https://bugs.webkit.org/show_bug.cgi?id=102403 + + Reviewed by Tony Chang + + Transitional patch that copies linux WebThemeEngine to default directory. + + No new tests, refactoring only. + + * features.gypi: + * public/platform/default: Added. + * public/platform/default/WebThemeEngine.h: Copied from Source/WebKit/chromium/public/platform/linux/WebThemeEngine.h. + * src/PlatformSupport.cpp: Includes correct theme files when DEFAULT_RENDER_THEME is set. + (WebCore): + * src/WebViewImpl.cpp: Includes correct theme files when DEFAULT_RENDER_THEME is set. + (WebKit::WebViewImpl::setScrollbarColors): Calls to default theme as necessary. + (WebKit::WebViewImpl::setSelectionColors): Calls to default theme as necessary. + +2012-11-16 Robert Flack + + Handle gesture events on scrollbars. + https://bugs.webkit.org/show_bug.cgi?id=101516 + + Reviewed by Antonio Gomes. + + Adds a gesture event handler to scrollbars and sends gestures beginning + over a scrollbar to this handler to allow touch scrolling scrollbars. + + * src/WebViewImpl.cpp: + (WebKit::WebViewImpl::handleGestureEvent): + +2012-11-16 Peter Beverloo + + Unreviewed. Rolled DEPS. + + * DEPS: + +2012-11-15 Kentaro Hara + + Unreviewed, rolling out r134880. + http://trac.webkit.org/changeset/134880 + https://bugs.webkit.org/show_bug.cgi?id=102339 + + it broke Chromium Windows build + + * WebKit.gyp: + * WebKit.gypi: + * public/WebNode.h: + (WebKit): + * public/WebPluginContainer.h: + (WebKit): + (WebPluginContainer): + * src/WebFrameImpl.cpp: + (WebKit::pluginContainerFromNode): + (WebKit): + (WebKit::WebFrameImpl::executeCommand): + (WebKit::WebFrameImpl::printBegin): + (WebKit::WebFrameImpl::isPrintScalingDisabledForPlugin): + * src/WebNode.cpp: + * src/WebPluginContainerImpl.cpp: + * src/WebPluginContainerImpl.h: + (WebPluginContainerImpl): + * tests/FakeWebPlugin.cpp: Removed. + * tests/FakeWebPlugin.h: Removed. + * tests/WebPluginContainerTest.cpp: Removed. + * tests/data/plugin_container.html: Removed. + +2012-11-15 Istiaque Ahmed + + Provide page/window coordinates to plugin's local coordinates translation in WebPluginContainer. + https://bugs.webkit.org/show_bug.cgi?id=102339 + + Reviewed by Adam Barth. + + This change will allow converting a page's window coordinates to plugins's local coordinates, + taking CSS transformations into account. Embedder page of the plugin can use this information + for targetting elements inside the plugin (e.g. devtools can inspect a specific element at the + local coordinate position inside plugin). + + * WebKit.gyp: + * WebKit.gypi: + * public/WebNode.h: + (WebKit): + * public/WebPluginContainer.h: + (WebKit): + (WebPluginContainer): + * src/WebFrameImpl.cpp: + (WebKit::WebFrameImpl::executeCommand): + (WebKit::WebFrameImpl::printBegin): + (WebKit::WebFrameImpl::isPrintScalingDisabledForPlugin): + * src/WebNode.cpp: + (WebKit::WebNode::pluginContainer): + (WebKit): + * src/WebPluginContainerImpl.cpp: + (WebKit::WebPluginContainerImpl::windowToLocalPoint): + (WebKit): + * src/WebPluginContainerImpl.h: + (WebPluginContainerImpl): + * tests/FakeWebPlugin.cpp: Added. + (WebKit): + (WebKit::FakeWebPlugin::FakeWebPlugin): + (WebKit::FakeWebPlugin::~FakeWebPlugin): + (WebKit::FakeWebPlugin::initialize): + (WebKit::FakeWebPlugin::destroy): + * tests/FakeWebPlugin.h: Added. + (WebKit): + (FakeWebPlugin): + * tests/WebPluginContainerTest.cpp: Added. + (WebKit): + (WebPluginContainerTest): + (WebKit::WebPluginContainerTest::WebPluginContainerTest): + (WebKit::WebPluginContainerTest::TearDown): + (WebKit::getWebPluginContainer): + (WebKit::TEST_F): + * tests/data/plugin_container.html: Added. + +2012-11-15 Tien-Ren Chen + + Add Settings to disable custom scrollbars on main frame + https://bugs.webkit.org/show_bug.cgi?id=102323 + + Reviewed by Adam Barth. + + Custom scrollbars on main frame don't really work well on touch devices. + Add a setting to inhibit their creation. + + * public/WebSettings.h: + * src/WebSettingsImpl.cpp: + (WebKit::WebSettingsImpl::setAllowCustomScrollbarInMainFrame): + (WebKit): + * src/WebSettingsImpl.h: + (WebSettingsImpl): + +2012-11-15 Yue Zhang + + Ignore autocomplete=off for chrome generated passwords. + https://bugs.webkit.org/show_bug.cgi?id=102426 + + Reviewed by Adam Barth. + + Record the autocomplete attribute in the web password form data, + so that we can handle autocomplete in chromium code. The + motivation/background is: we should ignore autocomplete=off field + for password forms with chrome generated passwords (has passed + security review). By handling autocomplete in chromium code we can + distinguish password forms with chrome generated passwords and + those normal password forms. Note that we haven't turned off + checking autocomplete=off in the Webkit code for now so there is + no behavior change after this CL, and we will turn off after we + make the chromium side change to be safe. + + * public/WebPasswordFormData.h: + (WebPasswordFormData): + * src/WebPasswordFormData.cpp: + +2012-11-15 Scott Violet + + [chromium] Create default directory so that cq can apply patch + https://bugs.webkit.org/show_bug.cgi?id=102421 + + Reviewed by Tony Chang. + + Done in hopes of patch that copies files to this directory working. + + * public/platform/default: Added. + +2012-11-15 Sheriff Bot + + Unreviewed, rolling out r134800 and r134805. + http://trac.webkit.org/changeset/134800 + http://trac.webkit.org/changeset/134805 + https://bugs.webkit.org/show_bug.cgi?id=102417 + + This patch broke chromium port (Requested by jianli on + #webkit). + + * src/AssertMatchingEnums.cpp: + +2012-11-15 Sadrul Habib Chowdhury + + [chromium] Do not mark an event (mouse wheel, scroll update) as handled if nothing was scrolled. + https://bugs.webkit.org/show_bug.cgi?id=102246 + + Reviewed by James Robinson. + + * src/WebCompositorInputHandlerImpl.cpp: + (WebKit::WebCompositorInputHandlerImpl::handleInputEventInternal): + * tests/WebCompositorInputHandlerImplTest.cpp: + (MockWebInputHandlerClient): + (WebKit::TEST_F): + +2012-11-15 Tommy Widenflycht + + MediaStream API: Update RTCPeerConnection states to match the latest editors draft + https://bugs.webkit.org/show_bug.cgi?id=102382 + + Reviewed by Adam Barth. + + Updating readyState & iceState, and adding iceGatheringState. + + * src/AssertMatchingEnums.cpp: + +2012-11-15 Tien-Ren Chen + + Use correct unscaled document size when calculating scale limits + https://bugs.webkit.org/show_bug.cgi?id=102028 + + Reviewed by Adam Barth. + + Fixes bug http://crbug.com/160581 + Using contentsSize / pageScaleFactor as unscaled contents size results + in rounding errors. This can cause scale factor to oscillate indefinitely. + + * src/WebViewImpl.cpp: + (WebKit::unscaledContentsSize): + (WebKit): + (WebKit::WebViewImpl::computePageScaleFactorLimits): + * tests/WebFrameTest.cpp: + * tests/data/scale_oscillate.html: Added. + +2012-11-15 Kenneth Russell + + [chromium] Move allowWebGL query to WebFrameClient + https://bugs.webkit.org/show_bug.cgi?id=102319 + + Reviewed by Adam Barth. + + Moved allowWebGL query to WebFrameClient to avoid polluting + content/ API. + + * public/WebFrameClient.h: + (WebFrameClient): + (WebKit::WebFrameClient::allowWebGL): + * public/WebPermissionClient.h: + * src/FrameLoaderClientImpl.cpp: + (WebKit::FrameLoaderClientImpl::allowWebGL): + +2012-11-15 Sheriff Bot + + Unreviewed. Rolled DEPS. + + * DEPS: + +2012-11-15 Stephen Chenney + + [Chromium] Move SK_DISABLE_FAST_AA_STROKE_RECT to skia_webkit.gyp + + Unreviewed non-funtional, behavior-neutral change + + * skia_webkit.gyp: Add SK_DISABLE_FAST_AA_STROKE_RECT=1 so that it can be removed from Chromium's skia.gyp + +2012-11-15 Stephen Chenney + + [Chromium] Disable SK_IGNORE_FAST_BLURRECT + + Unreviewed test update. + + This flag is enabled purely to simplify rebaselining. I am now + removing it and doing the rebaslining. + + * skia_webkit.gyp: Remove the line for SK_IGNORE_FAST_BLURRECT + +2012-11-15 Kent Tamura + + Support stand-alone month names in calendar picker + https://bugs.webkit.org/show_bug.cgi?id=102196 + + Reviewed by Kentaro Hara. + + * src/DateTimeChooserImpl.cpp: + (WebKit::DateTimeChooserImpl::writeDocument): + We don't need to pass monthLabels any more. + +2012-11-14 Sheriff Bot + + Unreviewed. Rolled DEPS. + + * DEPS: + +2012-11-14 Joshua Bell + + IndexedDB: Remove magic numbers in record comparator, handle missing case + https://bugs.webkit.org/show_bug.cgi?id=102255 + + Reviewed by Tony Chang. + + Add test keys for various metadata types. + + * tests/IDBLevelDBCodingTest.cpp: + (IDBLevelDBCoding::TEST): + +2012-11-14 Eric Uhrhane + + [chromium] Don't let shift-click turn popup into tab. + https://bugs.webkit.org/show_bug.cgi?id=102254 + + Reviewed by Adam Barth. + + Change http://trac.webkit.org/changeset/132399 broke shift-click on + compose in GMail. We didn't want to change behavior that people were + depending on, and this quick fix seems a good compromise between user + intent and developer intent. + + * src/ChromeClientImpl.cpp: + (WebKit::updatePolicyForEvent): + +2012-11-14 Mike Reed + + Dynamically create canvas in Setup() to avoid calling DEPRECATED function setDevice(). + https://bugs.webkit.org/show_bug.cgi?id=102242 + + Reviewed by Stephen White. + + This change should not change any test results, it is an equivalent implementation that avoids + using a (now) DEPRECATED function. + + * tests/DeferredImageDecoderTest.cpp: + (WebCore::createRasterCanvas): + (WebCore): + (WebCore::DeferredImageDecoderTest::SetUp): + (DeferredImageDecoderTest): + (WebCore::TEST_F): + +2012-11-14 Sheriff Bot + + Unreviewed, rolling out r134523. + http://trac.webkit.org/changeset/134523 + https://bugs.webkit.org/show_bug.cgi?id=102218 + + brake chrome windows build, as it references a non existing + header js/DOMRequestState.h (Requested by jochen__ on + #webkit). + + * src/WebIDBKey.cpp: + +2012-11-14 Kent Tamura + + Support for localization tests of calendar picker + https://bugs.webkit.org/show_bug.cgi?id=102181 + + Reviewed by Kentaro Hara. + + * src/DateTimeChooserImpl.cpp: + Use DateTimeChooserParameters::locale. + (WebKit::DateTimeChooserImpl::DateTimeChooserImpl): + (WebKit::DateTimeChooserImpl::writeDocument): + +2012-11-14 Sheriff Bot + + Unreviewed, rolling out r134566. + http://trac.webkit.org/changeset/134566 + https://bugs.webkit.org/show_bug.cgi?id=102197 + + "it broke Chromium Android Release build" (Requested by + haraken on #webkit). + + * src/DateTimeChooserImpl.cpp: + (WebKit::DateTimeChooserImpl::DateTimeChooserImpl): + (WebKit::DateTimeChooserImpl::writeDocument): + +2012-11-14 Kent Tamura + + Support for localization tests of calendar picker + https://bugs.webkit.org/show_bug.cgi?id=102181 + + Reviewed by Kentaro Hara. + + * src/DateTimeChooserImpl.cpp: + Use DateTimeChooserParameters::locale. + (WebKit::DateTimeChooserImpl::DateTimeChooserImpl): + (WebKit::DateTimeChooserImpl::writeDocument): + +2012-11-14 Yury Semikhatsky + + Remove MemoryInstrumentationTest.ImageObserver + https://bugs.webkit.org/show_bug.cgi?id=102185 + + Reviewed by Pavel Feldman. + + Removed obsolete memory instrumenation unit test. + + * WebKit.gypi: + * tests/MemoryInstrumentationTest.cpp: Removed. + +2012-11-14 Kent Tamura + + [Chromium] Add API to expose WebCore::DateTimeChooser + https://bugs.webkit.org/show_bug.cgi?id=101196 + + Reviewed by Hajime Morita. + + Add ability to open date/time choosers to WebViewClient. + + - ExternalDateTimeChooser forwards DateTimeChooser requests from WebCore + to WebViewClient, and waits for WebDateTimeChooerCompletion notifications. + - WebDateTimeChooserParams contains various information to create + chooser UI. + - WebDateTimeChooserCompletion informs value selection by users to + ExternalDateTimeChooser. + + The design is very similar to existing WebFileChooserParams and + WebFileChooserCompletion. + + These interfaces are used only if ENABLE_INPUT_MULTIPLE_FIELDS_UI is not + enabled, that is to say, in Chromium-Android port. Non-Android Chromium + ports use DateTimeChooserImpl and WebKit-internal choosers. + + * WebKit.gyp: Add WebDateTimeChooserCompletion.h, + WebDateTimeChooserParams.h, ExternalDateTimeChooser.cpp, and + ExternalDateTimeChooser.h. + * public/WebDateTimeChooserCompletion.h: Added. + (WebDateTimeChooserCompletion): + (WebKit::WebDateTimeChooserCompletion::~WebDateTimeChooserCompletion): + * public/WebDateTimeChooserParams.h: Added. + (WebDateTimeChooserParams): + (WebKit::WebDateTimeChooserParams::WebDateTimeChooserParams): + * public/WebViewClient.h: + (WebKit): Add some forward declarations. + (WebKit::WebViewClient::openDateTimeChooser): Added. + * src/ChromeClientImpl.cpp: + (WebKit::ChromeClientImpl::openDateTimeChooser): + Creates ExternalDateTimeChooser if !ENABLE(INPUT_MULTIPLE_FIELDS_UI). + * src/ExternalDateTimeChooser.cpp: Added. + (WebDateTimeChooserCompletionImpl): An implementation of + WebDateTimeChooserCompletion. When didChooseValue or didCancelChooser is + called, it notifies to an ExternalDateTimeChooser and kill itself. + (WebKit::ExternalDateTimeChooser::~ExternalDateTimeChooser): Added. + (WebKit::ExternalDateTimeChooser::ExternalDateTimeChooser): Added. + (WebKit::ExternalDateTimeChooser::create): + Cretes an object, then asks the WebViewClient to open date/time chooser. + If an open request fails, an empty PassRefPtr<> is returned. + We don't ask to open in the constructor because open requests might fail + and it's hard for the constructor to tell the failure. + (WebKit::ExternalDateTimeChooser::openDateTimeChooser): Prepares a + WebDateTimeChooserParams and a WebDateTimeChooserCompletion, calls + WebViewClient::openDateTimeChooser, and kill the + WebDateTimeChooserCompletion if openDateTimeChooser fails. + (WebKit::ExternalDateTimeChooser::didChooseValue): + Called by WebDateTimeChooserCompletion. + We need to check m_client because the requester is already dead. + (WebKit::ExternalDateTimeChooser::didCancelChooser): Ditto. + (WebKit::ExternalDateTimeChooser::endChooser): + Called by the requester when it wants to close the chooser. + We don't close the chooser here, and just disconnect the association of + the client and this object. + * src/ExternalDateTimeChooser.h: Added. + +2012-11-13 Vincent Scheib + + Remove RuntimeEnabledFeatures::isPointerLockEnabled. + https://bugs.webkit.org/show_bug.cgi?id=102107 + + Reviewed by Adam Barth. + + The runtime flag is always true now that the feature is enabled by default in Chromium. + + * public/WebRuntimeFeatures.h: + (WebRuntimeFeatures): + * src/WebRuntimeFeatures.cpp: + (WebKit): + (WebKit::WebRuntimeFeatures::enablePointerLock): + +2012-11-13 Sheriff Bot + + Unreviewed. Rolled DEPS. + + * DEPS: + +2012-11-13 Dana Jansens + + [chromium] Pass showDebugBorders directly to WebLayerTreeSettings, don't use the GraphicsLayer border width setting. + https://bugs.webkit.org/show_bug.cgi?id=102130 + + Reviewed by James Robinson. + + * src/WebViewImpl.cpp: + (WebKit::WebViewImpl::setIsAcceleratedCompositingActive): + (WebKit): + +2012-11-13 Keishi Hattori + + Enable datalist UI for input types week and month + https://bugs.webkit.org/show_bug.cgi?id=102041 + + Reviewed by Kent Tamura. + + * src/DateTimeChooserImpl.cpp: + (WebKit::DateTimeChooserImpl::writeDocument): If the type supports calendar picker show the "Other..." option. + +2012-11-13 Eberhard Graether + + checkbox to toggle FPS counter in the inspector's settings + https://bugs.webkit.org/show_bug.cgi?id=99660 + + Reviewed by Pavel Feldman. + + Added a checkbox to the inspector's settings to toggle a FPS counter. The checkbox appears when InspectorClient::canShowFPSCounter() returns true. + + * public/WebView.h: + (WebView): + * src/InspectorClientImpl.cpp: + (WebKit::InspectorClientImpl::canShowFPSCounter): + (WebKit): + (WebKit::InspectorClientImpl::setShowFPSCounter): + * src/InspectorClientImpl.h: + (InspectorClientImpl): + * src/WebViewImpl.cpp: + (WebKit::WebViewImpl::WebViewImpl): + (WebKit::WebViewImpl::setShowFPSCounter): + (WebKit): + (WebKit::WebViewImpl::setIsAcceleratedCompositingActive): + (WebKit::WebViewImpl::loadFontAtlasIfNecessary): + * src/WebViewImpl.h: + (WebViewImpl): + +2012-11-13 Dana Jansens + + [chromium] Plumb WebCompositorSupport settings through WebLayerTreeSettings as well, in preparation for removing the settings from WebCompositorSupport + https://bugs.webkit.org/show_bug.cgi?id=102146 + + Reviewed by James Robinson. + + Add accelerated animation and per-tile painting to the WebSettings structure. + + * public/WebSettings.h: + * src/WebSettingsImpl.cpp: + (WebKit::WebSettingsImpl::setAcceleratedAnimationEnabled): + (WebKit): + (WebKit::WebSettingsImpl::setPerTilePaintingEnabled): + * src/WebSettingsImpl.h: + (WebSettingsImpl): + (WebKit::WebSettingsImpl::gestureTapHighlightEnabled): + (WebKit::WebSettingsImpl::doubleTapToZoomEnabled): + (WebKit::WebSettingsImpl::perTilePaintingEnabled): + (WebKit::WebSettingsImpl::acceleratedAnimationEnabled): + * src/WebViewImpl.cpp: + (WebKit::WebViewImpl::setIsAcceleratedCompositingActive): + (WebKit): + +2012-11-13 Kenneth Russell + + Notify embedder of lost contexts and allow overriding of WebGL support + https://bugs.webkit.org/show_bug.cgi?id=101826 + + Reviewed by Adam Barth. + + Expose new FrameLoaderClient hooks through Chromium's + WebPermissionClient and WebFrameClient. Downstream browser tests + will exercise this new functionality. + + * public/WebFrameClient.h: + (WebFrameClient): + (WebKit::WebFrameClient::didLoseWebGLContext): + * public/WebPermissionClient.h: + (WebPermissionClient): + (WebKit::WebPermissionClient::allowWebGL): + * src/FrameLoaderClientImpl.cpp: + (WebKit): + (WebKit::FrameLoaderClientImpl::allowWebGL): + (WebKit::FrameLoaderClientImpl::didLoseWebGLContext): + * src/FrameLoaderClientImpl.h: + (FrameLoaderClientImpl): + +2012-11-13 Chris Fleizach + + AX: MathML types need to be semantically identified in AX tree + https://bugs.webkit.org/show_bug.cgi?id=101263 + + Reviewed by Beth Dakin. + + * public/WebAccessibilityRole.h: + * src/AssertMatchingEnums.cpp: + Add new accessibility role. + +2012-11-13 Silvia Pfeiffer + + Clean up the inheritance tree under the MediaControls Class. + https://bugs.webkit.org/show_bug.cgi?id=88871 + + Reviewed by Eric Carlson. + + This patch removes code duplication between the Chromium and Safari + media controls shadow DOMs. + The derived classes are renamed based on their platform: + - MediaControlRootElement to MediaControlsApple. + - MediaControlRootElementChromium to MediaControlsChromium. + - MediaControlRootElementChromiumAndroid to MediaControlsChromiumAndroid. + + * public/WebContextMenuData.h: + Move MediaControlRootElement to MediaControls. + * src/ContextMenuClientImpl.cpp: + (WebKit::ContextMenuClientImpl::getCustomMenuFromDefaultItems): + Move MediaControlRootElement to MediaControls. + +2012-11-13 Dimitri Glazkov + + Unreviewed, rolling out r134446. + http://trac.webkit.org/changeset/134446 + https://bugs.webkit.org/show_bug.cgi?id=101968 + + Need to try a different strategy for landing a two-sided patch + (3/3). + + * public/WebSettings.h: + * src/WebSettingsImpl.cpp: + * src/WebSettingsImpl.h: + (WebSettingsImpl): + (WebKit::WebSettingsImpl::gestureTapHighlightEnabled): + (WebKit::WebSettingsImpl::doubleTapToZoomEnabled): + * src/WebViewImpl.cpp: + (WebKit::WebViewImpl::setIsAcceleratedCompositingActive): + (WebKit): + +2012-11-13 Dan Carney + + [V8] More efficient wrapper dispatch + https://bugs.webkit.org/show_bug.cgi?id=102082 + + Reviewed by Adam Barth. + + * src/WebArrayBuffer.cpp: + (WebKit::WebArrayBuffer::toV8Value): + * src/WebBlob.cpp: + (WebKit::WebBlob::toV8Value): + +2012-11-12 Dana Jansens + + [chromium] Remove the WebCompositorSupport methods for changing settings, plumb everything through WebLayerTreeSettings + https://bugs.webkit.org/show_bug.cgi?id=101968 + + Reviewed by James Robinson. + + This adds perTilePainting and acceleratedAniamtions to the WebSettings + classes, so that DRT can turn these on via WebLayerTreeSettings. + + * public/WebSettings.h: + * src/WebSettingsImpl.cpp: + (WebKit::WebSettingsImpl::setAcceleratedAnimationEnabled): + (WebKit): + (WebKit::WebSettingsImpl::setPerTilePaintingEnabled): + * src/WebSettingsImpl.h: + (WebSettingsImpl): + (WebKit::WebSettingsImpl::gestureTapHighlightEnabled): + (WebKit::WebSettingsImpl::doubleTapToZoomEnabled): + (WebKit::WebSettingsImpl::perTilePaintingEnabled): + (WebKit::WebSettingsImpl::acceleratedAnimationEnabled): + * src/WebViewImpl.cpp: + (WebKit::WebViewImpl::setIsAcceleratedCompositingActive): + (WebKit): + +2012-11-13 Alec Flett + + IndexedDB: remove legacy string-based backend methods + https://bugs.webkit.org/show_bug.cgi?id=102004 + + Reviewed by Adam Barth. + + This is the final stage in a refactor, preceded by + https://bugs.webkit.org/show_bug.cgi?id=100426 + + * public/WebIDBDatabase.h: + (WebKit::WebIDBDatabase::createObjectStore): + * public/WebIDBObjectStore.h: + (WebKit::WebIDBObjectStore::createIndex): + (WebKit::WebIDBObjectStore::index): + * public/WebIDBTransaction.h: + * src/IDBDatabaseBackendProxy.cpp: + * src/IDBDatabaseBackendProxy.h: + (IDBDatabaseBackendProxy): + * src/IDBTransactionBackendProxy.cpp: + * src/IDBTransactionBackendProxy.h: + (IDBTransactionBackendProxy): + +2012-11-13 Dimitri Glazkov + + Unreviewed, rolling out r134391. + http://trac.webkit.org/changeset/134391 + https://bugs.webkit.org/show_bug.cgi?id=99660 + + Speculative rollout, trying to fix browser_tests failure. + + * public/WebView.h: + (WebView): + * src/InspectorClientImpl.cpp: + * src/InspectorClientImpl.h: + (InspectorClientImpl): + * src/WebViewImpl.cpp: + (WebKit::WebViewImpl::WebViewImpl): + (WebKit::WebViewImpl::setIsAcceleratedCompositingActive): + (WebKit): + * src/WebViewImpl.h: + (WebViewImpl): + +2012-11-13 Ilya Tikhonovsky + + Unreviewed: temporary disable failing test. + + * tests/MemoryInstrumentationTest.cpp: + +2012-11-13 Eberhard Graether + + checkbox to toggle FPS counter in the inspector's settings + https://bugs.webkit.org/show_bug.cgi?id=99660 + + Reviewed by Pavel Feldman. + + Added a checkbox to the inspector's settings to toggle a FPS counter. The checkbox appears when InspectorClient::canShowFPSCounter() returns true. + + * public/WebView.h: + (WebView): + * src/InspectorClientImpl.cpp: + (WebKit::InspectorClientImpl::canShowFPSCounter): + (WebKit): + (WebKit::InspectorClientImpl::setShowFPSCounter): + * src/InspectorClientImpl.h: + (InspectorClientImpl): + * src/WebViewImpl.cpp: + (WebKit::WebViewImpl::WebViewImpl): + (WebKit::WebViewImpl::setShowFPSCounter): + (WebKit): + (WebKit::WebViewImpl::setIsAcceleratedCompositingActive): + (WebKit::WebViewImpl::loadFontAtlasIfNecessary): + * src/WebViewImpl.h: + (WebViewImpl): + +2012-11-12 Kent Tamura + + Unable to set valid time value to input[type=time] with user interaction in some cases + https://bugs.webkit.org/show_bug.cgi?id=102048 + + Reviewed by Kentaro Hara. + + * tests/DecimalTest.cpp: + (TEST_F): Update and add tests. + 2.1 % 3 should be 2.1 + 10 % -3 should be 1 + -10 % -3 should be -1 + 3.6 % 1.3 should be 1 + 500 % 1000 should be 500 + -500 % 1000 should be -500 + +2012-11-12 Min Qin + + Fix windowRect calculation for webplugin due to page scale factors + https://bugs.webkit.org/show_bug.cgi?id=100182 + + Reviewed by Adam Barth. + + The current calculaton of windowRect in WebPluginContainerImpl is wrong. Even after some of our latest changes. + The problem is caused by page scale factor. + For example, windowToContents(IntPoint) will return an unscaled offset for an iframe, but will return a scaled offset for the main frame. So in order to obtain the correct window coordinate, we need to use contentsToWindow(). + Since webview_plugin.cc is expecting window coordinates, we need to use contentsToWindow(IntRect) to calculate the windowRect so that the rect size can get correctly scaled. + It is difficult to write a test for this because it's pixel-based, and plugin placeholder is managed on the Chromium side (webview_plugin.cc). + + * src/WebPluginContainerImpl.cpp: + (WebKit::WebPluginContainerImpl::paint): + +2012-11-12 Adam Barth + + Unreviewed. Roll Chromium DEPS. + +2012-11-12 Stephen Chenney + + [chromium] Supressing a Skia change to prevent layout test breakage. + + Unreviewed expectations management. + + * skia_webkit.gyp: Added supression 'SK_IGNORE_FAST_BLURRECT=1' + +2012-11-12 Alexandre Elias + + [chromium] Delete WebCompositor.h + https://bugs.webkit.org/show_bug.cgi?id=101137 + + Reviewed by James Robinson. + + The implementation of this class is getting deleted and all + WebKit-side users are already going via WebCompositorSupport instead. + + * tests/WebCompositorInputHandlerImplTest.cpp: + +2012-11-12 Dirk Pranke + + Fix Chromium DEPS version after accidentally checking in HEAD a couple days ago. + + Unreviewed, build fix. + + * DEPS: + +2012-11-12 Keishi Hattori + + Add support for week/month to Locale::formatDateTime() + https://bugs.webkit.org/show_bug.cgi?id=101878 + + Reviewed by Kent Tamura. + + * tests/LocaleMacTest.cpp: + (LocaleMacTest::formatWeek): Takes ISO string and returns localized string. + (LocaleMacTest): + (LocaleMacTest::formatMonth): Ditto. + (TEST_F): + +2012-11-11 Sadrul Habib Chowdhury + + [chromium] Expose CustomEvent through WebDOMCustomEvent. + https://bugs.webkit.org/show_bug.cgi?id=101293 + + Reviewed by Adam Barth. + + * WebKit.gyp: + * public/WebDOMCustomEvent.h: Added. + (WebKit): + (WebDOMCustomEvent): + (WebKit::WebDOMCustomEvent::WebDOMCustomEvent): + * src/WebDOMCustomEvent.cpp: Added. + (WebKit): + (WebKit::WebDOMCustomEvent::initCustomEvent): + +2012-11-09 Rick Byers + + Move chromium to USE(LAZY_NATIVE_CURSOR) + https://bugs.webkit.org/show_bug.cgi?id=101501 + + Reviewed by Adam Barth. + + Update conversion from Cursor to WebCursorInfo to remove the + intermediate (and useless) step of PlatformCursor. + + * src/AssertMatchingEnums.cpp: + * src/WebCursorInfo.cpp: + (WebKit::WebCursorInfo::WebCursorInfo): + +2012-11-09 Alec Flett + + IndexedDB: Combine IDBBackingStore and IDBLevelDBBackingStore + https://bugs.webkit.org/show_bug.cgi?id=101415 + + Reviewed by Tony Chang. + + Remove method that is no longer in the base class. + + * tests/IDBFakeBackingStore.h: + +2012-11-09 Sheriff Bot + + Unreviewed, rolling out r134101. + http://trac.webkit.org/changeset/134101 + https://bugs.webkit.org/show_bug.cgi?id=101790 + + IDBDatabaseBackendTest.BackingStoreRetention failing + (Requested by jsbell|gardener on #webkit). + + * tests/IDBFakeBackingStore.h: + +2012-11-09 Alec Flett + + IndexedDB: Combine IDBBackingStore and IDBLevelDBBackingStore + https://bugs.webkit.org/show_bug.cgi?id=101415 + + Reviewed by Tony Chang. + + Remove method that is no longer in the base class. + + * tests/IDBFakeBackingStore.h: + +2012-11-09 Alec Flett + + IndexedDB: switch frontend to use int64_t-based references + https://bugs.webkit.org/show_bug.cgi?id=100426 + + Reviewed by Tony Chang. + + Remove implementation stubs from chromium API for + methods obsoleted by https://bugs.webkit.org/show_bug.cgi?id=100425 + + * src/IDBObjectStoreBackendProxy.cpp: + * src/IDBObjectStoreBackendProxy.h: + (IDBObjectStoreBackendProxy): + * src/WebIDBDatabaseImpl.cpp: + * src/WebIDBDatabaseImpl.h: + (WebIDBDatabaseImpl): + * src/WebIDBObjectStoreImpl.cpp: + * src/WebIDBObjectStoreImpl.h: + (WebIDBObjectStoreImpl): + +2012-11-09 Tommy Widenflycht + + MediaStream API: Deleting all files relating to the deprecated PeerConnection00 + https://bugs.webkit.org/show_bug.cgi?id=101730 + + Reviewed by Adam Barth. + + Since RTCPeerConenction has superseeded PeerConnection00 this patch removes all + files relating to the old API. + + * WebKit.gyp: + * public/WebRuntimeFeatures.h: + (WebRuntimeFeatures): + * public/platform/WebICECandidateDescriptor.h: Removed. + * public/platform/WebICEOptions.h: Removed. + * public/platform/WebMediaHints.h: Removed. + * public/platform/WebPeerConnection00Handler.h: Removed. + * public/platform/WebPeerConnection00HandlerClient.h: Removed. + * public/platform/WebPeerConnectionHandler.h: Removed. + * public/platform/WebPeerConnectionHandlerClient.h: Removed. + * public/platform/WebSessionDescriptionDescriptor.h: Removed. + * src/AssertMatchingEnums.cpp: + * src/WebRuntimeFeatures.cpp: + (WebKit::WebRuntimeFeatures::isPeerConnectionEnabled): + * src/WebSessionDescriptionDescriptor.cpp: Removed. + +2012-11-08 Sheriff Bot + + Unreviewed, rolling out r134010. + http://trac.webkit.org/changeset/134010 + https://bugs.webkit.org/show_bug.cgi?id=101716 + + Broke the chromium windows build. (Requested by noel_ on + #webkit). + + * src/IDBCallbacksProxy.cpp: + * src/IDBDatabaseBackendProxy.cpp: + (WebKit::IDBDatabaseBackendProxy::transaction): + (WebKit): + * src/IDBDatabaseBackendProxy.h: + (IDBDatabaseBackendProxy): + * src/IDBObjectStoreBackendProxy.cpp: + (WebKit::IDBObjectStoreBackendProxy::putWithIndexKeys): + (WebKit): + (WebKit::IDBObjectStoreBackendProxy::setIndexKeys): + (WebKit::IDBObjectStoreBackendProxy::createIndex): + (WebKit::IDBObjectStoreBackendProxy::setIndexesReady): + (WebKit::IDBObjectStoreBackendProxy::index): + (WebKit::IDBObjectStoreBackendProxy::deleteIndex): + * src/IDBObjectStoreBackendProxy.h: + (IDBObjectStoreBackendProxy): + * src/WebIDBDatabaseImpl.cpp: + (WebKit::WebIDBDatabaseImpl::deleteObjectStore): + (WebKit): + (WebKit::WebIDBDatabaseImpl::transaction): + * src/WebIDBDatabaseImpl.h: + (WebIDBDatabaseImpl): + * src/WebIDBObjectStoreImpl.cpp: + (WebKit::WebIDBObjectStoreImpl::putWithIndexKeys): + (WebKit): + (WebKit::WebIDBObjectStoreImpl::setIndexKeys): + (WebKit::WebIDBObjectStoreImpl::setIndexesReady): + (WebKit::WebIDBObjectStoreImpl::index): + (WebKit::WebIDBObjectStoreImpl::deleteIndex): + * src/WebIDBObjectStoreImpl.h: + (WebIDBObjectStoreImpl): + * src/WebIDBTransactionImpl.cpp: + (WebKit::WebIDBTransactionImpl::objectStore): + (WebKit): + * src/WebIDBTransactionImpl.h: + * tests/IDBRequestTest.cpp: + +2012-11-08 Alec Flett + + IndexedDB: switch frontend to use int64_t-based references + https://bugs.webkit.org/show_bug.cgi?id=100426 + + Reviewed by Tony Chang. + + Remove implementation stubs from chromium API for + methods obsoleted by https://bugs.webkit.org/show_bug.cgi?id=100425 + + * src/IDBObjectStoreBackendProxy.cpp: + * src/IDBObjectStoreBackendProxy.h: + (IDBObjectStoreBackendProxy): + * src/WebIDBDatabaseImpl.cpp: + * src/WebIDBDatabaseImpl.h: + (WebIDBDatabaseImpl): + * src/WebIDBObjectStoreImpl.cpp: + * src/WebIDBObjectStoreImpl.h: + (WebIDBObjectStoreImpl): + +2012-11-08 Keishi Hattori + + WebPagePopupImpl::handleKeyEvent is called after WebPagePopupImpl::close + https://bugs.webkit.org/show_bug.cgi?id=93800 + + Reviewed by Kent Tamura. + + We need to set m_closing to true in WebPagePopupImpl::close so we won't access m_page in WebPagePopupImpl::handleKeyEvent. + + * src/WebPagePopupImpl.cpp: + (WebKit::WebPagePopupImpl::close): Set m_closing to true. + +2012-11-08 Sheriff Bot + + Unreviewed, rolling out r133984. + http://trac.webkit.org/changeset/133984 + https://bugs.webkit.org/show_bug.cgi?id=101684 + + windows build error. (Requested by hayato on #webkit). + + * src/IDBObjectStoreBackendProxy.cpp: + (WebKit::IDBObjectStoreBackendProxy::putWithIndexKeys): + (WebKit): + (WebKit::IDBObjectStoreBackendProxy::setIndexKeys): + (WebKit::IDBObjectStoreBackendProxy::createIndex): + (WebKit::IDBObjectStoreBackendProxy::setIndexesReady): + (WebKit::IDBObjectStoreBackendProxy::index): + (WebKit::IDBObjectStoreBackendProxy::deleteIndex): + * src/IDBObjectStoreBackendProxy.h: + (IDBObjectStoreBackendProxy): + * src/WebIDBDatabaseImpl.cpp: + (WebKit::WebIDBDatabaseImpl::deleteObjectStore): + (WebKit): + (WebKit::WebIDBDatabaseImpl::transaction): + * src/WebIDBDatabaseImpl.h: + (WebIDBDatabaseImpl): + * src/WebIDBObjectStoreImpl.cpp: + (WebKit::WebIDBObjectStoreImpl::putWithIndexKeys): + (WebKit): + (WebKit::WebIDBObjectStoreImpl::setIndexKeys): + (WebKit::WebIDBObjectStoreImpl::setIndexesReady): + (WebKit::WebIDBObjectStoreImpl::index): + (WebKit::WebIDBObjectStoreImpl::deleteIndex): + * src/WebIDBObjectStoreImpl.h: + (WebIDBObjectStoreImpl): + * src/WebIDBTransactionImpl.cpp: + (WebKit::WebIDBTransactionImpl::objectStore): + (WebKit): + * src/WebIDBTransactionImpl.h: + +2012-11-08 Alec Flett + + IndexedDB: switch frontend to use int64_t-based references + https://bugs.webkit.org/show_bug.cgi?id=100426 + + Reviewed by Tony Chang. + + Remove implementation stubs from chromium API for + methods obsoleted by https://bugs.webkit.org/show_bug.cgi?id=100425 + + * src/IDBObjectStoreBackendProxy.cpp: + * src/IDBObjectStoreBackendProxy.h: + (IDBObjectStoreBackendProxy): + * src/WebIDBDatabaseImpl.cpp: + * src/WebIDBDatabaseImpl.h: + (WebIDBDatabaseImpl): + * src/WebIDBObjectStoreImpl.cpp: + * src/WebIDBObjectStoreImpl.h: + (WebIDBObjectStoreImpl): + +2012-11-07 Kent Tamura + + [Chromium] WebElement::hasHTMLTagName returns true for non-HTML elements + https://bugs.webkit.org/show_bug.cgi?id=101537 + + Reviewed by Abhishek Arya. + + We should not do ignore-case comparison for tagName, which is always + upper-case and createElementNS(xhtmlNS, "INPUT") doesn't create an + HTMLInputElement object. We need to check if localName is equal to + "input" in this case. + + * src/WebElement.cpp: + (WebKit::WebElement::hasHTMLTagName): + +2012-11-08 Joshua Bell + + Expose snapshots in platform/leveldb wrapper API + https://bugs.webkit.org/show_bug.cgi?id=100786 + + Reviewed by Tony Chang. + + Add unit tests for transactions/snapshots. + + * tests/LevelDBTest.cpp: + (WebCore::encodeString): Don't append to pre-sized vector. + (WebCore::TEST): + (WebCore): + 2012-11-08 Adam Barth Unreviewed. diff --git a/Source/WebKit/chromium/DEPS b/Source/WebKit/chromium/DEPS index ba3dd966e..222eb8b45 100644 --- a/Source/WebKit/chromium/DEPS +++ b/Source/WebKit/chromium/DEPS @@ -32,7 +32,7 @@ vars = { 'chromium_svn': 'http://src.chromium.org/svn/trunk/src', - 'chromium_rev': '166755' + 'chromium_rev': '169021' } deps = { @@ -137,6 +137,8 @@ deps = { From('chromium_deps', 'src/third_party/libjpeg_turbo'), 'third_party/leveldatabase/src': From('chromium_deps', 'src/third_party/leveldatabase/src'), + 'third_party/smhasher/src': + From('chromium_deps', 'src/third_party/smhasher/src'), 'third_party/snappy/src': From('chromium_deps', 'src/third_party/snappy/src'), 'third_party/sfntly/cpp/src': diff --git a/Source/WebKit/chromium/WebKit.gyp b/Source/WebKit/chromium/WebKit.gyp index 74ef9bfcf..0dd53bfa3 100644 --- a/Source/WebKit/chromium/WebKit.gyp +++ b/Source/WebKit/chromium/WebKit.gyp @@ -120,6 +120,7 @@ 'public/WebContextMenuData.h', 'public/WebCrossOriginPreflightResultCache.h', 'public/WebCursorInfo.h', + 'public/WebDOMCustomEvent.h', 'public/WebDOMEvent.h', 'public/WebDOMEventListener.h', 'public/WebDOMMessageEvent.h', @@ -129,6 +130,8 @@ 'public/WebDataSource.h', 'public/WebDatabase.h', 'public/WebDatabaseObserver.h', + 'public/WebDateTimeChooserCompletion.h', + 'public/WebDateTimeChooserParams.h', 'public/WebDeliveredIntentClient.h', 'public/WebDevToolsAgent.h', 'public/WebDevToolsAgentClient.h', @@ -359,6 +362,8 @@ 'src/DateTimeChooserImpl.h', 'src/ChromeClientImpl.cpp', 'src/ChromeClientImpl.h', + 'src/ColorChooserPopupUIController.cpp', + 'src/ColorChooserPopupUIController.h', 'src/ColorChooserUIController.cpp', 'src/ColorChooserUIController.h', 'src/CompositionUnderlineBuilder.h', @@ -383,12 +388,15 @@ 'src/EditorClientImpl.h', 'src/EventListenerWrapper.cpp', 'src/EventListenerWrapper.h', + 'src/ExternalDateTimeChooser.cpp', + 'src/ExternalDateTimeChooser.h', 'src/ExternalPopupMenu.cpp', 'src/ExternalPopupMenu.h', 'src/FindInPageCoordinates.cpp', 'src/FindInPageCoordinates.h', 'src/FrameLoaderClientImpl.cpp', 'src/FrameLoaderClientImpl.h', + 'src/FrameNetworkingContextImpl.cpp', 'src/FrameNetworkingContextImpl.h', 'src/GeolocationClientProxy.cpp', 'src/GeolocationClientProxy.h', @@ -487,6 +495,7 @@ 'src/WebCompositorInputHandlerImpl.h', 'src/WebCrossOriginPreflightResultCache.cpp', 'src/WebCursorInfo.cpp', + 'src/WebDOMCustomEvent.cpp', 'src/WebDOMEvent.cpp', 'src/WebDOMEventListener.cpp', 'src/WebDOMEventListenerPrivate.cpp', @@ -612,7 +621,6 @@ 'src/WebSecurityPolicy.cpp', 'src/WebSelectElement.cpp', 'src/WebSerializedScriptValue.cpp', - 'src/WebSessionDescriptionDescriptor.cpp', 'src/WebSettingsImpl.cpp', 'src/WebSettingsImpl.h', 'src/WebSharedWorkerImpl.cpp', @@ -709,6 +717,7 @@ # functions defined only in !WEBKIT_IMPLEMENTATION. 'tests/AssociatedURLLoaderTest.cpp', 'tests/EventListenerTest.cpp', + 'tests/FakeWebPlugin.cpp', 'tests/FrameTestHelpers.cpp', 'tests/IDBBindingUtilitiesTest.cpp', 'tests/LevelDBTest.cpp', @@ -723,6 +732,7 @@ 'tests/WebImageTest.cpp', 'tests/WebPageNewSerializerTest.cpp', 'tests/WebPageSerializerTest.cpp', + 'tests/WebPluginContainerTest.cpp', 'tests/WebViewTest.cpp', ], 'conditions': [ diff --git a/Source/WebKit/chromium/WebKit.gypi b/Source/WebKit/chromium/WebKit.gypi index 18c6a8c35..dd5d6cf1b 100644 --- a/Source/WebKit/chromium/WebKit.gypi +++ b/Source/WebKit/chromium/WebKit.gypi @@ -64,6 +64,8 @@ 'tests/DeferredImageDecoderTest.cpp', 'tests/DragImageTest.cpp', 'tests/EventListenerTest.cpp', + 'tests/FakeWebPlugin.cpp', + 'tests/FakeWebPlugin.h', 'tests/FakeWebCompositorOutputSurface.h', 'tests/FakeWebGraphicsContext3D.h', 'tests/FilterOperationsTest.cpp', @@ -86,7 +88,6 @@ 'tests/LinkHighlightTest.cpp', 'tests/ListenerLeakTest.cpp', 'tests/MemoryInfo.cpp', - 'tests/MemoryInstrumentationTest.cpp', 'tests/OpaqueRectTrackingContentLayerDelegateTest.cpp', 'tests/OpenTypeVerticalDataTest.cpp', 'tests/PODArenaTest.cpp', @@ -114,6 +115,7 @@ 'tests/WebMediaPlayerClientImplTest.cpp', 'tests/WebPageNewSerializerTest.cpp', 'tests/WebPageSerializerTest.cpp', + 'tests/WebPluginContainerTest.cpp', 'tests/WebSocketDeflaterTest.cpp', 'tests/WebSocketExtensionDispatcherTest.cpp', 'tests/WebURLRequestTest.cpp', diff --git a/Source/WebKit/chromium/WebKitUnitTests.gyp b/Source/WebKit/chromium/WebKitUnitTests.gyp index 5dcfcd2b4..691cb5c65 100644 --- a/Source/WebKit/chromium/WebKitUnitTests.gyp +++ b/Source/WebKit/chromium/WebKitUnitTests.gyp @@ -119,6 +119,7 @@ 'type': 'shared_library', 'dependencies': [ '<(chromium_src_dir)/testing/android/native_test.gyp:native_test_native_code', + '<(chromium_src_dir)/tools/android/forwarder2/forwarder.gyp:forwarder2', ], }], ['OS=="mac"', { diff --git a/Source/WebKit/chromium/features.gypi b/Source/WebKit/chromium/features.gypi index f386deb77..4f43106d3 100644 --- a/Source/WebKit/chromium/features.gypi +++ b/Source/WebKit/chromium/features.gypi @@ -45,7 +45,6 @@ 'ENABLE_CSS_DEVICE_ADAPTATION=0', 'ENABLE_CSS_EXCLUSIONS=1', 'ENABLE_CSS_FILTERS=1', - 'ENABLE_CSS_HIERARCHIES=0', 'ENABLE_CSS_IMAGE_SET=1', 'ENABLE_CSS_IMAGE_RESOLUTION=0', 'ENABLE_CSS_REGIONS=1', @@ -95,6 +94,7 @@ 'ENABLE_PAGE_VISIBILITY_API=1', 'ENABLE_POINTER_LOCK=1', 'ENABLE_PROGRESS_ELEMENT=1', + 'ENABLE_PROXIMITY_EVENTS=0', 'ENABLE_QUOTA=1', 'ENABLE_RESOLUTION_MEDIA_QUERY=0', 'ENABLE_REQUEST_ANIMATION_FRAME=1', @@ -145,11 +145,13 @@ 'enable_touch_events%': 1, 'enable_touch_icon_loading%' : 0, 'enable_mutation_observers%': 1, + 'use_default_render_theme%': 0, }, 'use_accelerated_compositing%': '<(use_accelerated_compositing)', 'enable_skia_text%': '<(enable_skia_text)', 'enable_svg%': '<(enable_svg)', 'enable_touch_events%': '<(enable_touch_events)', + 'use_default_render_theme%': '<(use_default_render_theme)', 'conditions': [ ['OS=="android"', { 'feature_defines': [ @@ -239,6 +241,11 @@ 'SK_SUPPORT_HINTING_SCALE_FACTOR', ], }], + ['use_default_render_theme==1', { + 'feature_defines': [ + 'ENABLE_DEFAULT_RENDER_THEME=1', + ], + }], ], }, } diff --git a/Source/WebKit/chromium/public/WebAccessibilityRole.h b/Source/WebKit/chromium/public/WebAccessibilityRole.h index 031a69da9..0008724ec 100644 --- a/Source/WebKit/chromium/public/WebAccessibilityRole.h +++ b/Source/WebKit/chromium/public/WebAccessibilityRole.h @@ -96,6 +96,7 @@ enum WebAccessibilityRole { WebAccessibilityRoleListBoxOption, WebAccessibilityRoleListItem, WebAccessibilityRoleListMarker, + WebAccessibilityRoleMathElement, WebAccessibilityRoleMatte, WebAccessibilityRoleMenu, WebAccessibilityRoleMenuBar, diff --git a/Source/WebKit/chromium/public/WebContextMenuData.h b/Source/WebKit/chromium/public/WebContextMenuData.h index a36372192..7aaee9d52 100644 --- a/Source/WebKit/chromium/public/WebContextMenuData.h +++ b/Source/WebKit/chromium/public/WebContextMenuData.h @@ -100,7 +100,9 @@ struct WebContextMenuData { MediaCanSave = 0x10, MediaHasAudio = 0x20, MediaHasVideo = 0x40, + // FIXME: Remove MediaControlRootElement after patch lands for webkit.org/b/88871. MediaControlRootElement = 0x80, + MediaControls = 0x80, MediaCanPrint = 0x100, MediaCanRotate = 0x200, }; diff --git a/Source/WebKit/chromium/public/WebCursorInfo.h b/Source/WebKit/chromium/public/WebCursorInfo.h index cc8bc59bd..2982b6c53 100644 --- a/Source/WebKit/chromium/public/WebCursorInfo.h +++ b/Source/WebKit/chromium/public/WebCursorInfo.h @@ -95,6 +95,7 @@ struct WebCursorInfo { Type type; WebPoint hotSpot; + float imageScaleFactor; WebImage customImage; #ifdef WIN32 @@ -107,6 +108,7 @@ struct WebCursorInfo { explicit WebCursorInfo(Type type = TypePointer) : type(type) + , imageScaleFactor(1) { #ifdef WIN32 externalHandle = 0; diff --git a/Source/WebKit/chromium/public/WebDOMCustomEvent.h b/Source/WebKit/chromium/public/WebDOMCustomEvent.h new file mode 100644 index 000000000..15f1f80d3 --- /dev/null +++ b/Source/WebKit/chromium/public/WebDOMCustomEvent.h @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2012 Google Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +#ifndef WebDOMCustomEvent_h +#define WebDOMCustomEvent_h + +#include "WebDOMEvent.h" +#include "platform/WebSerializedScriptValue.h" + +namespace WebKit { + +class WebFrame; +class WebString; + +class WebDOMCustomEvent : public WebDOMEvent { +public: + WebDOMCustomEvent() { } + WEBKIT_EXPORT void initCustomEvent(const WebString& type, bool canBubble, bool cancelable, const WebSerializedScriptValue& messageData); +}; + +} // namespace WebKit + +#endif diff --git a/Source/WebKit/chromium/public/WebDateTimeChooserCompletion.h b/Source/WebKit/chromium/public/WebDateTimeChooserCompletion.h new file mode 100644 index 000000000..5404d7b1f --- /dev/null +++ b/Source/WebKit/chromium/public/WebDateTimeChooserCompletion.h @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2012 Google Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef WebDateTimeChooserCompletion_h +#define WebDateTimeChooserCompletion_h + +#include "platform/WebString.h" + +namespace WebKit { + +// Gets called back when WebViewClient finished choosing a date/time value. +class WebDateTimeChooserCompletion { +public: + + // Called with a date/time value in the HTML format. The callback instance + // is destroyed when this method is called. + virtual void didChooseValue(const WebString&) = 0; + + // Called when a user closed the chooser without choosing a value. The + // callback instance is destroyed when this method is called. + virtual void didCancelChooser() = 0; + +protected: + virtual ~WebDateTimeChooserCompletion() { } +}; + +} // namespace WebKit + +#endif diff --git a/Source/WebKit/chromium/public/WebDateTimeChooserParams.h b/Source/WebKit/chromium/public/WebDateTimeChooserParams.h new file mode 100644 index 000000000..c36b98b46 --- /dev/null +++ b/Source/WebKit/chromium/public/WebDateTimeChooserParams.h @@ -0,0 +1,86 @@ +/* + * Copyright (C) 2012 Google Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef WebDateTimeChooserParams_h +#define WebDateTimeChooserParams_h + +#include "platform/WebRect.h" +#include "platform/WebString.h" +#include "platform/WebVector.h" + +namespace WebKit { + +// This class conveys various information to make date/time chooser UI. +// See WebViewClient::openDateTimeChooser. +struct WebDateTimeChooserParams { + // Input type string. This is one of "date", "datetime", "datetime-local", + // "month", "time", and "week". + WebString type; + // Bounding rectangle of the requester element. + WebRect anchorRectInScreen; + // The current value of the requester element. + WebString currentValue; + // option values associated to the requester element. These + // values should not be shown to users. The vector size might be 0. + WebVector suggestionValues; + // Localized values of options associated to the requester + // element. These values should be shown to users. The vector size must be + // same as suggestionValues size. + WebVector localizedSuggestionValues; + // option labels associated to the requester element. These + // values should be shown to users. The vector size must be same as + // suggestionValues size. + WebVector suggestionLabels; + // HTMLInputElement::min attribute value parsed in the valusAsNumber rule, + // that is to say, milliseconds from the epoch for non-month types and + // months from the epoch for month type. If the min attribute is missing, + // this field has the hard minimum limit. + double minimum; + // Similar to minimum. + double maximum; + // Step value represented in milliseconds for non-month types, and + // represetnted in months for month type. + double step; + // Step-base value represeted in milliseconds, or months. + double stepBase; + // True if the requester element has required attribute. + bool isRequired; + // True if the requester element is rendered in rtl direction. + bool isAnchorElementRTL; + + WebDateTimeChooserParams() + : minimum(0) + , maximum(0) + , step(0) + , stepBase(0) + , isRequired(false) + , isAnchorElementRTL(false) + { + } +}; + +} // namespace WebKit + +#endif diff --git a/Source/WebKit/chromium/public/WebFrameClient.h b/Source/WebKit/chromium/public/WebFrameClient.h index 73980bf7f..bda3c0389 100644 --- a/Source/WebKit/chromium/public/WebFrameClient.h +++ b/Source/WebKit/chromium/public/WebFrameClient.h @@ -420,6 +420,19 @@ public: // Platform::current()->userAgent() will be called to provide one. virtual WebString userAgentOverride(WebFrame*, const WebURL& url) { return WebString(); } + // WebGL ------------------------------------------------------ + + // Asks the embedder whether WebGL is allowed for the given WebFrame. + // This call is placed here instead of WebPermissionClient because this + // class is implemented in content/, and putting it here avoids adding + // more public content/ APIs. + virtual bool allowWebGL(WebFrame*, bool defaultValue) { return defaultValue; } + + // Notifies the client that a WebGL context was lost on this page with the + // given reason (one of the GL_ARB_robustness status codes; see + // Extensions3D.h in WebCore/platform/graphics). + virtual void didLoseWebGLContext(WebFrame*, int) { } + protected: ~WebFrameClient() { } }; diff --git a/Source/WebKit/chromium/public/WebIDBDatabase.h b/Source/WebKit/chromium/public/WebIDBDatabase.h index f02bbf44c..b92799039 100644 --- a/Source/WebKit/chromium/public/WebIDBDatabase.h +++ b/Source/WebKit/chromium/public/WebIDBDatabase.h @@ -55,15 +55,9 @@ public: WEBKIT_ASSERT_NOT_REACHED(); return 0; } - virtual void deleteObjectStore(const WebString& name, const WebIDBTransaction& transaction, WebExceptionCode& ec) { WEBKIT_ASSERT_NOT_REACHED(); } virtual void deleteObjectStore(long long objectStoreId, const WebIDBTransaction& transaction, WebExceptionCode& ec) { WEBKIT_ASSERT_NOT_REACHED(); } virtual void setVersion(const WebString& version, WebIDBCallbacks* callbacks, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); } // Transfers ownership of the WebIDBTransaction to the caller. - virtual WebIDBTransaction* transaction(const WebDOMStringList& names, unsigned short mode, WebExceptionCode& ec) - { - WEBKIT_ASSERT_NOT_REACHED(); - return 0; - } virtual WebIDBTransaction* transaction(const WebVector&, unsigned short mode) { WEBKIT_ASSERT_NOT_REACHED(); diff --git a/Source/WebKit/chromium/public/WebIDBObjectStore.h b/Source/WebKit/chromium/public/WebIDBObjectStore.h index 7bda1a20d..455417160 100644 --- a/Source/WebKit/chromium/public/WebIDBObjectStore.h +++ b/Source/WebKit/chromium/public/WebIDBObjectStore.h @@ -55,7 +55,6 @@ public: typedef WebVector WebIndexKeys; - virtual void putWithIndexKeys(const WebSerializedScriptValue&, const WebIDBKey&, PutMode, WebIDBCallbacks*, const WebIDBTransaction&, const WebVector& indexNames, const WebVector&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); } virtual void put(const WebSerializedScriptValue&, const WebIDBKey&, PutMode, WebIDBCallbacks*, const WebIDBTransaction&, const WebVector& indexIds, const WebVector&) { WEBKIT_ASSERT_NOT_REACHED(); } virtual void deleteFunction(const WebIDBKeyRange&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); } virtual void clear(WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); } @@ -69,22 +68,14 @@ public: WEBKIT_ASSERT_NOT_REACHED(); return 0; } - virtual void setIndexKeys(const WebIDBKey&, const WebVector&, const WebVector&, const WebIDBTransaction&) { WEBKIT_ASSERT_NOT_REACHED(); } virtual void setIndexKeys(const WebIDBKey&, const WebVector&, const WebVector&, const WebIDBTransaction&) { WEBKIT_ASSERT_NOT_REACHED(); } - virtual void setIndexesReady(const WebVector&, const WebIDBTransaction&) { WEBKIT_ASSERT_NOT_REACHED(); }; virtual void setIndexesReady(const WebVector&, const WebIDBTransaction&) { WEBKIT_ASSERT_NOT_REACHED(); }; // Transfers ownership of the WebIDBIndex to the caller. - virtual WebIDBIndex* index(const WebString& name, WebExceptionCode&) - { - WEBKIT_ASSERT_NOT_REACHED(); - return 0; - } virtual WebIDBIndex* index(long long) { WEBKIT_ASSERT_NOT_REACHED(); return 0; } - virtual void deleteIndex(const WebString& name, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); } virtual void deleteIndex(long long indexId, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); } virtual void openCursor(const WebIDBKeyRange&, WebIDBCursor::Direction direction, WebIDBCallbacks*, WebIDBTransaction::TaskType, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); } virtual void count(const WebIDBKeyRange&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); } diff --git a/Source/WebKit/chromium/public/WebIDBTransaction.h b/Source/WebKit/chromium/public/WebIDBTransaction.h index bac2da88d..221bf6056 100644 --- a/Source/WebKit/chromium/public/WebIDBTransaction.h +++ b/Source/WebKit/chromium/public/WebIDBTransaction.h @@ -46,11 +46,6 @@ public: PreemptiveTask }; - virtual WebIDBObjectStore* objectStore(const WebString& name, WebExceptionCode&) - { - WEBKIT_ASSERT_NOT_REACHED(); - return 0; - } virtual WebIDBObjectStore* objectStore(long long, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); diff --git a/Source/WebKit/chromium/public/WebInputElement.h b/Source/WebKit/chromium/public/WebInputElement.h index fbc350012..29432df81 100644 --- a/Source/WebKit/chromium/public/WebInputElement.h +++ b/Source/WebKit/chromium/public/WebInputElement.h @@ -74,6 +74,7 @@ namespace WebKit { WEBKIT_EXPORT void setActivatedSubmit(bool); WEBKIT_EXPORT int size() const; WEBKIT_EXPORT void setValue(const WebString&, bool sendChangeEvent = false); + WEBKIT_EXPORT void setChecked(bool, bool sendChangeEvent = false); WEBKIT_EXPORT WebString value() const; // This returns the non-sanitized, exact value inside the text field. WEBKIT_EXPORT WebString editingValue() const; diff --git a/Source/WebKit/chromium/public/WebNode.h b/Source/WebKit/chromium/public/WebNode.h index 5869aeec6..e84a7b01b 100644 --- a/Source/WebKit/chromium/public/WebNode.h +++ b/Source/WebKit/chromium/public/WebNode.h @@ -45,6 +45,7 @@ class WebDocument; class WebElement; class WebFrame; class WebNodeList; +class WebPluginContainer; // Provides access to some properties of a DOM node. class WebNode { @@ -119,6 +120,7 @@ public: // This does not 100% guarantee the user can see it, but is pretty close. // Note: This method only works properly after layout has occurred. WEBKIT_EXPORT bool hasNonEmptyBoundingBox() const; + WEBKIT_EXPORT WebPluginContainer* pluginContainer() const; template T to() { diff --git a/Source/WebKit/chromium/public/WebPasswordFormData.h b/Source/WebKit/chromium/public/WebPasswordFormData.h index c1a106509..12c2a5979 100644 --- a/Source/WebKit/chromium/public/WebPasswordFormData.h +++ b/Source/WebKit/chromium/public/WebPasswordFormData.h @@ -97,12 +97,20 @@ struct WebPasswordFormData { // When parsing an HTML form, this is typically empty. WebString passwordValue; + // Value of shouldAutocomplete for the password element. + bool passwordShouldAutocomplete; + // If the form was a change password form, the name of the // 'old password' input element. Optional. WebString oldPasswordElement; // The old password. Optional. WebString oldPasswordValue; + + WebPasswordFormData() + : passwordShouldAutocomplete(false) + { + } }; } // namespace WebKit diff --git a/Source/WebKit/chromium/public/WebPluginContainer.h b/Source/WebKit/chromium/public/WebPluginContainer.h index debe26038..1229014da 100644 --- a/Source/WebKit/chromium/public/WebPluginContainer.h +++ b/Source/WebKit/chromium/public/WebPluginContainer.h @@ -31,6 +31,8 @@ #ifndef WebPluginContainer_h #define WebPluginContainer_h +#include "platform/WebCommon.h" + struct NPObject; namespace WebKit { @@ -40,6 +42,7 @@ class WebPlugin; class WebString; class WebURL; class WebURLRequest; +struct WebPoint; struct WebRect; class WebPluginContainer { @@ -111,6 +114,15 @@ public: // Notifies when the plugin starts/stops accepting touch events. virtual void setIsAcceptingTouchEvents(bool) = 0; + // Notifies when the plugin starts/stops accepting wheel events. Without + // calling the function with true, the container might not always able to + // receive wheel events in some cases (such as when threaded compositing + // is in use but a scroll bar is not in use). + virtual void setWantsWheelEvents(bool) = 0; + + // Converts view's window coordinates to plugin's local coordinates. + virtual WebPoint windowToLocalPoint(const WebPoint&) = 0; + virtual WebPlugin* plugin() = 0; virtual void setPlugin(WebPlugin*) = 0; diff --git a/Source/WebKit/chromium/public/WebRuntimeFeatures.h b/Source/WebKit/chromium/public/WebRuntimeFeatures.h index a8082606c..2f6ef1ce4 100644 --- a/Source/WebKit/chromium/public/WebRuntimeFeatures.h +++ b/Source/WebKit/chromium/public/WebRuntimeFeatures.h @@ -108,15 +108,10 @@ public: WEBKIT_EXPORT static void enablePeerConnection(bool); WEBKIT_EXPORT static bool isPeerConnectionEnabled(); - WEBKIT_EXPORT static void enableDeprecatedPeerConnection(bool); - WEBKIT_EXPORT static bool isDeprecatedPeerConnectionEnabled(); WEBKIT_EXPORT static void enableFullScreenAPI(bool); WEBKIT_EXPORT static bool isFullScreenAPIEnabled(); - WEBKIT_EXPORT static void enablePointerLock(bool); - WEBKIT_EXPORT static bool isPointerLockEnabled(); - WEBKIT_EXPORT static void enableMediaSource(bool); WEBKIT_EXPORT static bool isMediaSourceEnabled(); diff --git a/Source/WebKit/chromium/public/WebSettings.h b/Source/WebKit/chromium/public/WebSettings.h index ddebd7e61..2d356fa6a 100644 --- a/Source/WebKit/chromium/public/WebSettings.h +++ b/Source/WebKit/chromium/public/WebSettings.h @@ -56,6 +56,7 @@ public: virtual bool scrollAnimatorEnabled() const = 0; virtual bool viewportEnabled() const = 0; virtual void setAccelerated2dCanvasEnabled(bool) = 0; + virtual void setAcceleratedAnimationEnabled(bool) = 0; virtual void setAcceleratedCompositingEnabled(bool) = 0; virtual void setAcceleratedCompositingFor3DTransformsEnabled(bool) = 0; virtual void setAcceleratedCompositingForAnimationEnabled(bool) = 0; @@ -68,10 +69,11 @@ public: virtual void setAcceleratedPaintingEnabled(bool) = 0; virtual void setAllowDisplayOfInsecureContent(bool) = 0; virtual void setAllowFileAccessFromFileURLs(bool) = 0; + virtual void setAllowCustomScrollbarInMainFrame(bool) = 0; virtual void setAllowRunningOfInsecureContent(bool) = 0; virtual void setAllowScriptsToCloseWindows(bool) = 0; virtual void setAllowUniversalAccessFromFileURLs(bool) = 0; - virtual void setApplyDefaultDeviceScaleFactorInCompositor(bool) = 0; + virtual void setApplyDeviceScaleFactorInCompositor(bool) = 0; virtual void setApplyPageScaleFactorInCompositor(bool) = 0; virtual void setAsynchronousSpellCheckingEnabled(bool) = 0; virtual void setAutoZoomFocusedNodeToLegibleScale(bool) = 0; @@ -95,6 +97,7 @@ public: virtual void setEditableLinkBehaviorNeverLive() = 0; virtual void setEditingBehavior(EditingBehavior) = 0; virtual void setEnableScrollAnimator(bool) = 0; + virtual void setEnableTouchAdjustment(bool) = 0; virtual void setExperimentalCSSCustomFilterEnabled(bool) = 0; virtual void setExperimentalCSSGridLayoutEnabled(bool) = 0; virtual void setCSSStickyPositionEnabled(bool) = 0; @@ -134,6 +137,7 @@ public: virtual void setPageCacheSupportsPlugins(bool) = 0; virtual void setPasswordEchoDurationInSeconds(double) = 0; virtual void setPasswordEchoEnabled(bool) = 0; + virtual void setPerTilePaintingEnabled(bool) = 0; virtual void setPictographFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0; virtual void setPluginsEnabled(bool) = 0; virtual void setPrivilegedWebGLExtensionsEnabled(bool) = 0; @@ -166,8 +170,8 @@ public: virtual void setWebSecurityEnabled(bool) = 0; virtual void setXSSAuditorEnabled(bool) = 0; - // DEPRECATED - virtual void setDefaultDeviceScaleFactor(int) { } + // DEPRECATED (renamed. remove this after all call sites changed to the new name) + void setApplyDefaultDeviceScaleFactorInCompositor(bool enabled) { setApplyDeviceScaleFactorInCompositor(enabled); } protected: ~WebSettings() { } diff --git a/Source/WebKit/chromium/public/WebView.h b/Source/WebKit/chromium/public/WebView.h index 49aaa5138..2ec1b1bad 100644 --- a/Source/WebKit/chromium/public/WebView.h +++ b/Source/WebKit/chromium/public/WebView.h @@ -471,6 +471,8 @@ public: virtual bool isSelectionEditable() const = 0; + virtual void setShowFPSCounter(bool) = 0; + // Benchmarking support ------------------------------------------------- virtual WebViewBenchmarkSupport* benchmarkSupport() { return 0; } diff --git a/Source/WebKit/chromium/public/WebViewClient.h b/Source/WebKit/chromium/public/WebViewClient.h index da6498d30..5b3cbc0b1 100644 --- a/Source/WebKit/chromium/public/WebViewClient.h +++ b/Source/WebKit/chromium/public/WebViewClient.h @@ -53,6 +53,7 @@ class WebBatteryStatusClient; class WebColorChooser; class WebColorChooserClient; class WebCompositorOutputSurface; +class WebDateTimeChooserCompletion; class WebDeviceOrientationClient; class WebDragData; class WebElement; @@ -83,6 +84,7 @@ class WebView; class WebWidget; struct WebConsoleMessage; struct WebContextMenuData; +struct WebDateTimeChooserParams; struct WebPoint; struct WebPopupMenuInfo; struct WebRect; @@ -222,6 +224,13 @@ public: virtual bool runFileChooser(const WebFileChooserParams&, WebFileChooserCompletion*) { return false; } + // Ask users to choose date/time for the specified parameters. When a user + // chooses a value, an implemenattion of this function should call + // WebDateTimeChooserCompletion::didChooseValue or didCancelChooser. If the + // implementation opened date/time chooser UI successfully, it should return + // true. This function is used only if ExternalDateTimeChooser is used. + virtual bool openDateTimeChooser(const WebDateTimeChooserParams&, WebDateTimeChooserCompletion*) { return false; } + // Displays a modal alert dialog containing the given message. Returns // once the user dismisses the dialog. virtual void runModalAlertDialog( diff --git a/Source/WebKit/chromium/public/platform/WebICECandidateDescriptor.h b/Source/WebKit/chromium/public/platform/WebICECandidateDescriptor.h deleted file mode 100644 index 56ea93146..000000000 --- a/Source/WebKit/chromium/public/platform/WebICECandidateDescriptor.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (C) 2012 Google Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "../../../../Platform/chromium/public/WebICECandidateDescriptor.h" diff --git a/Source/WebKit/chromium/public/platform/WebICEOptions.h b/Source/WebKit/chromium/public/platform/WebICEOptions.h deleted file mode 100644 index 0f2e46000..000000000 --- a/Source/WebKit/chromium/public/platform/WebICEOptions.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (C) 2012 Google Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "../../../../Platform/chromium/public/WebICEOptions.h" diff --git a/Source/WebKit/chromium/public/platform/WebMediaHints.h b/Source/WebKit/chromium/public/platform/WebMediaHints.h deleted file mode 100644 index b27836db5..000000000 --- a/Source/WebKit/chromium/public/platform/WebMediaHints.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (C) 2012 Google Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "../../../../Platform/chromium/public/WebMediaHints.h" diff --git a/Source/WebKit/chromium/public/platform/WebPeerConnection00Handler.h b/Source/WebKit/chromium/public/platform/WebPeerConnection00Handler.h deleted file mode 100644 index e87ec99e7..000000000 --- a/Source/WebKit/chromium/public/platform/WebPeerConnection00Handler.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (C) 2012 Google Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "../../../../Platform/chromium/public/WebPeerConnection00Handler.h" diff --git a/Source/WebKit/chromium/public/platform/WebPeerConnection00HandlerClient.h b/Source/WebKit/chromium/public/platform/WebPeerConnection00HandlerClient.h deleted file mode 100644 index e6ba56cfc..000000000 --- a/Source/WebKit/chromium/public/platform/WebPeerConnection00HandlerClient.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (C) 2012 Google Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "../../../../Platform/chromium/public/WebPeerConnection00HandlerClient.h" diff --git a/Source/WebKit/chromium/public/platform/WebPeerConnectionHandler.h b/Source/WebKit/chromium/public/platform/WebPeerConnectionHandler.h deleted file mode 100644 index e68710c96..000000000 --- a/Source/WebKit/chromium/public/platform/WebPeerConnectionHandler.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (C) 2012 Google Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "../../../../Platform/chromium/public/WebPeerConnectionHandler.h" diff --git a/Source/WebKit/chromium/public/platform/WebPeerConnectionHandlerClient.h b/Source/WebKit/chromium/public/platform/WebPeerConnectionHandlerClient.h deleted file mode 100644 index defa67c45..000000000 --- a/Source/WebKit/chromium/public/platform/WebPeerConnectionHandlerClient.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (C) 2012 Google Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "../../../../Platform/chromium/public/WebPeerConnectionHandlerClient.h" diff --git a/Source/WebKit/chromium/public/platform/WebSessionDescriptionDescriptor.h b/Source/WebKit/chromium/public/platform/WebSessionDescriptionDescriptor.h deleted file mode 100644 index 8b1d2a255..000000000 --- a/Source/WebKit/chromium/public/platform/WebSessionDescriptionDescriptor.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (C) 2012 Google Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "../../../../Platform/chromium/public/WebSessionDescriptionDescriptor.h" diff --git a/Source/WebKit/chromium/public/platform/default/WebThemeEngine.h b/Source/WebKit/chromium/public/platform/default/WebThemeEngine.h new file mode 100644 index 000000000..3d7d130c2 --- /dev/null +++ b/Source/WebKit/chromium/public/platform/default/WebThemeEngine.h @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2010 Google Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "../../../../../Platform/chromium/public/default/WebThemeEngine.h" diff --git a/Source/WebKit/chromium/skia_webkit.gyp b/Source/WebKit/chromium/skia_webkit.gyp index d56e81d18..14a740d0c 100644 --- a/Source/WebKit/chromium/skia_webkit.gyp +++ b/Source/WebKit/chromium/skia_webkit.gyp @@ -47,9 +47,11 @@ # Temporarily ignore fix to antialias coverage, until we can rebaseline 'SK_USE_LEGACY_AA_COVERAGE', + + # When enabled yields a 10x speedup on some devices. + 'SK_DISABLE_FAST_AA_STROKE_RECT', ], }, }, ], } - diff --git a/Source/WebKit/chromium/src/AssertMatchingEnums.cpp b/Source/WebKit/chromium/src/AssertMatchingEnums.cpp index f3e7859ee..3ee9fcac5 100644 --- a/Source/WebKit/chromium/src/AssertMatchingEnums.cpp +++ b/Source/WebKit/chromium/src/AssertMatchingEnums.cpp @@ -37,6 +37,7 @@ #include "AccessibilityObject.h" #include "ApplicationCacheHost.h" #include "ContentSecurityPolicy.h" +#include "Cursor.h" #include "DocumentMarker.h" #include "EditorInsertAction.h" #include "ExceptionCode.h" @@ -59,14 +60,11 @@ #include "IDBKeyPath.h" #include "IDBMetadata.h" #include "IDBTransactionBackendInterface.h" -#include "IceOptions.h" #include "IconURL.h" #include "MediaPlayer.h" #include "MediaStreamSource.h" #include "NotificationClient.h" #include "PageVisibilityState.h" -#include "PeerConnection00.h" -#include "PlatformCursor.h" #include "RTCDataChannelDescriptor.h" #include "RTCPeerConnectionHandlerClient.h" #include "ReferrerPolicy.h" @@ -119,10 +117,7 @@ #include #include #include -#include #include -#include -#include #include #include #include @@ -216,6 +211,7 @@ COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleWebCoreLink, WebCoreLinkRole); COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleImageMapLink, ImageMapLinkRole); COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleImageMap, ImageMapRole); COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleListMarker, ListMarkerRole); +COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleMathElement, MathElementRole); COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleWebArea, WebAreaRole); COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleHeading, HeadingRole); COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleListBox, ListBoxRole); @@ -285,50 +281,50 @@ COMPILE_ASSERT_MATCHING_ENUM(WebApplicationCacheHost::UpdateReadyEvent, Applicat COMPILE_ASSERT_MATCHING_ENUM(WebApplicationCacheHost::CachedEvent, ApplicationCacheHost::CACHED_EVENT); COMPILE_ASSERT_MATCHING_ENUM(WebApplicationCacheHost::ObsoleteEvent, ApplicationCacheHost::OBSOLETE_EVENT); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypePointer, PlatformCursor::TypePointer); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeCross, PlatformCursor::TypeCross); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeHand, PlatformCursor::TypeHand); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeIBeam, PlatformCursor::TypeIBeam); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeWait, PlatformCursor::TypeWait); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeHelp, PlatformCursor::TypeHelp); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeEastResize, PlatformCursor::TypeEastResize); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthResize, PlatformCursor::TypeNorthResize); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthEastResize, PlatformCursor::TypeNorthEastResize); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthWestResize, PlatformCursor::TypeNorthWestResize); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeSouthResize, PlatformCursor::TypeSouthResize); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeSouthEastResize, PlatformCursor::TypeSouthEastResize); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeSouthWestResize, PlatformCursor::TypeSouthWestResize); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeWestResize, PlatformCursor::TypeWestResize); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthSouthResize, PlatformCursor::TypeNorthSouthResize); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeEastWestResize, PlatformCursor::TypeEastWestResize); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthEastSouthWestResize, PlatformCursor::TypeNorthEastSouthWestResize); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthWestSouthEastResize, PlatformCursor::TypeNorthWestSouthEastResize); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeColumnResize, PlatformCursor::TypeColumnResize); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeRowResize, PlatformCursor::TypeRowResize); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeMiddlePanning, PlatformCursor::TypeMiddlePanning); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeEastPanning, PlatformCursor::TypeEastPanning); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthPanning, PlatformCursor::TypeNorthPanning); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthEastPanning, PlatformCursor::TypeNorthEastPanning); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthWestPanning, PlatformCursor::TypeNorthWestPanning); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeSouthPanning, PlatformCursor::TypeSouthPanning); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeSouthEastPanning, PlatformCursor::TypeSouthEastPanning); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeSouthWestPanning, PlatformCursor::TypeSouthWestPanning); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeWestPanning, PlatformCursor::TypeWestPanning); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeMove, PlatformCursor::TypeMove); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeVerticalText, PlatformCursor::TypeVerticalText); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeCell, PlatformCursor::TypeCell); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeContextMenu, PlatformCursor::TypeContextMenu); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeAlias, PlatformCursor::TypeAlias); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeProgress, PlatformCursor::TypeProgress); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNoDrop, PlatformCursor::TypeNoDrop); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeCopy, PlatformCursor::TypeCopy); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNone, PlatformCursor::TypeNone); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNotAllowed, PlatformCursor::TypeNotAllowed); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeZoomIn, PlatformCursor::TypeZoomIn); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeZoomOut, PlatformCursor::TypeZoomOut); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeGrab, PlatformCursor::TypeGrab); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeGrabbing, PlatformCursor::TypeGrabbing); -COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeCustom, PlatformCursor::TypeCustom); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypePointer, Cursor::Pointer); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeCross, Cursor::Cross); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeHand, Cursor::Hand); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeIBeam, Cursor::IBeam); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeWait, Cursor::Wait); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeHelp, Cursor::Help); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeEastResize, Cursor::EastResize); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthResize, Cursor::NorthResize); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthEastResize, Cursor::NorthEastResize); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthWestResize, Cursor::NorthWestResize); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeSouthResize, Cursor::SouthResize); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeSouthEastResize, Cursor::SouthEastResize); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeSouthWestResize, Cursor::SouthWestResize); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeWestResize, Cursor::WestResize); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthSouthResize, Cursor::NorthSouthResize); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeEastWestResize, Cursor::EastWestResize); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthEastSouthWestResize, Cursor::NorthEastSouthWestResize); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthWestSouthEastResize, Cursor::NorthWestSouthEastResize); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeColumnResize, Cursor::ColumnResize); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeRowResize, Cursor::RowResize); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeMiddlePanning, Cursor::MiddlePanning); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeEastPanning, Cursor::EastPanning); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthPanning, Cursor::NorthPanning); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthEastPanning, Cursor::NorthEastPanning); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthWestPanning, Cursor::NorthWestPanning); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeSouthPanning, Cursor::SouthPanning); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeSouthEastPanning, Cursor::SouthEastPanning); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeSouthWestPanning, Cursor::SouthWestPanning); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeWestPanning, Cursor::WestPanning); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeMove, Cursor::Move); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeVerticalText, Cursor::VerticalText); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeCell, Cursor::Cell); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeContextMenu, Cursor::ContextMenu); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeAlias, Cursor::Alias); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeProgress, Cursor::Progress); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNoDrop, Cursor::NoDrop); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeCopy, Cursor::Copy); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNone, Cursor::None); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNotAllowed, Cursor::NotAllowed); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeZoomIn, Cursor::ZoomIn); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeZoomOut, Cursor::ZoomOut); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeGrab, Cursor::Grab); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeGrabbing, Cursor::Grabbing); +COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeCustom, Cursor::Custom); COMPILE_ASSERT_MATCHING_ENUM(WebEditingActionTyped, EditorInsertActionTyped); COMPILE_ASSERT_MATCHING_ENUM(WebEditingActionPasted, EditorInsertActionPasted); @@ -566,43 +562,31 @@ COMPILE_ASSERT_MATCHING_ENUM(WebMediaStreamSource::ReadyStateLive, MediaStreamSo COMPILE_ASSERT_MATCHING_ENUM(WebMediaStreamSource::ReadyStateMuted, MediaStreamSource::ReadyStateMuted); COMPILE_ASSERT_MATCHING_ENUM(WebMediaStreamSource::ReadyStateEnded, MediaStreamSource::ReadyStateEnded); -COMPILE_ASSERT_MATCHING_ENUM(WebICEOptions::CandidateTypeAll, IceOptions::ALL); -COMPILE_ASSERT_MATCHING_ENUM(WebICEOptions::CandidateTypeNoRelay, IceOptions::NO_RELAY); -COMPILE_ASSERT_MATCHING_ENUM(WebICEOptions::CandidateTypeOnlyRelay, IceOptions::ONLY_RELAY); - -COMPILE_ASSERT_MATCHING_ENUM(WebPeerConnection00Handler::ActionSDPOffer, PeerConnection00::SDP_OFFER); -COMPILE_ASSERT_MATCHING_ENUM(WebPeerConnection00Handler::ActionSDPPRanswer, PeerConnection00::SDP_PRANSWER); -COMPILE_ASSERT_MATCHING_ENUM(WebPeerConnection00Handler::ActionSDPAnswer, PeerConnection00::SDP_ANSWER); - -COMPILE_ASSERT_MATCHING_ENUM(WebPeerConnection00HandlerClient::ReadyStateNew, PeerConnection00::NEW); -COMPILE_ASSERT_MATCHING_ENUM(WebPeerConnection00HandlerClient::ReadyStateOpening, PeerConnection00::OPENING); -COMPILE_ASSERT_MATCHING_ENUM(WebPeerConnection00HandlerClient::ReadyStateNegotiating, PeerConnection00::OPENING); -COMPILE_ASSERT_MATCHING_ENUM(WebPeerConnection00HandlerClient::ReadyStateActive, PeerConnection00::ACTIVE); -COMPILE_ASSERT_MATCHING_ENUM(WebPeerConnection00HandlerClient::ReadyStateClosed, PeerConnection00::CLOSED); - -COMPILE_ASSERT_MATCHING_ENUM(WebPeerConnection00HandlerClient::ICEStateGathering, PeerConnection00::ICE_GATHERING); -COMPILE_ASSERT_MATCHING_ENUM(WebPeerConnection00HandlerClient::ICEStateWaiting, PeerConnection00::ICE_WAITING); -COMPILE_ASSERT_MATCHING_ENUM(WebPeerConnection00HandlerClient::ICEStateChecking, PeerConnection00::ICE_CHECKING); -COMPILE_ASSERT_MATCHING_ENUM(WebPeerConnection00HandlerClient::ICEStateConnected, PeerConnection00::ICE_CONNECTED); -COMPILE_ASSERT_MATCHING_ENUM(WebPeerConnection00HandlerClient::ICEStateCompleted, PeerConnection00::ICE_COMPLETED); -COMPILE_ASSERT_MATCHING_ENUM(WebPeerConnection00HandlerClient::ICEStateFailed, PeerConnection00::ICE_FAILED); -COMPILE_ASSERT_MATCHING_ENUM(WebPeerConnection00HandlerClient::ICEStateClosed, PeerConnection00::ICE_CLOSED); - COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ReadyStateNew, RTCPeerConnectionHandlerClient::ReadyStateNew); -COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ReadyStateOpening, RTCPeerConnectionHandlerClient::ReadyStateOpening); +COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ReadyStateHaveLocalOffer, RTCPeerConnectionHandlerClient::ReadyStateHaveLocalOffer); +COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ReadyStateHaveLocalPrAnswer, RTCPeerConnectionHandlerClient::ReadyStateHaveLocalPrAnswer); +COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ReadyStateHaveRemotePrAnswer, RTCPeerConnectionHandlerClient::ReadyStateHaveRemotePrAnswer); COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ReadyStateActive, RTCPeerConnectionHandlerClient::ReadyStateActive); -COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ReadyStateClosing, RTCPeerConnectionHandlerClient::ReadyStateClosing); COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ReadyStateClosed, RTCPeerConnectionHandlerClient::ReadyStateClosed); -COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEStateNew, RTCPeerConnectionHandlerClient::IceStateNew); -COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEStateGathering, RTCPeerConnectionHandlerClient::IceStateGathering); -COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEStateWaiting, RTCPeerConnectionHandlerClient::IceStateWaiting); +// DEPRECATED +COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ReadyStateOpening, RTCPeerConnectionHandlerClient::ReadyStateOpening); +COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ReadyStateClosing, RTCPeerConnectionHandlerClient::ReadyStateClosing); + + +COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEStateStarting, RTCPeerConnectionHandlerClient::IceStateStarting); COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEStateChecking, RTCPeerConnectionHandlerClient::IceStateChecking); COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEStateConnected, RTCPeerConnectionHandlerClient::IceStateConnected); COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEStateCompleted, RTCPeerConnectionHandlerClient::IceStateCompleted); COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEStateFailed, RTCPeerConnectionHandlerClient::IceStateFailed); +COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEStateDisconnected, RTCPeerConnectionHandlerClient::IceStateDisconnected); COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEStateClosed, RTCPeerConnectionHandlerClient::IceStateClosed); +// DEPRECATED +COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEStateNew, RTCPeerConnectionHandlerClient::IceStateNew); +COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEStateGathering, RTCPeerConnectionHandlerClient::IceStateGathering); +COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEStateWaiting, RTCPeerConnectionHandlerClient::IceStateWaiting); + COMPILE_ASSERT_MATCHING_ENUM(WebRTCDataChannel::ReadyStateConnecting, RTCDataChannelDescriptor::ReadyStateConnecting); COMPILE_ASSERT_MATCHING_ENUM(WebRTCDataChannel::ReadyStateOpen, RTCDataChannelDescriptor::ReadyStateOpen); COMPILE_ASSERT_MATCHING_ENUM(WebRTCDataChannel::ReadyStateClosing, RTCDataChannelDescriptor::ReadyStateClosing); diff --git a/Source/WebKit/chromium/src/ChromeClientImpl.cpp b/Source/WebKit/chromium/src/ChromeClientImpl.cpp index 94959380a..e617e8f5a 100644 --- a/Source/WebKit/chromium/src/ChromeClientImpl.cpp +++ b/Source/WebKit/chromium/src/ChromeClientImpl.cpp @@ -37,8 +37,12 @@ #if ENABLE(INPUT_TYPE_COLOR) #include "ColorChooser.h" #include "ColorChooserClient.h" +#if ENABLE(PAGE_POPUP) +#include "ColorChooserPopupUIController.h" +#else #include "ColorChooserUIController.h" #endif +#endif #include "Console.h" #include "Cursor.h" #include "DatabaseTracker.h" @@ -46,6 +50,7 @@ #include "DateTimeChooserImpl.h" #include "Document.h" #include "DocumentLoader.h" +#include "ExternalDateTimeChooser.h" #include "ExternalPopupMenu.h" #include "FileChooser.h" #include "FileIconLoader.h" @@ -292,7 +297,12 @@ static inline void updatePolicyForEvent(const WebInputEvent* inputEvent, WebNavi bool alt = mouseEvent->modifiers & WebMouseEvent::AltKey; bool meta = mouseEvent->modifiers & WebMouseEvent::MetaKey; - WebViewImpl::navigationPolicyFromMouseEvent(buttonNumber, ctrl, shift, alt, meta, policy); + WebNavigationPolicy userPolicy = *policy; + WebViewImpl::navigationPolicyFromMouseEvent(buttonNumber, ctrl, shift, alt, meta, &userPolicy); + // User and app agree that we want a new window; let the app override the decorations. + if (userPolicy == WebNavigationPolicyNewWindow && *policy == WebNavigationPolicyNewPopup) + return; + *policy = userPolicy; } WebNavigationPolicy ChromeClientImpl::getNavigationPolicy() @@ -590,7 +600,7 @@ void ChromeClientImpl::mouseDidMoveOverElement( Widget* widget = toRenderWidget(object)->widget(); if (widget && widget->isPluginContainer()) { WebPluginContainerImpl* plugin = static_cast(widget); - url = plugin->plugin()->linkAtPosition(result.roundedPoint()); + url = plugin->plugin()->linkAtPosition(result.roundedPointInInnerNodeFrame()); } } } @@ -615,22 +625,18 @@ void ChromeClientImpl::dispatchViewportPropertiesDidChange(const ViewportArgumen if (!m_webView->settings()->viewportEnabled() || !m_webView->isFixedLayoutModeEnabled() || !m_webView->client() || !m_webView->page()) return; - FrameView* frameView = m_webView->mainFrameImpl()->frameView(); - int dpi = screenHorizontalDPI(frameView); - ASSERT(dpi > 0); - WebViewClient* client = m_webView->client(); - WebRect deviceRect = client->windowRect(); + WebSize deviceSize = m_webView->size(); // If the window size has not been set yet don't attempt to set the viewport - if (!deviceRect.width || !deviceRect.height) + if (!deviceSize.width || !deviceSize.height) return; Settings* settings = m_webView->page()->settings(); - float devicePixelRatio = dpi / ViewportArguments::deprecatedTargetDPI; + float devicePixelRatio = client->screenInfo().deviceScaleFactor; // Call the common viewport computing logic in ViewportArguments.cpp. ViewportAttributes computed = computeViewportAttributes( - arguments, settings->layoutFallbackWidth(), deviceRect.width, deviceRect.height, - devicePixelRatio, IntSize(deviceRect.width, deviceRect.height)); + arguments, settings->layoutFallbackWidth(), deviceSize.width, deviceSize.height, + devicePixelRatio, IntSize(deviceSize.width, deviceSize.height)); restrictScaleFactorToInitialScaleIfNotUserScalable(computed); @@ -675,7 +681,14 @@ void ChromeClientImpl::reachedApplicationCacheOriginQuota(SecurityOrigin*, int64 #if ENABLE(INPUT_TYPE_COLOR) PassOwnPtr ChromeClientImpl::createColorChooser(ColorChooserClient* chooserClient, const Color&) { - return adoptPtr(new ColorChooserUIController(this, chooserClient)); + OwnPtr controller; +#if ENABLE(PAGE_POPUP) + controller = adoptPtr(new ColorChooserPopupUIController(this, chooserClient)); +#else + controller = adoptPtr(new ColorChooserUIController(this, chooserClient)); +#endif + controller->openUI(); + return controller.release(); } PassOwnPtr ChromeClientImpl::createWebColorChooser(WebColorChooserClient* chooserClient, const WebColor& initialColor) { @@ -692,8 +705,7 @@ PassRefPtr ChromeClientImpl::openDateTimeChooser(DateTimeChoose #if ENABLE(INPUT_MULTIPLE_FIELDS_UI) return DateTimeChooserImpl::create(this, pickerClient, parameters); #else - notImplemented(); - return PassRefPtr(); + return ExternalDateTimeChooser::create(this, m_webView->client(), pickerClient, parameters); #endif } #endif diff --git a/Source/WebKit/chromium/src/ColorChooserPopupUIController.cpp b/Source/WebKit/chromium/src/ColorChooserPopupUIController.cpp new file mode 100644 index 000000000..5af98f087 --- /dev/null +++ b/Source/WebKit/chromium/src/ColorChooserPopupUIController.cpp @@ -0,0 +1,157 @@ +/* + * Copyright (C) 2012 Google Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "config.h" +#include "ColorChooserPopupUIController.h" + +#if ENABLE(INPUT_TYPE_COLOR) && ENABLE(PAGE_POPUP) +#include "ChromeClientImpl.h" +#include "ColorChooserClient.h" +#include "ColorSuggestionPicker.h" +#include "FrameView.h" +#include "IntRect.h" +#include "LocalizedStrings.h" +#include "PickerCommon.h" +#include "WebColorChooser.h" +#include "WebViewImpl.h" +#include +#include + +using namespace WebCore; + +namespace WebKit { + +// Keep in sync with Actions in colorSuggestionPicker.js. +enum ColorPickerPopupAction { + ColorPickerPopupActionChooseOtherColor = -2, + ColorPickerPopupActionCancel = -1, + ColorPickerPopupActionSetValue = 0 +}; + +ColorChooserPopupUIController::ColorChooserPopupUIController(ChromeClientImpl* chromeClient, ColorChooserClient* client) + : ColorChooserUIController(chromeClient, client) + , m_chromeClient(chromeClient) + , m_client(client) + , m_popup(0) + , m_locale(Locale::createDefault()) +{ +} + +ColorChooserPopupUIController::~ColorChooserPopupUIController() +{ +} + +void ColorChooserPopupUIController::openUI() +{ + if (m_client->shouldShowSuggestions()) + openPopup(); + else + openColorChooser(); +} + +void ColorChooserPopupUIController::endChooser() +{ + if (m_chooser) + m_chooser->endChooser(); + if (m_popup) + closePopup(); +} + +IntSize ColorChooserPopupUIController::contentSize() +{ + return IntSize(0, 0); +} + +void ColorChooserPopupUIController::writeDocument(DocumentWriter& writer) +{ + Vector suggestions = m_client->suggestions(); + Vector suggestionValues; + for (unsigned i = 0; i < suggestions.size(); i++) + suggestionValues.append(suggestions[i].serialized()); + IntRect anchorRectInScreen = m_chromeClient->rootViewToScreen(m_client->elementRectRelativeToRootView()); + FrameView* view = static_cast(m_chromeClient->webView())->page()->mainFrame()->view(); + IntRect rootViewVisibleContentRect = view->visibleContentRect(true /* include scrollbars */); + IntRect rootViewRectInScreen = m_chromeClient->rootViewToScreen(rootViewVisibleContentRect); + + PagePopupClient::addString("
Loading...
\n", writer); +} + +Locale& ColorChooserPopupUIController::locale() +{ + return *m_locale; +} + +void ColorChooserPopupUIController::setValueAndClosePopup(int numValue, const String& stringValue) +{ + ASSERT(m_popup); + ASSERT(m_client); + if (numValue == ColorPickerPopupActionSetValue) + m_client->didChooseColor(Color(stringValue)); + if (numValue == ColorPickerPopupActionChooseOtherColor) + openColorChooser(); + closePopup(); +} + +void ColorChooserPopupUIController::didClosePopup() +{ + m_popup = 0; + + if (!m_chooser) + didEndChooser(); +} + + +void ColorChooserPopupUIController::openPopup() +{ + ASSERT(!m_popup); + m_popup = m_chromeClient->openPagePopup(this, m_client->elementRectRelativeToRootView()); +} + +void ColorChooserPopupUIController::closePopup() +{ + if (!m_popup) + return; + m_chromeClient->closePagePopup(m_popup); +} + +} +#endif // ENABLE(INPUT_TYPE_COLOR) && ENABLE(PAGE_POPUP) diff --git a/Source/WebKit/chromium/src/ColorChooserPopupUIController.h b/Source/WebKit/chromium/src/ColorChooserPopupUIController.h new file mode 100644 index 000000000..c4d5848c4 --- /dev/null +++ b/Source/WebKit/chromium/src/ColorChooserPopupUIController.h @@ -0,0 +1,72 @@ +/* + * Copyright (C) 2011 Google Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +#ifndef ColorChooserPopupUIController_h +#define ColorChooserPopupUIController_h + +#if ENABLE(INPUT_TYPE_COLOR) && ENABLE(PAGE_POPUP) +#include "ColorChooserUIController.h" +#include "PagePopupClient.h" +#include + +namespace WebCore { +class ColorChooserClient; +class PagePopup; +} + +namespace WebKit { + +class ColorChooserPopupUIController : public ColorChooserUIController, public WebCore::PagePopupClient { + +public: + ColorChooserPopupUIController(ChromeClientImpl*, WebCore::ColorChooserClient*); + virtual ~ColorChooserPopupUIController(); + + // ColorChooserUIController functions: + virtual void openUI() OVERRIDE; + + // ColorChooser functions + void endChooser() OVERRIDE; + + // PagePopupClient functions: + virtual WebCore::IntSize contentSize() OVERRIDE; + virtual void writeDocument(WebCore::DocumentWriter&) OVERRIDE; + virtual WebCore::Locale& locale() OVERRIDE; + virtual void setValueAndClosePopup(int, const String&) OVERRIDE; + virtual void didClosePopup() OVERRIDE; + +private: + void openPopup(); + void closePopup(); + + ChromeClientImpl* m_chromeClient; + WebCore::ColorChooserClient* m_client; + WebCore::PagePopup* m_popup; + OwnPtr m_locale; +}; +} + +#endif // ENABLE(INPUT_TYPE_COLOR) && ENABLE(PAGE_POPUP) + +#endif // ColorChooserPopupUIController_h diff --git a/Source/WebKit/chromium/src/ColorChooserUIController.cpp b/Source/WebKit/chromium/src/ColorChooserUIController.cpp index 5789691e8..7ab3c34d4 100644 --- a/Source/WebKit/chromium/src/ColorChooserUIController.cpp +++ b/Source/WebKit/chromium/src/ColorChooserUIController.cpp @@ -27,48 +27,32 @@ #include "ColorChooserUIController.h" #if ENABLE(INPUT_TYPE_COLOR) - #include "ChromeClientImpl.h" #include "Color.h" #include "ColorChooserClient.h" -#include "ColorSuggestionPicker.h" -#include "FrameView.h" -#include "IntRect.h" -#include "LocalizedStrings.h" -#include "PickerCommon.h" #include "WebColorChooser.h" -#include "WebViewImpl.h" -#include #include -#include using namespace WebCore; namespace WebKit { -// Keep in sync with Actions in colorSuggestionPicker.js. -enum ColorPickerPopupAction { - ColorPickerPopupActionChooseOtherColor = -2, - ColorPickerPopupActionCancel = -1, - ColorPickerPopupActionSetValue = 0 -}; ColorChooserUIController::ColorChooserUIController(ChromeClientImpl* chromeClient, ColorChooserClient* client) : m_chromeClient(chromeClient) , m_client(client) - , m_popup(0) - , m_locale(Locale::createDefault()) { - if (m_client->shouldShowSuggestions()) - openPopup(); - else - openColorChooser(); } ColorChooserUIController::~ColorChooserUIController() { } +void ColorChooserUIController::openUI() +{ + openColorChooser(); +} + void ColorChooserUIController::setSelectedColor(const Color& color) { ASSERT(m_chooser); @@ -79,8 +63,6 @@ void ColorChooserUIController::endChooser() { if (m_chooser) m_chooser->endChooser(); - if (m_popup) - closePopup(); } void ColorChooserUIController::didChooseColor(const WebColor& color) @@ -96,79 +78,6 @@ void ColorChooserUIController::didEndChooser() m_client->didEndChooser(); } -IntSize ColorChooserUIController::contentSize() -{ - return IntSize(0, 0); -} - -void ColorChooserUIController::writeDocument(DocumentWriter& writer) -{ - Vector suggestions = m_client->suggestions(); - Vector suggestionValues; - for (unsigned i = 0; i < suggestions.size(); i++) - suggestionValues.append(suggestions[i].serialized()); - IntRect anchorRectInScreen = m_chromeClient->rootViewToScreen(m_client->elementRectRelativeToRootView()); - FrameView* view = static_cast(m_chromeClient->webView())->page()->mainFrame()->view(); - IntRect rootViewVisibleContentRect = view->visibleContentRect(true /* include scrollbars */); - IntRect rootViewRectInScreen = m_chromeClient->rootViewToScreen(rootViewVisibleContentRect); - - PagePopupClient::addString("
Loading...
\n", writer); -} - -Locale& ColorChooserUIController::locale() -{ - return *m_locale; -} - -void ColorChooserUIController::setValueAndClosePopup(int numValue, const String& stringValue) -{ - ASSERT(m_popup); - ASSERT(m_client); - if (numValue == ColorPickerPopupActionSetValue) - m_client->didChooseColor(Color(stringValue)); - if (numValue == ColorPickerPopupActionChooseOtherColor) - openColorChooser(); - closePopup(); -} - -void ColorChooserUIController::didClosePopup() -{ - m_popup = 0; - - if (!m_chooser) - didEndChooser(); -} - -void ColorChooserUIController::openPopup() -{ - ASSERT(!m_popup); - m_popup = m_chromeClient->openPagePopup(this, m_client->elementRectRelativeToRootView()); -} - -void ColorChooserUIController::closePopup() -{ - if (!m_popup) - return; - m_chromeClient->closePagePopup(m_popup); -} - void ColorChooserUIController::openColorChooser() { ASSERT(!m_chooser); diff --git a/Source/WebKit/chromium/src/ColorChooserUIController.h b/Source/WebKit/chromium/src/ColorChooserUIController.h index 60cecfe18..4f32d7e0a 100644 --- a/Source/WebKit/chromium/src/ColorChooserUIController.h +++ b/Source/WebKit/chromium/src/ColorChooserUIController.h @@ -29,15 +29,12 @@ #if ENABLE(INPUT_TYPE_COLOR) #include "ColorChooser.h" -#include "PagePopupClient.h" #include "PlatformLocale.h" #include "WebColorChooserClient.h" #include -#include namespace WebCore { class ColorChooserClient; -class PagePopup; } namespace WebKit { @@ -45,11 +42,13 @@ namespace WebKit { class ChromeClientImpl; class WebColorChooser; -class ColorChooserUIController : public WebColorChooserClient, public WebCore::ColorChooser, public WebCore::PagePopupClient { +class ColorChooserUIController : public WebColorChooserClient, public WebCore::ColorChooser { public: ColorChooserUIController(ChromeClientImpl*, WebCore::ColorChooserClient*); virtual ~ColorChooserUIController(); + virtual void openUI(); + // ColorChooser functions: virtual void setSelectedColor(const WebCore::Color&) OVERRIDE; virtual void endChooser() OVERRIDE; @@ -58,23 +57,14 @@ public: virtual void didChooseColor(const WebColor&) OVERRIDE; virtual void didEndChooser() OVERRIDE; - // PagePopupClient functions: - virtual WebCore::IntSize contentSize() OVERRIDE; - virtual void writeDocument(WebCore::DocumentWriter&) OVERRIDE; - virtual WebCore::Locale& locale() OVERRIDE; - virtual void setValueAndClosePopup(int, const String&) OVERRIDE; - virtual void didClosePopup() OVERRIDE; +protected: + void openColorChooser(); + OwnPtr m_chooser; private: - void openPopup(); - void closePopup(); - void openColorChooser(); ChromeClientImpl* m_chromeClient; WebCore::ColorChooserClient* m_client; - OwnPtr m_chooser; - WebCore::PagePopup* m_popup; - OwnPtr m_locale; }; } diff --git a/Source/WebKit/chromium/src/ContextMenuClientImpl.cpp b/Source/WebKit/chromium/src/ContextMenuClientImpl.cpp index ad116090c..bda1b2e9a 100644 --- a/Source/WebKit/chromium/src/ContextMenuClientImpl.cpp +++ b/Source/WebKit/chromium/src/ContextMenuClientImpl.cpp @@ -120,7 +120,7 @@ static String selectMisspelledWord(const ContextMenu* defaultMenu, Frame* select // Selection is empty, so change the selection to the word under the cursor. HitTestResult hitTestResult = selectedFrame->eventHandler()-> - hitTestResultAtPoint(selectedFrame->page()->contextMenuController()->hitTestResult().point(), true); + hitTestResultAtPoint(selectedFrame->page()->contextMenuController()->hitTestResult().pointInInnerNodeFrame(), true); Node* innerNode = hitTestResult.innerNode(); VisiblePosition pos(innerNode->renderer()->positionForPoint( hitTestResult.localPoint())); @@ -155,10 +155,10 @@ PlatformMenuDescription ContextMenuClientImpl::getCustomMenuFromDefaultItems( return 0; HitTestResult r = m_webView->page()->contextMenuController()->hitTestResult(); - Frame* selectedFrame = r.innerNonSharedNode()->document()->frame(); + Frame* selectedFrame = r.innerNodeFrame(); WebContextMenuData data; - data.mousePosition = selectedFrame->view()->contentsToWindow(r.roundedPoint()); + data.mousePosition = selectedFrame->view()->contentsToWindow(r.roundedPointInInnerNodeFrame()); // Compute edit flags. data.editFlags = WebContextMenuData::CanDoNone; @@ -212,7 +212,7 @@ PlatformMenuDescription ContextMenuClientImpl::getCustomMenuFromDefaultItems( if (mediaElement->hasVideo()) data.mediaFlags |= WebContextMenuData::MediaHasVideo; if (mediaElement->controls()) - data.mediaFlags |= WebContextMenuData::MediaControlRootElement; + data.mediaFlags |= WebContextMenuData::MediaControls; } else if (r.innerNonSharedNode()->hasTagName(HTMLNames::objectTag) || r.innerNonSharedNode()->hasTagName(HTMLNames::embedTag)) { RenderObject* object = r.innerNonSharedNode()->renderer(); @@ -298,8 +298,9 @@ PlatformMenuDescription ContextMenuClientImpl::getCustomMenuFromDefaultItems( selectedFrame->selection()->setSelection(selection, WordGranularity); } } - } else if (m_webView->focusedWebCoreFrame()->editor()->isContinuousSpellCheckingEnabled()) { - data.isSpellCheckingEnabled = true; + } else { + data.isSpellCheckingEnabled = + m_webView->focusedWebCoreFrame()->editor()->isContinuousSpellCheckingEnabled(); // Spellchecking might be enabled for the field, but could be disabled on the node. if (m_webView->focusedWebCoreFrame()->editor()->isSpellCheckingEnabledInFocusedNode()) { data.misspelledWord = selectMisspelledWord(defaultMenu, selectedFrame); diff --git a/Source/WebKit/chromium/src/DateTimeChooserImpl.cpp b/Source/WebKit/chromium/src/DateTimeChooserImpl.cpp index f44157a76..d966ba9d6 100644 --- a/Source/WebKit/chromium/src/DateTimeChooserImpl.cpp +++ b/Source/WebKit/chromium/src/DateTimeChooserImpl.cpp @@ -60,7 +60,7 @@ DateTimeChooserImpl::DateTimeChooserImpl(ChromeClientImpl* chromeClient, WebCore , m_client(client) , m_popup(0) , m_parameters(parameters) - , m_locale(WebCore::Locale::createDefault()) + , m_locale(WebCore::Locale::create(parameters.locale)) { ASSERT(m_chromeClient); ASSERT(m_client); @@ -110,12 +110,17 @@ void DateTimeChooserImpl::writeDocument(WebCore::DocumentWriter& writer) IntRect rootViewRectInScreen = m_chromeClient->rootViewToScreen(rootViewVisibleContentRect); rootViewRectInScreen.move(-view->scrollX(), -view->scrollY()); String todayLabelString; - if (m_parameters.type == WebCore::InputTypeNames::month()) + String otherDateLabelString; + if (m_parameters.type == WebCore::InputTypeNames::month()) { todayLabelString = Platform::current()->queryLocalizedString(WebLocalizedString::ThisMonthButtonLabel); - else if (m_parameters.type == WebCore::InputTypeNames::week()) + otherDateLabelString = Platform::current()->queryLocalizedString(WebLocalizedString::OtherMonthLabel); + } else if (m_parameters.type == WebCore::InputTypeNames::week()) { todayLabelString = Platform::current()->queryLocalizedString(WebLocalizedString::ThisWeekButtonLabel); - else + otherDateLabelString = Platform::current()->queryLocalizedString(WebLocalizedString::OtherWeekLabel); + } else { todayLabelString = Platform::current()->queryLocalizedString(WebLocalizedString::CalendarToday); + otherDateLabelString = Platform::current()->queryLocalizedString(WebLocalizedString::OtherDateLabel); + } addString(" + + + + + + + + diff --git a/Source/WebKit/chromium/tests/data/scale_oscillate.html b/Source/WebKit/chromium/tests/data/scale_oscillate.html new file mode 100644 index 000000000..26ca4613c --- /dev/null +++ b/Source/WebKit/chromium/tests/data/scale_oscillate.html @@ -0,0 +1,16 @@ + + + +Test + + + + +This test passes if it doesn't cause oscillating scale factor due to content size rounding errors and creating/destroying of custom scrollbars. +An example of parameter that reproduce the crash is viewport size (800, 1057) with device scale factor 1.325 + + -- cgit v1.2.1