diff options
Diffstat (limited to 'Tools')
20 files changed, 378 insertions, 92 deletions
diff --git a/Tools/ChangeLog b/Tools/ChangeLog index 92bc0975f..b7eb6dc0b 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,194 @@ +2012-10-18 Simon Hausmann <simon.hausmann@digia.com> + + [Qt] Reduce memory pressure during link time + + Reviewed by Tor Arne Vestbø. + + If possible always pass -fkeep-memory to the linker on i386. The + library has grown so big that we need this not only for i386 debug + builds but at least also for release. + + * qmake/mkspecs/features/unix/default_post.prf: + +2012-10-17 Tor Arne Vestbø <tor.arne.vestbo@digia.com> + + [Qt] Modularize documentation for QtWebKit + + Running 'make docs' would fail unless 'make qmake_all' was ran first, + but qmake_all involved generating all the derived sources, which seems + overly complex just for building documentation. + + We solve this by preventing all subdirs except QtWebKit from having a + docs target. This would normally work fine on its own, but since we + use CONFIG += ordered, there's now a missing doc target for the + immediate dependency of the QtWebKit subdir. We solve this by adding + a dummy-target ourselves. + + Finally, we clean up the qdocconf file to match the rest of the Qt + documentation modularization efforts. + + Reviewed by Simon Hausmann. + + * qmake/mkspecs/features/default_post.prf: + +2012-10-17 Zoltan Horvath <zoltan@webkit.org> + + Remove the JSHeap memory measurement of the PageLoad performacetests since it creates bogus JSGlobalDatas + https://bugs.webkit.org/show_bug.cgi?id=99609 + + Reviewed by Ryosuke Niwa. + + Remove the implementation since it creates bogus JSGlobalDatas in the layout tests. + + * DumpRenderTree/mac/DumpRenderTree.mm: + (dump): + +2012-10-17 Dirk Pranke <dpranke@chromium.org> + + [chromium] stop falling back to platform/mac for LayoutTest results + https://bugs.webkit.org/show_bug.cgi?id=99666 + + Reviewed by James Robinson. + + Previously the Chromium ports would fall back to results in + platform/mac if a result was not found in platform/chromium-*. + This allowed us to share a lot of results w/ the Apple Mac port, + but often surprised people (especially at Apple ;) when changing + something in that directory would break a Chromium build. + + The tests that are deleted in baselineoptimizer were for cases + that are no longer relevant or possible in the current fallback + graph. + + * Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py: + (BaselineOptimizerTest.test_move_baselines): + (BaselineOptimizerTest.test_chromium_covers_mac_win_linux): + * Scripts/webkitpy/layout_tests/port/chromium_android.py: + (ChromiumAndroidPort): + * Scripts/webkitpy/layout_tests/port/chromium_linux.py: + (ChromiumLinuxPort): + * Scripts/webkitpy/layout_tests/port/chromium_mac.py: + (ChromiumMacPort): + * Scripts/webkitpy/layout_tests/port/chromium_win.py: + (ChromiumWinPort): + * TestResultServer/static-dashboards/flakiness_dashboard.js: + +2012-10-17 Shashi Shekhar <shashishekhar@google.com> + + Remove redundant sdk_build parameter. + https://bugs.webkit.org/show_bug.cgi?id=99648 + + Reviewed by Adam Barth. + + sdk_build parameter is no longer needed. + + * DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp: + * TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp: + +2012-10-17 Joanmarie Diggs <jdiggs@igalia.com> + + [GTK] AccessibilityUIElement::role() should be consistent across platforms wherever possible + https://bugs.webkit.org/show_bug.cgi?id=99640 + + Reviewed by Chris Fleizach. + + Convert AtkRole instances to the Mac/Safari-style AXRole string. + + * DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp: + (roleToString): New method to convert AtkRole instances to the Mac/Safari-style AXRole string + (AccessibilityUIElement::role): Output the Mac/Safair-style AXRole string rather than the AtkRole's name + +2012-10-17 Anders Carlsson <andersca@apple.com> + + Clean up Vector.h + https://bugs.webkit.org/show_bug.cgi?id=99622 + + Reviewed by Benjamin Poulain. + + Remove ReversedProxy test. + + * TestWebKitAPI/Tests/WTF/Vector.cpp: + +2012-10-17 Scott Graham <scottmg@chromium.org> + + Integer overflows/underflows in all Gamepad controller api calls. + https://bugs.webkit.org/show_bug.cgi?id=97262 + + Reviewed by Abhishek Arya. + + Range check controller inputs. This code is not exposed to the web, + but makes fuzzers try less hard to break uninteresting code. + + * DumpRenderTree/chromium/TestRunner/GamepadController.cpp: + (GamepadController::setButtonCount): + (GamepadController::setButtonData): + (GamepadController::setAxisCount): + (GamepadController::setAxisData): + +2012-10-17 Joseph Pecoraro <pecoraro@apple.com> + + Unreviewed watchlist email change. + + * Scripts/webkitpy/common/config/watchlist: + +2012-10-17 Dan Carney <dcarney@google.com> + + Bind isolatedWorldSecurityOrigin to world + https://bugs.webkit.org/show_bug.cgi?id=99582 + + Reviewed by Adam Barth. + + Added ability to unset isolatedWorldSecurityOrigin. + + * DumpRenderTree/chromium/DRTTestRunner.cpp: + (DRTTestRunner::setIsolatedWorldSecurityOrigin): + +2012-10-17 Joseph Pecoraro <pecoraro@apple.com> + + Unreviewed watchlist addition. + + * Scripts/webkitpy/common/config/watchlist: + +2012-10-17 Sadrul Habib Chowdhury <sadrul@chromium.org> + + plugins: Allow a plugin to dictate whether it can receive drag events or not. + https://bugs.webkit.org/show_bug.cgi?id=99355 + + Reviewed by Tony Chang. + + Update the TestWebPlugin to implement the new |canProcessDrag| interface. + + * DumpRenderTree/chromium/TestWebPlugin.h: + (TestWebPlugin::canProcessDrag): + +2012-10-17 Dominic Mazzoni <dmazzoni@google.com> + + Unreviewed. Create an accessibility watchlist. + + * Scripts/webkitpy/common/config/committers.py: + * Scripts/webkitpy/common/config/watchlist: + +2012-10-17 Jochen Eisinger <jochen@chromium.org> + + [gyp] fix bundle resources for DumpRenderTree on mac + https://bugs.webkit.org/show_bug.cgi?id=99558 + + Reviewed by Adam Barth. + + mac_bundle_resources doesn't propagate to targets that depend on it, + so I'm wrapping it in an all_dependent_settings block. + + * DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp: + +2012-10-17 Harald Alvestrand <hta@google.com> + + Add myself to the MediaStream watchlist + https://bugs.webkit.org/show_bug.cgi?id=99589 + + Reviewed by Adam Barth. + + * Scripts/webkitpy/common/config/watchlist: + 2012-10-17 Mikhail Pozdnyakov <mikhail.pozdnyakov@intel.com> [WK2][WTR] InjectedBundlePage::decidePolicyForNavigationAction() should print only filename part of local URLs diff --git a/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp b/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp index 4145b9cc0..a24051584 100644 --- a/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp +++ b/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp @@ -132,20 +132,22 @@ 'dependencies': [ 'LayoutTestHelper', ], - 'mac_bundle_resources': [ - '<(ahem_path)', - '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher100.ttf', - '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher200.ttf', - '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher300.ttf', - '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher400.ttf', - '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher500.ttf', - '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher600.ttf', - '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher700.ttf', - '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher800.ttf', - '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher900.ttf', - '<(SHARED_INTERMEDIATE_DIR)/webkit/missingImage.png', - '<(SHARED_INTERMEDIATE_DIR)/webkit/textAreaResizeCorner.png', - ], + 'all_dependent_settings': { + 'mac_bundle_resources': [ + '<(ahem_path)', + '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher100.ttf', + '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher200.ttf', + '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher300.ttf', + '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher400.ttf', + '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher500.ttf', + '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher600.ttf', + '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher700.ttf', + '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher800.ttf', + '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher900.ttf', + '<(SHARED_INTERMEDIATE_DIR)/webkit/missingImage.png', + '<(SHARED_INTERMEDIATE_DIR)/webkit/textAreaResizeCorner.png', + ], + }, }], ['use_x11 == 1', { 'copies': [{ @@ -541,7 +543,6 @@ '-DPRODUCT_DIR=<(ant_build_out)', '--ant-args', '-DCHROMIUM_SRC=<(ant_build_to_chromium_src)', - '--sdk-build=<(sdk_build)', '--app_abi', '<(android_app_abi)', ], diff --git a/Tools/DumpRenderTree/chromium/DRTTestRunner.cpp b/Tools/DumpRenderTree/chromium/DRTTestRunner.cpp index 8aee7c5b2..082597a11 100644 --- a/Tools/DumpRenderTree/chromium/DRTTestRunner.cpp +++ b/Tools/DumpRenderTree/chromium/DRTTestRunner.cpp @@ -1392,12 +1392,13 @@ void DRTTestRunner::setIsolatedWorldSecurityOrigin(const CppArgumentList& argume { result->setNull(); - if (arguments.size() != 2 || !arguments[0].isNumber() || !arguments[1].isString()) + if (arguments.size() != 2 || !arguments[0].isNumber() || !(arguments[1].isString() || arguments[1].isNull())) return; - m_shell->webView()->focusedFrame()->setIsolatedWorldSecurityOrigin( - arguments[0].toInt32(), - WebSecurityOrigin::createFromString(cppVariantToWebString(arguments[1]))); + WebSecurityOrigin origin; + if (arguments[1].isString()) + origin = WebSecurityOrigin::createFromString(cppVariantToWebString(arguments[1])); + m_shell->webView()->focusedFrame()->setIsolatedWorldSecurityOrigin(arguments[0].toInt32(), origin); } void DRTTestRunner::setAllowUniversalAccessFromFileURLs(const CppArgumentList& arguments, CppVariant* result) diff --git a/Tools/DumpRenderTree/chromium/TestRunner/GamepadController.cpp b/Tools/DumpRenderTree/chromium/TestRunner/GamepadController.cpp index 35b7dfa38..cb36bfdfb 100644 --- a/Tools/DumpRenderTree/chromium/TestRunner/GamepadController.cpp +++ b/Tools/DumpRenderTree/chromium/TestRunner/GamepadController.cpp @@ -128,6 +128,8 @@ void GamepadController::setButtonCount(const CppArgumentList& args, CppVariant* if (index < 0 || index >= static_cast<int>(WebKit::WebGamepads::itemsLengthCap)) return; int buttons = args[1].toInt32(); + if (buttons < 0 || buttons >= static_cast<int>(WebKit::WebGamepad::buttonsLengthCap)) + return; m_gamepads.items[index].buttonsLength = buttons; m_delegate->setGamepadData(m_gamepads); result->setNull(); @@ -143,6 +145,8 @@ void GamepadController::setButtonData(const CppArgumentList& args, CppVariant* r if (index < 0 || index >= static_cast<int>(WebKit::WebGamepads::itemsLengthCap)) return; int button = args[1].toInt32(); + if (button < 0 || button >= static_cast<int>(WebKit::WebGamepad::buttonsLengthCap)) + return; double data = args[2].toDouble(); m_gamepads.items[index].buttons[button] = data; m_delegate->setGamepadData(m_gamepads); @@ -159,6 +163,8 @@ void GamepadController::setAxisCount(const CppArgumentList& args, CppVariant* re if (index < 0 || index >= static_cast<int>(WebKit::WebGamepads::itemsLengthCap)) return; int axes = args[1].toInt32(); + if (axes < 0 || axes >= static_cast<int>(WebKit::WebGamepad::axesLengthCap)) + return; m_gamepads.items[index].axesLength = axes; m_delegate->setGamepadData(m_gamepads); result->setNull(); @@ -174,6 +180,8 @@ void GamepadController::setAxisData(const CppArgumentList& args, CppVariant* res if (index < 0 || index >= static_cast<int>(WebKit::WebGamepads::itemsLengthCap)) return; int axis = args[1].toInt32(); + if (axis < 0 || axis >= static_cast<int>(WebKit::WebGamepad::axesLengthCap)) + return; double data = args[2].toDouble(); m_gamepads.items[index].axes[axis] = data; m_delegate->setGamepadData(m_gamepads); diff --git a/Tools/DumpRenderTree/chromium/TestWebPlugin.cpp b/Tools/DumpRenderTree/chromium/TestWebPlugin.cpp index c54ebedea..7080bef18 100644 --- a/Tools/DumpRenderTree/chromium/TestWebPlugin.cpp +++ b/Tools/DumpRenderTree/chromium/TestWebPlugin.cpp @@ -125,6 +125,7 @@ TestWebPlugin::TestWebPlugin(WebKit::WebFrame* frame, , m_context(0) , m_acceptsTouchEvent(false) , m_printEventDetails(false) + , m_canProcessDrag(false) { static const WebString kAttributePrimitive = WebString::fromUTF8("primitive"); static const WebString kAttributeBackgroundColor = WebString::fromUTF8("background-color"); @@ -132,6 +133,7 @@ TestWebPlugin::TestWebPlugin(WebKit::WebFrame* frame, static const WebString kAttributeOpacity = WebString::fromUTF8("opacity"); static const WebString kAttributeAcceptsTouch = WebString::fromUTF8("accepts-touch"); static const WebString kAttributePrintEventDetails = WebString::fromUTF8("print-event-details"); + static const WebString kAttributeCanProcessDrag = WebString::fromUTF8("can-process-drag"); ASSERT(params.attributeNames.size() == params.attributeValues.size()); size_t size = params.attributeNames.size(); @@ -151,6 +153,8 @@ TestWebPlugin::TestWebPlugin(WebKit::WebFrame* frame, m_acceptsTouchEvent = parseBoolean(attributeValue); else if (attributeName == kAttributePrintEventDetails) m_printEventDetails = parseBoolean(attributeValue); + else if (attributeName == kAttributeCanProcessDrag) + m_canProcessDrag = parseBoolean(attributeValue); } } diff --git a/Tools/DumpRenderTree/chromium/TestWebPlugin.h b/Tools/DumpRenderTree/chromium/TestWebPlugin.h index aa6533e32..49fde85aa 100644 --- a/Tools/DumpRenderTree/chromium/TestWebPlugin.h +++ b/Tools/DumpRenderTree/chromium/TestWebPlugin.h @@ -56,6 +56,7 @@ public: virtual bool initialize(WebKit::WebPluginContainer*); virtual void destroy(); virtual NPObject* scriptableObject() { return 0; } + virtual bool canProcessDrag() const { return m_canProcessDrag; } virtual void paint(WebKit::WebCanvas*, const WebKit::WebRect&) { } virtual void updateGeometry(const WebKit::WebRect& frameRect, const WebKit::WebRect& clipRect, @@ -132,6 +133,7 @@ private: bool m_acceptsTouchEvent; bool m_printEventDetails; + bool m_canProcessDrag; }; #endif // TestPepperPlugin_h diff --git a/Tools/DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp b/Tools/DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp index 25c49e314..b00c583f0 100644 --- a/Tools/DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp +++ b/Tools/DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp @@ -37,6 +37,114 @@ #include <wtf/text/WTFString.h> #include <wtf/unicode/CharacterNames.h> +static inline String roleToString(AtkRole role) +{ + switch (role) { + case ATK_ROLE_ALERT: + return "AXRole: AXAlert"; + case ATK_ROLE_CANVAS: + return "AXRole: AXCanvas"; + case ATK_ROLE_CHECK_BOX: + return "AXRole: AXCheckBox"; + case ATK_ROLE_COLUMN_HEADER: + return "AXRole: AXColumnHeader"; + case ATK_ROLE_COMBO_BOX: + return "AXRole: AXComboBox"; + case ATK_ROLE_DOCUMENT_FRAME: + return "AXRole: AXWebArea"; + case ATK_ROLE_ENTRY: + return "AXRole: AXTextField"; + case ATK_ROLE_FOOTER: + return "AXRole: AXFooter"; + case ATK_ROLE_FORM: + return "AXRole: AXForm"; + case ATK_ROLE_GROUPING: + return "AXRole: AXGroup"; + case ATK_ROLE_HEADING: + return "AXRole: AXHeading"; + case ATK_ROLE_IMAGE: + return "AXRole: AXImage"; + case ATK_ROLE_IMAGE_MAP: + return "AXRole: AXImageMap"; + case ATK_ROLE_LABEL: + return "AXRole: AXLabel"; + case ATK_ROLE_LINK: + return "AXRole: AXLink"; + case ATK_ROLE_LIST: + return "AXRole: AXList"; + case ATK_ROLE_LIST_BOX: + return "AXRole: AXListBox"; + case ATK_ROLE_LIST_ITEM: + return "AXRole: AXListItem"; + case ATK_ROLE_MENU: + return "AXRole: AXMenu"; + case ATK_ROLE_MENU_BAR: + return "AXRole: AXMenuBar"; + case ATK_ROLE_MENU_ITEM: + return "AXRole: AXMenuItem"; + case ATK_ROLE_PAGE_TAB: + return "AXRole: AXTab"; + case ATK_ROLE_PAGE_TAB_LIST: + return "AXRole: AXTabGroup"; + case ATK_ROLE_PANEL: + return "AXRole: AXGroup"; + case ATK_ROLE_PARAGRAPH: + return "AXRole: AXParagraph"; + case ATK_ROLE_PASSWORD_TEXT: + return "AXRole: AXPasswordField"; + case ATK_ROLE_PUSH_BUTTON: + return "AXRole: AXButton"; + case ATK_ROLE_RADIO_BUTTON: + return "AXRole: AXRadioButton"; + case ATK_ROLE_ROW_HEADER: + return "AXRole: AXRowHeader"; + case ATK_ROLE_RULER: + return "AXRole: AXRuler"; + case ATK_ROLE_SCROLL_BAR: + return "AXRole: AXScrollBar"; + case ATK_ROLE_SCROLL_PANE: + return "AXRole: AXScrollArea"; + case ATK_ROLE_SECTION: + return "AXRole: AXDiv"; + case ATK_ROLE_SEPARATOR: + return "AXRole: AXHorizontalRule"; + case ATK_ROLE_SLIDER: + return "AXRole: AXSlider"; + case ATK_ROLE_SPIN_BUTTON: + return "AXRole: AXSpinButton"; + case ATK_ROLE_TABLE: + return "AXRole: AXTable"; + case ATK_ROLE_TABLE_CELL: + return "AXRole: AXCell"; + case ATK_ROLE_TABLE_COLUMN_HEADER: + return "AXRole: AXColumnHeader"; + case ATK_ROLE_TABLE_ROW: + return "AXRole: AXRow"; + case ATK_ROLE_TABLE_ROW_HEADER: + return "AXRole: AXRowHeader"; + case ATK_ROLE_TOGGLE_BUTTON: + return "AXRole: AXToggleButton"; + case ATK_ROLE_TOOL_BAR: + return "AXRole: AXToolbar"; + case ATK_ROLE_TOOL_TIP: + return "AXRole: AXUserInterfaceTooltip"; + case ATK_ROLE_TREE: + return "AXRole: AXTree"; + case ATK_ROLE_TREE_TABLE: + return "AXRole: AXTreeGrid"; + case ATK_ROLE_TREE_ITEM: + return "AXRole: AXTreeItem"; + case ATK_ROLE_WINDOW: + return "AXRole: AXWindow"; + case ATK_ROLE_UNKNOWN: + return "AXRole: AXUnknown"; + default: + // We want to distinguish ATK_ROLE_UNKNOWN from a known AtkRole which + // our DRT isn't properly handling. + return "AXRole: FIXME not identified"; + } +} + static inline gchar* replaceCharactersForResults(gchar* str) { String uString = String::fromUTF8(str); @@ -246,14 +354,11 @@ JSStringRef AccessibilityUIElement::parameterizedAttributeNames() JSStringRef AccessibilityUIElement::role() { AtkRole role = atk_object_get_role(ATK_OBJECT(m_element)); - if (!role) return JSStringCreateWithCharacters(0, 0); - const gchar* roleName = atk_role_get_name(role); - GOwnPtr<gchar> axRole(g_strdup_printf("AXRole: %s", roleName)); - - return JSStringCreateWithUTF8CString(axRole.get()); + String roleString = roleToString(role); + return JSStringCreateWithUTF8CString(roleString.utf8().data()); } JSStringRef AccessibilityUIElement::subrole() diff --git a/Tools/DumpRenderTree/mac/DumpRenderTree.mm b/Tools/DumpRenderTree/mac/DumpRenderTree.mm index f70e26259..029b358a0 100644 --- a/Tools/DumpRenderTree/mac/DumpRenderTree.mm +++ b/Tools/DumpRenderTree/mac/DumpRenderTree.mm @@ -1186,7 +1186,6 @@ void dump() WTF::FastMallocStatistics mallocStats = WTF::fastMallocStatistics(); printf("DumpMalloc: %li\n", mallocStats.committedVMBytes); - printf("DumpJSHeap: %li\n", JSC::HeapStatistics::usedJSHeap()); if (resultData) { fwrite([resultData bytes], 1, [resultData length], stdout); diff --git a/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py b/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py index 082bc6576..d44f71e91 100644 --- a/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py +++ b/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py @@ -74,20 +74,6 @@ class BaselineOptimizerTest(unittest.TestCase): }) self.assertEqual(host.filesystem.read_binary_file('/mock-checkout/LayoutTests/platform/chromium/another/test-expected.txt'), 'result A') - def test_platform_mac_different(self): - self._assertOptimization({ - 'LayoutTests': '462d03b9c025db1b0392d7453310dbee5f9a9e74', - 'LayoutTests/platform/mac': '453e67177a75b2e79905154ece0efba6e5bfb65d', - 'LayoutTests/platform/mac-lion': '462d03b9c025db1b0392d7453310dbee5f9a9e74', - 'LayoutTests/platform/chromium-mac': '462d03b9c025db1b0392d7453310dbee5f9a9e74', - 'LayoutTests/platform/chromium-win': '462d03b9c025db1b0392d7453310dbee5f9a9e74', - }, { - 'LayoutTests': '462d03b9c025db1b0392d7453310dbee5f9a9e74', - 'LayoutTests/platform/mac': '453e67177a75b2e79905154ece0efba6e5bfb65d', - 'LayoutTests/platform/mac-lion': '462d03b9c025db1b0392d7453310dbee5f9a9e74', - 'LayoutTests/platform/chromium': '462d03b9c025db1b0392d7453310dbee5f9a9e74', - }) - def test_chromium_linux_redundant_with_win(self): self._assertOptimization({ 'LayoutTests/platform/chromium-win': '462d03b9c025db1b0392d7453310dbee5f9a9e74', @@ -118,14 +104,6 @@ class BaselineOptimizerTest(unittest.TestCase): 'LayoutTests/platform/chromium': '462d03b9c025db1b0392d7453310dbee5f9a9e74', }) - def test_chromium_mac_redundant_with_apple_mac(self): - self._assertOptimization({ - 'LayoutTests/platform/chromium-mac': '462d03b9c025db1b0392d7453310dbee5f9a9e74', - 'LayoutTests/platform/mac': '462d03b9c025db1b0392d7453310dbee5f9a9e74', - }, { - 'LayoutTests/platform/mac': '462d03b9c025db1b0392d7453310dbee5f9a9e74', - }) - def test_mac_future(self): self._assertOptimization({ 'LayoutTests/platform/mac-lion': '462d03b9c025db1b0392d7453310dbee5f9a9e74', diff --git a/Tools/Scripts/webkitpy/common/config/committers.py b/Tools/Scripts/webkitpy/common/config/committers.py index 1c231d37a..73e18b36b 100644 --- a/Tools/Scripts/webkitpy/common/config/committers.py +++ b/Tools/Scripts/webkitpy/common/config/committers.py @@ -109,6 +109,7 @@ watchers_who_are_not_contributors = [ contributors_who_are_not_committers = [ Contributor("Aharon Lanin", "aharon@google.com"), Contributor("Alan Stearns", "stearns@adobe.com", "astearns"), + Contributor("Alejandro Pineiro", "apinheiro@igalia.com"), Contributor("Alexey Marinichev", ["amarinichev@chromium.org", "amarinichev@google.com"], "amarinichev"), Contributor("Andras Piroska", "pandras@inf.u-szeged.hu", "andris88"), Contributor("Andrei Bucur", "abucur@adobe.com", "abucur"), @@ -134,11 +135,13 @@ contributors_who_are_not_committers = [ Contributor("Greg Simon", "gregsimon@chromium.org", "gregsimon"), Contributor("Gregg Tavares", ["gman@google.com", "gman@chromium.org"], "gman"), Contributor("Hao Zheng", "zhenghao@chromium.org"), + Contributor("Harald Alvestrand", "hta@google.com", "hta"), Contributor("Ian Hickson", "ian@hixie.ch", "hixie"), Contributor("Janos Badics", "jbadics@inf.u-szeged.hu", "dicska"), Contributor("Jonathan Backer", "backer@chromium.org", "backer"), Contributor("Jeff Timanus", ["twiz@chromium.org", "twiz@google.com"], "twiz"), Contributor("Jing Zhao", "jingzhao@chromium.org"), + Contributor("Joanmarie Diggs", "jdiggs@igalia.com"), Contributor("John Bates", ["jbates@google.com", "jbates@chromium.org"], "jbates"), Contributor("John Bauman", ["jbauman@chromium.org", "jbauman@google.com"], "jbauman"), Contributor("John Mellor", "johnme@chromium.org", "johnme"), diff --git a/Tools/Scripts/webkitpy/common/config/watchlist b/Tools/Scripts/webkitpy/common/config/watchlist index 0f3dd65a1..813cee5b4 100755 --- a/Tools/Scripts/webkitpy/common/config/watchlist +++ b/Tools/Scripts/webkitpy/common/config/watchlist @@ -265,11 +265,16 @@ r"|Source/WebCore/platform/mediastream" r"|LayoutTests/fast/mediastream", }, + "Accessibility": { + "filename": r"Source/WebCore/accessibility" + r"|LayoutTests/.*accessibility", + }, }, "CC_RULES": { # Note: All email addresses listed must be registered with bugzilla. # Specifically, levin@chromium.org and levin+threading@chromium.org are # two different accounts as far as bugzilla is concerned. + "Accessibility": [ "cfleizach@apple.com", "dmazzoni@google.com", "apinheiro@igalia.com", "jdiggs@igalia.com" ], "AppleMacPublicApi": [ "timothy@apple.com" ], "Battery": [ "gyuyoung.kim@samsung.com" ], "BlackBerry": [ "mifenton@rim.com", "rwlbuis@gmail.com", "tonikitoo@webkit.org" ], @@ -290,7 +295,7 @@ "Loader": [ "japhet@chromium.org" ], "MathML": [ "dbarton@mathscribe.com" ], "Media": [ "feature-media-reviews@chromium.org", "eric.carlson@apple.com" ], - "MediaStream": [ "tommyw@google.com" ], + "MediaStream": [ "tommyw@google.com", "hta@google.com" ], "NetworkInfo": [ "gyuyoung.kim@samsung.com" ], "OpenGL" : [ "noam.rosenthal@nokia.com", "dino@apple.com" ], "QtBuildSystem" : [ "vestbo@webkit.org", "abecsi@webkit.org" ], @@ -314,7 +319,7 @@ "WatchListScript": [ "levin+watchlist@chromium.org", ], "WebGL": [ "dino@apple.com" ], "WebIDL": [ "abarth@webkit.org", "ojan@chromium.org" ], - "WebInspectorProtocol": [ "timothy@apple.com", ], + "WebInspectorProtocol": [ "timothy@apple.com", "joepeck@webkit.org" ], "WebKitGTKTranslations": [ "gns@gnome.org", "mrobinson@webkit.org" ], "WebSocket": [ "yutak@chromium.org" ], "XSS": [ "dbates@webkit.org" ], diff --git a/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py b/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py index e246b8870..6389feb63 100644 --- a/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py +++ b/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py @@ -157,7 +157,6 @@ class ChromiumAndroidPort(chromium.ChromiumPort): 'chromium-linux', 'chromium-win', 'chromium', - 'mac', ] def __init__(self, host, port_name, **kwargs): diff --git a/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py b/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py index a2252c1b3..7c37fd17a 100644 --- a/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py +++ b/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py @@ -46,14 +46,12 @@ class ChromiumLinuxPort(chromium.ChromiumPort): 'chromium-linux', 'chromium-win', 'chromium', - 'mac', ], 'x86': [ 'chromium-linux-x86', 'chromium-linux', 'chromium-win', 'chromium', - 'mac', ], } diff --git a/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py b/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py index 08c1ede0f..47eb4ea0c 100644 --- a/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py +++ b/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py @@ -47,22 +47,18 @@ class ChromiumMacPort(chromium.ChromiumPort): 'chromium-mac-snowleopard', 'chromium-mac', 'chromium', - 'mac', ], 'lion': [ 'chromium-mac', 'chromium', - 'mac', ], 'mountainlion': [ # FIXME: we don't treat ML different from Lion yet. 'chromium-mac', 'chromium', - 'mac', ], 'future': [ 'chromium-mac', 'chromium', - 'mac', ], } diff --git a/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py b/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py index 1168e407c..3266c3914 100755 --- a/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py +++ b/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py @@ -44,18 +44,15 @@ class ChromiumWinPort(chromium.ChromiumPort): # FIXME: Figure out how to unify this with base.TestConfiguration.all_systems()? SUPPORTED_VERSIONS = ('xp', 'win7') - # FIXME: Do we need mac-snowleopard here, like the base win port? FALLBACK_PATHS = { 'xp': [ 'chromium-win-xp', 'chromium-win', 'chromium', - 'mac', ], 'win7': [ 'chromium-win', 'chromium', - 'mac', ], } diff --git a/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js b/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js index 2c14a3a19..41a2d6a51 100644 --- a/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js +++ b/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js @@ -2522,12 +2522,12 @@ function hideLegend() } var g_fallbacksMap = {}; -g_fallbacksMap['WIN-XP'] = ['chromium-win-xp', 'chromium-win', 'chromium', 'mac']; -g_fallbacksMap['WIN-7'] = ['chromium-win', 'chromium', 'mac']; -g_fallbacksMap['MAC-SNOWLEOPARD'] = ['chromium-mac-snowleopard', 'chromium-mac', 'chromium', 'mac']; -g_fallbacksMap['MAC-LION'] = ['chromium-mac', 'chromium', 'mac']; -g_fallbacksMap['LINUX-32'] = ['chromium-linux-x86', 'chromium-linux', 'chromium-win', 'chromium', 'mac']; -g_fallbacksMap['LINUX-64'] = ['chromium-linux', 'chromium-win', 'chromium', 'mac']; +g_fallbacksMap['WIN-XP'] = ['chromium-win-xp', 'chromium-win', 'chromium']; +g_fallbacksMap['WIN-7'] = ['chromium-win', 'chromium']; +g_fallbacksMap['MAC-SNOWLEOPARD'] = ['chromium-mac-snowleopard', 'chromium-mac', 'chromium']; +g_fallbacksMap['MAC-LION'] = ['chromium-mac', 'chromium']; +g_fallbacksMap['LINUX-32'] = ['chromium-linux-x86', 'chromium-linux', 'chromium-win', 'chromium']; +g_fallbacksMap['LINUX-64'] = ['chromium-linux', 'chromium-win', 'chromium']; function htmlForFallbackHelp(fallbacks) { diff --git a/Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp b/Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp index 28e82ac07..696f40c67 100644 --- a/Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp +++ b/Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp @@ -155,7 +155,6 @@ '-DPRODUCT_DIR=<(ant_build_out)', '--ant-args', '-DCHROMIUM_SRC=<(ant_build_to_chromium_src)', - '--sdk-build=<(sdk_build)', '--app_abi', '<(android_app_abi)', ], diff --git a/Tools/TestWebKitAPI/Tests/WTF/Vector.cpp b/Tools/TestWebKitAPI/Tests/WTF/Vector.cpp index 46a35922f..9ffb0b2e8 100644 --- a/Tools/TestWebKitAPI/Tests/WTF/Vector.cpp +++ b/Tools/TestWebKitAPI/Tests/WTF/Vector.cpp @@ -76,29 +76,4 @@ TEST(WTF_Vector, ReverseIterator) EXPECT_TRUE(end == it); } -TEST(WTF_Vector, ReversedProxy) -{ - Vector<int> intVector; - intVector.append(10); - intVector.append(11); - intVector.append(12); - intVector.append(13); - - Vector<int>::reverse_iterator it = intVector.reversed().begin(); - Vector<int>::reverse_iterator end = intVector.reversed().end(); - - EXPECT_TRUE(end != it); - - EXPECT_EQ(13, *it); - ++it; - EXPECT_EQ(12, *it); - ++it; - EXPECT_EQ(11, *it); - ++it; - EXPECT_EQ(10, *it); - ++it; - - EXPECT_TRUE(end == it); -} - } // namespace TestWebKitAPI diff --git a/Tools/qmake/mkspecs/features/default_post.prf b/Tools/qmake/mkspecs/features/default_post.prf index aa21b5de0..8800e1e44 100644 --- a/Tools/qmake/mkspecs/features/default_post.prf +++ b/Tools/qmake/mkspecs/features/default_post.prf @@ -249,6 +249,31 @@ for(subdir, SUBDIRS) { } } +root_project_file { + # Tweak documentation rules so that we only get documentation + # for the QtWebKit subdir, which means we don't have to run + # qmake_all and generate all the derived sources, just to + # build documentation. + previous_subdir = + doc_targets = docs install_docs uninstall_docs + for(subdir, SUBDIRS) { + equals(subdir, QtWebKit) { + for(doc_target, doc_targets) { + # Since we use CONFIG += ordered, we need to provide a fake dummy + # doc-target for the immediate dependency of the QtWebKit target. + dummy_target = sub-$$replace($${previous_subdir}.file, [^a-zA-Z0-9_], -)-$${doc_target}_ordered + $${dummy_target}.target = $${dummy_target} + QMAKE_EXTRA_TARGETS += $${dummy_target} + } + } else { + previous_subdir = $$subdir # Save for later + + # For all the other subdirs, we disable docs the regular way + for(doc_target, doc_targets): $${subdir}.CONFIG += no_$${doc_target}_target + } + } +} + incremental.target = incremental incremental.commands = $(MAKE) -f $(MAKEFILE) qmake_all && $(MAKE) -f $(MAKEFILE) QMAKE_EXTRA_TARGETS += incremental diff --git a/Tools/qmake/mkspecs/features/unix/default_post.prf b/Tools/qmake/mkspecs/features/unix/default_post.prf index 5a73f17d4..92c073c53 100644 --- a/Tools/qmake/mkspecs/features/unix/default_post.prf +++ b/Tools/qmake/mkspecs/features/unix/default_post.prf @@ -34,7 +34,7 @@ linux-g++* { contains(TEMPLATE, app): CONFIG += rpath -isEqual(QT_ARCH,i386):CONFIG(debug, debug|release) { +isEqual(QT_ARCH,i386) { # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase. config_gnuld: QMAKE_LFLAGS += -Wl,--no-keep-memory } |