summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--DEPS2
-rw-r--r--webkit/glue/devtools/js/devtools.html4
-rw-r--r--webkit/tools/webcore_unit_tests/GKURL_unittest.cpp24
-rw-r--r--webkit/webkit.gyp172
4 files changed, 21 insertions, 181 deletions
diff --git a/DEPS b/DEPS
index afba493..90309ef 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "46977",
+ "webkit_revision": "47010",
}
diff --git a/webkit/glue/devtools/js/devtools.html b/webkit/glue/devtools/js/devtools.html
index d859e81..4c04862 100644
--- a/webkit/glue/devtools/js/devtools.html
+++ b/webkit/glue/devtools/js/devtools.html
@@ -127,11 +127,11 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</div>
<div id="main">
<div id="main-panels" tabindex="0" spellcheck="false"></div>
- <div id="main-status-bar" class="status-bar"><div id="anchored-status-bar-items"><button id="dock-status-bar-item" class="status-bar-item toggled"></button><button id="console-status-bar-item" class="status-bar-item"></button><button id="changes-status-bar-item" class="status-bar-item hidden"></button><div id="count-items"><div id="changes-count" class="hidden"></div><div id="error-warning-count" class="hidden"></div></div></div></div>
+ <div id="main-status-bar" class="status-bar"><div id="anchored-status-bar-items"><button id="dock-status-bar-item" class="status-bar-item toggled"><div class="glyph"></div><div class="glyph shadow"></div></button><button id="console-status-bar-item" class="status-bar-item"><div class="glyph"></div><div class="glyph shadow"></div></button><button id="changes-status-bar-item" class="status-bar-item hidden"></button><div id="count-items"><div id="changes-count" class="hidden"></div><div id="error-warning-count" class="hidden"></div></div></div></div>
</div>
<div id="drawer">
<div id="console-view"><div id="console-messages"><div id="console-prompt" spellcheck="false"><br></div></div></div>
- <div id="drawer-status-bar" class="status-bar"><div id="other-drawer-status-bar-items"><button id="clear-console-status-bar-item" class="status-bar-item"></button></div></div>
+ <div id="drawer-status-bar" class="status-bar"><div id="other-drawer-status-bar-items"><button id="clear-console-status-bar-item" class="status-bar-item"><div class="glyph"></div><div class="glyph shadow"></div></button></div></div>
</div>
</body>
</html>
diff --git a/webkit/tools/webcore_unit_tests/GKURL_unittest.cpp b/webkit/tools/webcore_unit_tests/GKURL_unittest.cpp
index 3f84e8d..40bf57a 100644
--- a/webkit/tools/webcore_unit_tests/GKURL_unittest.cpp
+++ b/webkit/tools/webcore_unit_tests/GKURL_unittest.cpp
@@ -101,8 +101,8 @@ TEST(GKURL, SameGetters) {
EXPECT_EQ(cases[i].pass, gurl.pass());
EXPECT_EQ(cases[i].last_path_component, gurl.lastPathComponent());
EXPECT_EQ(cases[i].query, gurl.query());
- EXPECT_EQ(cases[i].ref, gurl.ref());
- EXPECT_EQ(cases[i].has_ref, gurl.hasRef());
+ EXPECT_EQ(cases[i].ref, gurl.fragmentIdentifier());
+ EXPECT_EQ(cases[i].has_ref, gurl.hasFragmentIdentifier());
// UTF-16
string16 wstr(UTF8ToUTF16(cases[i].url));
@@ -118,8 +118,8 @@ TEST(GKURL, SameGetters) {
EXPECT_EQ(cases[i].pass, gurl.pass());
EXPECT_EQ(cases[i].last_path_component, gurl.lastPathComponent());
EXPECT_EQ(cases[i].query, gurl.query());
- EXPECT_EQ(cases[i].ref, gurl.ref());
- EXPECT_EQ(cases[i].has_ref, gurl.hasRef());
+ EXPECT_EQ(cases[i].ref, gurl.fragmentIdentifier());
+ EXPECT_EQ(cases[i].has_ref, gurl.hasFragmentIdentifier());
}
}
@@ -157,9 +157,9 @@ TEST(GKURL, DifferentGetters) {
// Want to compare UCS-16 refs (or to NULL).
if (cases[i].ref) {
EXPECT_EQ(webkit_glue::StdWStringToString(UTF8ToWide(cases[i].ref)),
- gurl.ref());
+ gurl.fragmentIdentifier());
} else {
- EXPECT_TRUE(gurl.ref().isNull());
+ EXPECT_TRUE(gurl.fragmentIdentifier().isNull());
}
}
}
@@ -446,26 +446,26 @@ TEST(GKURL, Ref) {
// Basic ref setting.
WebCore::KURL cur("http://foo/bar");
- cur.setRef("asdf");
+ cur.setFragmentIdentifier("asdf");
EXPECT_STREQ("http://foo/bar#asdf", cur.string().utf8().data());
cur = gurl;
- cur.setRef("asdf");
+ cur.setFragmentIdentifier("asdf");
EXPECT_STREQ("http://foo/bar#asdf", cur.string().utf8().data());
// Setting a ref to the empty string will set it to "#".
cur = WebCore::KURL("http://foo/bar");
- cur.setRef("");
+ cur.setFragmentIdentifier("");
EXPECT_STREQ("http://foo/bar#", cur.string().utf8().data());
cur = gurl;
- cur.setRef("");
+ cur.setFragmentIdentifier("");
EXPECT_STREQ("http://foo/bar#", cur.string().utf8().data());
// Setting the ref to the null string will clear it altogether.
cur = WebCore::KURL("http://foo/bar");
- cur.setRef(WebCore::String());
+ cur.setFragmentIdentifier(WebCore::String());
EXPECT_STREQ("http://foo/bar", cur.string().utf8().data());
cur = gurl;
- cur.setRef(WebCore::String());
+ cur.setFragmentIdentifier(WebCore::String());
EXPECT_STREQ("http://foo/bar", cur.string().utf8().data());
}
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index 5b92997..ba9f39c 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -1531,59 +1531,9 @@
'glue/devtools/js/inspector_controller_impl.js',
'glue/devtools/js/profiler_processor.js',
'glue/devtools/js/tests.js',
- '../third_party/WebKit/WebCore/inspector/front-end/BottomUpProfileDataGridTree.js',
- '../third_party/WebKit/WebCore/inspector/front-end/Breakpoint.js',
- '../third_party/WebKit/WebCore/inspector/front-end/BreakpointsSidebarPane.js',
- '../third_party/WebKit/WebCore/inspector/front-end/Callback.js',
- '../third_party/WebKit/WebCore/inspector/front-end/CallStackSidebarPane.js',
- '../third_party/WebKit/WebCore/inspector/front-end/Color.js',
- '../third_party/WebKit/WebCore/inspector/front-end/ConsoleView.js',
- '../third_party/WebKit/WebCore/inspector/front-end/ChangesView.js',
- '../third_party/WebKit/WebCore/inspector/front-end/Database.js',
- '../third_party/WebKit/WebCore/inspector/front-end/DatabaseQueryView.js',
- '../third_party/WebKit/WebCore/inspector/front-end/DatabasesPanel.js',
- '../third_party/WebKit/WebCore/inspector/front-end/DatabaseTableView.js',
- '../third_party/WebKit/WebCore/inspector/front-end/DataGrid.js',
- '../third_party/WebKit/WebCore/inspector/front-end/DOMAgent.js',
- '../third_party/WebKit/WebCore/inspector/front-end/Drawer.js',
- '../third_party/WebKit/WebCore/inspector/front-end/ElementsPanel.js',
- '../third_party/WebKit/WebCore/inspector/front-end/ElementsTreeOutline.js',
- '../third_party/WebKit/WebCore/inspector/front-end/FontView.js',
- '../third_party/WebKit/WebCore/inspector/front-end/ImageView.js',
- '../third_party/WebKit/WebCore/inspector/front-end/inspector.css',
- '../third_party/WebKit/WebCore/inspector/front-end/inspector.html',
- '../third_party/WebKit/WebCore/inspector/front-end/inspector.js',
- '../third_party/WebKit/WebCore/inspector/front-end/KeyboardShortcut.js',
- '../third_party/WebKit/WebCore/inspector/front-end/MetricsSidebarPane.js',
- '../third_party/WebKit/WebCore/inspector/front-end/Object.js',
- '../third_party/WebKit/WebCore/inspector/front-end/ObjectPropertiesSection.js',
- '../third_party/WebKit/WebCore/inspector/front-end/ObjectProxy.js',
- '../third_party/WebKit/WebCore/inspector/front-end/Panel.js',
- '../third_party/WebKit/WebCore/inspector/front-end/PanelEnablerView.js',
- '../third_party/WebKit/WebCore/inspector/front-end/Placard.js',
- '../third_party/WebKit/WebCore/inspector/front-end/ProfilesPanel.js',
- '../third_party/WebKit/WebCore/inspector/front-end/ProfileDataGridTree.js',
- '../third_party/WebKit/WebCore/inspector/front-end/ProfileView.js',
- '../third_party/WebKit/WebCore/inspector/front-end/PropertiesSection.js',
- '../third_party/WebKit/WebCore/inspector/front-end/PropertiesSidebarPane.js',
- '../third_party/WebKit/WebCore/inspector/front-end/Resource.js',
- '../third_party/WebKit/WebCore/inspector/front-end/ResourceCategory.js',
- '../third_party/WebKit/WebCore/inspector/front-end/ResourcesPanel.js',
- '../third_party/WebKit/WebCore/inspector/front-end/ResourceView.js',
- '../third_party/WebKit/WebCore/inspector/front-end/ScopeChainSidebarPane.js',
- '../third_party/WebKit/WebCore/inspector/front-end/Script.js',
- '../third_party/WebKit/WebCore/inspector/front-end/ScriptsPanel.js',
- '../third_party/WebKit/WebCore/inspector/front-end/ScriptView.js',
- '../third_party/WebKit/WebCore/inspector/front-end/SidebarPane.js',
- '../third_party/WebKit/WebCore/inspector/front-end/SidebarTreeElement.js',
- '../third_party/WebKit/WebCore/inspector/front-end/SourceFrame.js',
- '../third_party/WebKit/WebCore/inspector/front-end/SourceView.js',
- '../third_party/WebKit/WebCore/inspector/front-end/StylesSidebarPane.js',
- '../third_party/WebKit/WebCore/inspector/front-end/TextPrompt.js',
- '../third_party/WebKit/WebCore/inspector/front-end/TopDownProfileDataGridTree.js',
- '../third_party/WebKit/WebCore/inspector/front-end/treeoutline.js',
- '../third_party/WebKit/WebCore/inspector/front-end/utilities.js',
- '../third_party/WebKit/WebCore/inspector/front-end/View.js',
+
+ '<@(webinspector_files)',
+
'../v8/tools/codemap.js',
'../v8/tools/consarray.js',
'../v8/tools/csvparser.js',
@@ -1596,119 +1546,9 @@
{
'destination': '<(PRODUCT_DIR)/resources/inspector/Images',
'files': [
- '../third_party/WebKit/WebCore/inspector/front-end/Images/back.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/checker.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/clearConsoleButtons.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/closeButtons.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/consoleButtons.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/database.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/databasesIcon.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/databaseTable.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/debuggerContinue.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/debuggerPause.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/debuggerStepInto.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/debuggerStepOut.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/debuggerStepOver.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/disclosureTriangleSmallDown.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/disclosureTriangleSmallDownBlack.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/disclosureTriangleSmallDownWhite.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/disclosureTriangleSmallRight.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/disclosureTriangleSmallRightBlack.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/disclosureTriangleSmallRightDown.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/disclosureTriangleSmallRightDownBlack.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/disclosureTriangleSmallRightDownWhite.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/disclosureTriangleSmallRightWhite.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/dockButtons.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/elementsIcon.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/enableButtons.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/errorIcon.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/errorMediumIcon.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/excludeButtons.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/focusButtons.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/forward.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/glossyHeader.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/glossyHeaderPressed.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/glossyHeaderSelected.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/glossyHeaderSelectedPressed.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/goArrow.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/graphLabelCalloutLeft.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/graphLabelCalloutRight.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/largerResourcesButtons.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/nodeSearchButtons.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/paneBottomGrow.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/paneBottomGrowActive.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/paneGrowHandleLine.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/pauseOnExceptionButtons.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/percentButtons.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/profileGroupIcon.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/profileIcon.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/profilesIcon.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/profileSmallIcon.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/profilesSilhouette.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/radioDot.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/recordButtons.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/reloadButtons.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/resourceCSSIcon.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/resourceDocumentIcon.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/resourceDocumentIconSmall.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/resourceJSIcon.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/resourcePlainIcon.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/resourcePlainIconSmall.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/resourcesIcon.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/resourcesSilhouette.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/resourcesSizeGraphIcon.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/resourcesTimeGraphIcon.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/scriptsIcon.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/scriptsSilhouette.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/searchSmallBlue.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/searchSmallBrightBlue.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/searchSmallGray.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/searchSmallWhite.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/segment.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/segmentEnd.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/segmentHover.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/segmentHoverEnd.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/segmentSelected.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/segmentSelectedEnd.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/splitviewDimple.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/splitviewDividerBackground.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/statusbarBackground.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/statusbarBottomBackground.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/statusbarButtons.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/statusbarMenuButton.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/statusbarMenuButtonSelected.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/statusbarResizerHorizontal.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/statusbarResizerVertical.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/timelineHollowPillBlue.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/timelineHollowPillGray.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/timelineHollowPillGreen.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/timelineHollowPillOrange.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/timelineHollowPillPurple.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/timelineHollowPillRed.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/timelineHollowPillYellow.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/timelinePillBlue.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/timelinePillGray.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/timelinePillGreen.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/timelinePillOrange.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/timelinePillPurple.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/timelinePillRed.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/timelinePillYellow.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/tipBalloon.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/tipBalloonBottom.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/tipIcon.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/tipIconPressed.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/toolbarItemSelected.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/treeDownTriangleBlack.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/treeDownTriangleWhite.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/treeRightTriangleBlack.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/treeRightTriangleWhite.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/treeUpTriangleBlack.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/treeUpTriangleWhite.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/userInputIcon.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/userInputPreviousIcon.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/warningIcon.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/warningMediumIcon.png',
- '../third_party/WebKit/WebCore/inspector/front-end/Images/warningsErrors.png',
+
+ '<@(webinspector_image_files)',
+
],
},
],
generated by cgit v1.1 at 2025-02-01 19:18:47 +0000