Diff
Property changes: branches/safari-537.75-branch
Modified: svn:mergeinfo
+ /trunk:53455,153629,154395,154470,155471,157607
Modified: branches/safari-537.75-branch/Source/WebCore/ChangeLog (163391 => 163392)
--- branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-02-04 19:09:52 UTC (rev 163391)
+++ branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-02-04 19:10:25 UTC (rev 163392)
@@ -1,3 +1,9 @@
+2014-02-04 Brent Fulgham <[email protected]>
+
+ Build fix after last branch merge.
+
+ * WebCore.vcxproj/WebCore.vcxproj: Correct bad merge of media build steps.
+
2014-02-03 Brent Fulgham <[email protected]>
Unreviewed build fix after r162860.
Modified: branches/safari-537.75-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (163391 => 163392)
--- branches/safari-537.75-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-02-04 19:09:52 UTC (rev 163391)
+++ branches/safari-537.75-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-02-04 19:10:25 UTC (rev 163392)
@@ -8833,12 +8833,18 @@
<ClCompile Include="..\css\FontValue.cpp" />
<ClCompile Include="..\css\LengthFunctions.cpp" />
<ClCompile Include="..\css\MediaAllInOne.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\css\MediaFeatureNames.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -8847,6 +8853,12 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\css\MediaList.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -8855,6 +8867,12 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\css\MediaQuery.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -8863,6 +8881,12 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\css\MediaQueryEvaluator.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -8871,6 +8895,12 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\css\MediaQueryExp.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -8879,6 +8909,12 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\css\MediaQueryList.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -8887,6 +8923,12 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\css\MediaQueryMatcher.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -8895,6 +8937,12 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\css\PropertySetCSSStyleDeclaration.cpp" />
<ClCompile Include="..\css\RGBColor.cpp" />
Modified: branches/safari-537.75-branch/Source/WebInspectorUI/ChangeLog (163391 => 163392)
--- branches/safari-537.75-branch/Source/WebInspectorUI/ChangeLog 2014-02-04 19:09:52 UTC (rev 163391)
+++ branches/safari-537.75-branch/Source/WebInspectorUI/ChangeLog 2014-02-04 19:10:25 UTC (rev 163392)
@@ -1,3 +1,22 @@
+2014-02-04 Brent Fulgham <[email protected]>
+
+ Merge r154395.
+
+ 2013-08-20 Brent Fulgham <[email protected]>
+
+ <http://webkit.org/b/120098> [Windows] Enable the New Web Inspector
+
+ Reviewed by Brian Weinstein.
+
+ Add a new project to copy files to the appropriate spots in the
+ Windows port.
+
+ * WebInspectorUI.vcxproj: Added.
+ * WebInspectorUI.vcxproj/WebInspectorUI.vcxproj: Added.
+ * WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters: Added.
+ * WebInspectorUI.vcxproj/WebInspectorUIPostBuild.cmd: Added.
+ * WebInspectorUI.vcxproj/WebInspectorUIPreBuild.cmd: Added.
+
2013-11-08 Lucas Forschler <[email protected]>
Merge r157459
Property changes: branches/safari-537.75-branch/Source/WebKit
Modified: svn:mergeinfo
+ /trunk/Source/WebKit:154395
/trunk/WebKit:53455
Modified: branches/safari-537.75-branch/Source/WebKit/ChangeLog (163391 => 163392)
--- branches/safari-537.75-branch/Source/WebKit/ChangeLog 2014-02-04 19:09:52 UTC (rev 163391)
+++ branches/safari-537.75-branch/Source/WebKit/ChangeLog 2014-02-04 19:10:25 UTC (rev 163392)
@@ -1,3 +1,16 @@
+2014-02-04 Brent Fulgham <[email protected]>
+
+ Merge r154395.
+
+ 2013-08-20 Brent Fulgham <[email protected]>
+
+ <https://webkit.org/b/120098> [Windows] Enable the new Web Inspector
+
+ Reviewed by Brian Weinstein.
+
+ * WebKit.vcxproj/WebKit.sln: Add reference to the new WebInspectorUI
+ project so that it will be included in new distributions.
+
2014-01-23 Brent Fulgham <[email protected]>
Unreviewed build correction.
Modified: branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/WebKit.sln (163391 => 163392)
--- branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/WebKit.sln 2014-02-04 19:09:52 UTC (rev 163391)
+++ branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/WebKit.sln 2014-02-04 19:10:25 UTC (rev 163392)
@@ -54,6 +54,7 @@
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKit", "WebKit\WebKit.vcxproj", "{0662A8A9-82A3-4638-97D8-EC425D8D87C9}"
ProjectSection(ProjectDependencies) = postProject
{0F837117-8C0B-4596-A373-A37E14A01223} = {0F837117-8C0B-4596-A373-A37E14A01223}
+ {0473724F-0AB3-4F12-892E-9FAB0186C804} = {0473724F-0AB3-4F12-892E-9FAB0186C804}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testRegExp", "..\..\_javascript_Core\_javascript_Core.vcxproj\testRegExp\testRegExp.vcxproj", "{BB16286B-AADC-46C1-BC0D-6C06F323E04B}"
@@ -161,6 +162,8 @@
{AF94D13A-36C1-45FF-9B0B-EB5D3FF6F43D} = {AF94D13A-36C1-45FF-9B0B-EB5D3FF6F43D}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebInspectorUI", "..\..\WebInspectorUI\WebInspectorUI.vcxproj\WebInspectorUI.vcxproj", "{0473724F-0AB3-4F12-892E-9FAB0186C804}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug_WinCairo|Win32 = Debug_WinCairo|Win32
@@ -753,6 +756,21 @@
{67A61940-F80B-42A0-A29D-B6DB1C27BCEE}.Release|Win32.Build.0 = Release|Win32
{67A61940-F80B-42A0-A29D-B6DB1C27BCEE}.Release|x64.ActiveCfg = Release|x64
{67A61940-F80B-42A0-A29D-B6DB1C27BCEE}.Release|x64.Build.0 = Release|x64
+ {0473724F-0AB3-4F12-892E-9FAB0186C804}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+ {0473724F-0AB3-4F12-892E-9FAB0186C804}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
+ {0473724F-0AB3-4F12-892E-9FAB0186C804}.Debug_WinCairo|x64.ActiveCfg = Debug|Win32
+ {0473724F-0AB3-4F12-892E-9FAB0186C804}.Debug|Win32.ActiveCfg = Debug|Win32
+ {0473724F-0AB3-4F12-892E-9FAB0186C804}.Debug|Win32.Build.0 = Debug|Win32
+ {0473724F-0AB3-4F12-892E-9FAB0186C804}.Debug|x64.ActiveCfg = Debug|Win32
+ {0473724F-0AB3-4F12-892E-9FAB0186C804}.Production|Win32.ActiveCfg = Production|Win32
+ {0473724F-0AB3-4F12-892E-9FAB0186C804}.Production|Win32.Build.0 = Production|Win32
+ {0473724F-0AB3-4F12-892E-9FAB0186C804}.Production|x64.ActiveCfg = Release|Win32
+ {0473724F-0AB3-4F12-892E-9FAB0186C804}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+ {0473724F-0AB3-4F12-892E-9FAB0186C804}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
+ {0473724F-0AB3-4F12-892E-9FAB0186C804}.Release_WinCairo|x64.ActiveCfg = Release|Win32
+ {0473724F-0AB3-4F12-892E-9FAB0186C804}.Release|Win32.ActiveCfg = Release|Win32
+ {0473724F-0AB3-4F12-892E-9FAB0186C804}.Release|Win32.Build.0 = Release|Win32
+ {0473724F-0AB3-4F12-892E-9FAB0186C804}.Release|x64.ActiveCfg = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -776,6 +794,7 @@
{0662A8A9-82A3-4638-97D8-EC425D8D87C9} = {39286F46-BA75-4997-8065-1909090A60F0}
{0F837117-8C0B-4596-A373-A37E14A01223} = {39286F46-BA75-4997-8065-1909090A60F0}
{A15EDAD8-8B87-4D4A-8498-77A04AB65F16} = {39286F46-BA75-4997-8065-1909090A60F0}
+ {0473724F-0AB3-4F12-892E-9FAB0186C804} = {39286F46-BA75-4997-8065-1909090A60F0}
{20A8616C-E56B-4649-A910-8E97751DE145} = {6993F96C-409A-4FDC-A0BA-B40D5060B07C}
{3D4C8B23-9375-4A7C-869C-7CC262C42F9F} = {6993F96C-409A-4FDC-A0BA-B40D5060B07C}
{68A7C287-F9C4-4A31-9B49-995E64CAC100} = {6993F96C-409A-4FDC-A0BA-B40D5060B07C}
Modified: branches/safari-537.75-branch/Source/WebKit/win/ChangeLog (163391 => 163392)
--- branches/safari-537.75-branch/Source/WebKit/win/ChangeLog 2014-02-04 19:09:52 UTC (rev 163391)
+++ branches/safari-537.75-branch/Source/WebKit/win/ChangeLog 2014-02-04 19:10:25 UTC (rev 163392)
@@ -1,3 +1,19 @@
+2014-02-03 Brent Fulgham <[email protected]>
+
+ Merge r154394
+
+ 2013-08-20 Brent Fulgham <[email protected]>
+
+ <https://webkit.org/b/120098> [Windows] Enable the New Web Inspector
+
+ Reviewed by Brian Weinstein.
+
+ * WebCoreSupport/WebInspectorClient.cpp:
+ (WebInspectorClient::openInspectorFrontend): Use the new inspector
+ if present in the WebKit distribution.
+ (WebInspectorFrontendClient::localizedStringsURL): Use the new
+ Web Inspector's localized strings (if present).
+
2013-12-23 Matthew Hanson <[email protected]>
Update copyright strings.
Modified: branches/safari-537.75-branch/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp (163391 => 163392)
--- branches/safari-537.75-branch/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp 2014-02-04 19:09:52 UTC (rev 163391)
+++ branches/safari-537.75-branch/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp 2014-02-04 19:10:25 UTC (rev 163392)
@@ -162,8 +162,10 @@
COMPtr<WebMutableURLRequest> request(AdoptCOM, WebMutableURLRequest::createInstance());
- RetainPtr<CFURLRef> htmlURLRef = adoptCF(CFBundleCopyResourceURL(getWebKitBundle(), CFSTR("inspector"), CFSTR("html"), CFSTR("inspector")));
+ RetainPtr<CFURLRef> htmlURLRef = adoptCF(CFBundleCopyResourceURL(getWebKitBundle(), CFSTR("Main"), CFSTR("html"), CFSTR("WebInspectorUI")));
if (!htmlURLRef)
+ htmlURLRef = adoptCF(CFBundleCopyResourceURL(getWebKitBundle(), CFSTR("inspector"), CFSTR("html"), CFSTR("inspector")));
+ if (!htmlURLRef)
return 0;
CFStringRef urlStringRef = ::CFURLGetString(htmlURLRef.get());
@@ -262,8 +264,11 @@
String WebInspectorFrontendClient::localizedStringsURL()
{
- RetainPtr<CFURLRef> url = "" CFSTR("localizedStrings"), CFSTR("js"), 0));
+ RetainPtr<CFURLRef> url = "" CFSTR("localizedStrings"), CFSTR("js"), CFSTR("WebInspectorUI")));
if (!url)
+ url = "" CFSTR("localizedStrings"), CFSTR("js"), 0));
+
+ if (!url)
return String();
return CFURLGetString(url.get());
