Diff
Modified: trunk/Source/WebCore/ChangeLog (134345 => 134346)
--- trunk/Source/WebCore/ChangeLog 2012-11-13 04:03:41 UTC (rev 134345)
+++ trunk/Source/WebCore/ChangeLog 2012-11-13 04:05:09 UTC (rev 134346)
@@ -1,3 +1,16 @@
+2012-11-12 Timothy Hatcher <[email protected]>
+
+ Expose InspectorFrontendClientLocal::setAttachedWindow as public.
+
+ This allows external actions to update the docked state in the frontend.
+
+ https://bugs.webkit.org/show_bug.cgi?id=102023
+
+ Reviewed by Anders Carlsson.
+
+ * inspector/InspectorFrontendClientLocal.h:
+ Moved InspectorFrontendClientLocal::setAttachedWindow to public section.
+
2012-11-12 Erik Arvidsson <[email protected]>
Replace DOMException TYPE_MISMATCH_ERR with TypeError
Modified: trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.h (134345 => 134346)
--- trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.h 2012-11-13 04:03:41 UTC (rev 134345)
+++ trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.h 2012-11-13 04:05:09 UTC (rev 134346)
@@ -98,9 +98,10 @@
void showResources();
+ void setAttachedWindow(bool);
+
protected:
virtual void setAttachedWindowHeight(unsigned) = 0;
- void setAttachedWindow(bool);
void restoreAttachedWindowHeight();
private:
Modified: trunk/Source/WebKit2/ChangeLog (134345 => 134346)
--- trunk/Source/WebKit2/ChangeLog 2012-11-13 04:03:41 UTC (rev 134345)
+++ trunk/Source/WebKit2/ChangeLog 2012-11-13 04:05:09 UTC (rev 134346)
@@ -1,3 +1,39 @@
+2012-11-12 Timothy Hatcher <[email protected]>
+
+ Add a dock button to the top right corner of the Web Inspector window (similar to the full screen button).
+
+ https://bugs.webkit.org/show_bug.cgi?id=102023
+
+ Reviewed by Anders Carlsson.
+
+ * Resources/Dock.pdf: Added.
+ * UIProcess/WebInspectorProxy.cpp:
+ (WebKit::WebInspectorProxy::attach): Set the SetAttachedWindow message.
+ (WebKit::WebInspectorProxy::detach): Ditto.
+ (WebKit::WebInspectorProxy::attachAvailabilityChanged): Added. Call platformAttachAvailabilityChanged.
+ * UIProcess/WebInspectorProxy.h:
+ * UIProcess/WebInspectorProxy.messages.in: Added AttachAvailabilityChanged message.
+ * UIProcess/mac/WebInspectorProxyMac.mm:
+ (-[WKWebInspectorProxyObjCAdapter attach:]): Added. Call WebInspectorProxy::attach.
+ (-[WKWebInspectorWindow _cursorForResizeDirection:]): Added.
+ (WebKit::WebInspectorProxy::createInspectorWindow): Create the dock button and add it.
+ (WebKit::WebInspectorProxy::platformAttachAvailabilityChanged): Added. Update hidden state of the dock button.
+ * WebKit2.xcodeproj/project.pbxproj: Added Dock.pdf.
+ * WebProcess/WebPage/WebInspector.cpp:
+ (WebKit::WebInspector::setAttachedWindow): Added. Call through to the frontend client.
+ (WebKit::WebInspector::updateDockingAvailability): Send AttachAvailabilityChanged message.
+ * WebProcess/WebPage/WebInspector.h:
+ * WebProcess/WebPage/WebInspector.messages.in: Added SetAttachedWindow message.
+
+ * UIProcess/efl/WebInspectorProxyEfl.cpp:
+ (WebKit::WebInspectorProxy::platformAttachAvailabilityChanged): Added stub.
+ * UIProcess/gtk/WebInspectorProxyGtk.cpp:
+ (WebKit::WebInspectorProxy::platformAttachAvailabilityChanged): Ditto.
+ * UIProcess/qt/WebInspectorProxyQt.cpp:
+ (WebKit::WebInspectorProxy::platformAttachAvailabilityChanged): Ditto.
+ * UIProcess/win/WebInspectorProxyWin.cpp:
+ (WebKit::WebInspectorProxy::platformAttachAvailabilityChanged): Ditto.
+
2012-11-12 Anders Carlsson <[email protected]>
Include child layers in the remote layer tree transaction
Added: trunk/Source/WebKit2/Resources/Dock.pdf (0 => 134346)
--- trunk/Source/WebKit2/Resources/Dock.pdf (rev 0)
+++ trunk/Source/WebKit2/Resources/Dock.pdf 2012-11-13 04:05:09 UTC (rev 134346)
@@ -0,0 +1,88 @@
+%PDF-1.3
+%\xC4\xE5\xF2\xE5\xEB\xA7\xF3\xA0\xD0\xC4\xC6
+4 0 obj
+<< /Length 5 0 R /Filter /FlateDecode >>
+stream
+xU\x901n\xC40 {\xBD\x82u
+\x85\x94II\xAC\xEF\xF7A\\x8A\x83\xFFdI\xE4\xE4v\xC1\xB5w\xB8+=\xE9NO\xE2\xDA\xE9\x8B\xDEo\xA7\xD0:\x89\xF39\xB5\xCAlӜD\xE9\x9BD\xAA\xBBb\xC4\xFB 9\xAAp\xF3T\xF1-\xA4\xB8\x95\x98_\xC6ֽ\x8C"i\xFA\xE0β \x84m\x80\xE9
+-\x8C\x94˞\xA5 O\xB6\xC3\xC0\xEC\xB5\xEB\xEFW\xB3\x80\xD3 \xA5\xB6 \xF3\xA2Ohw;|\xD2\xC4\xD1ZU\xB5n\xD1hTS\xE7f92{k-j%\xC1c\xCC\xF2H\xA1z\xD8쁚\xF5\x8E\x80ke\xF8q&f\xC5\xFF\xB8+\xA9f\xB0CH\xD8\xD4؇a.\xD1"vɿq@\xB2\x87\xF5\xBCo\xE0HS\xB4{m
+\xE0\xFF\xCA\xC7\xDD ӵZ\xCB
+endstream
+endobj
+5 0 obj
+227
+endobj
+2 0 obj
+<< /Type /Page /Parent 3 0 R /Resources 6 0 R /Contents 4 0 R /MediaBox [0 0 14 14]
+>>
+endobj
+6 0 obj
+<< /ProcSet [ /PDF ] /ColorSpace << /Cs1 7 0 R >> >>
+endobj
+8 0 obj
+<< /Length 9 0 R /N 3 /Alternate /DeviceRGB /Filter /FlateDecode >>
+stream
+x\xAD\x96gTT\xD7\xC7Ͻ\xD3m`\xE80\xF4\xDE;H\xEFMz\x95a\xE8e\x84\xA1#*"\xC1DP U\xC1\xA8\xD4XQD
+X\xD0 \x94,\x80\x8Aʻk\x99\xAC\xB7^\xBE\xBD\xBD\xD6>\xE7w\xCE\xDE\xF7\xB4\xFD\xE1\xFE 91\xE3a> X)loGz`P0 7H\x80 @\xCC\xE4DkOO7\xF0\xAF\xB62 n\xF0\x81w\xADM\xFB\xDF\xFE\xF0\x88d& \x90' Of& |aMf";\xE1?\x96OOID\xC6#,\xC8F\x88\xB0\x97\xA36Y\x9B\xCBa\x9Bl\xB7\x91\xE3\xEBm\x8B\xE4\x80'3\xEC( \x88\xE1\xC8<=\x8D\x85\xACC\xCCCX\x9B \xC3B\x98\xBB\x973\x9A\x81ĉ VOH0\x89\x8E\xB0r\xD8?։\xFA3a\xDF\xD7d0\xA2\xBE\xF3\xE6]\x90/\x91\x8D\xEDb\x92\xE3\x99\x83\xFFg\x93\x9F\x8A\xBC׆q_\x9D \xC1\xF2\xF3Az\xC4%\x80-\xD8\xE2g:pCFv \xA4Dd w\xC0vWb&;&*:\x85n\x8DT)B\x9D\xEE\xCCbj\xAA\xD3u\xB5ut\xB7\xE6\xDC \xDE\xD36j \xD1\xEE\xFE=\x97\xD4 \x80IR \xEEsӹY 0\xE4 \xE8~ u\xE5\xEF9\xB9w\xC8q\x8E pu\x84\x99\xCAN\xDB\xCCCs; ^ D\x81\x90\xCA@\xE8C`\xAC\x80=p \xC0\x81 \x80 \xA2Ar\xF2t\x90
+\xF6\x83|P\x8E\x80\xE3\xA0T\x83\xB3\xA0\x9CA'\xB8n\x80\xDB\xE0 \xE3\xE0)\xE0\x80Y\xF0,\x81\xB0A\xA2@TH\x92\x86 5H2\x86, {\xC8
+P(
+bA\xA9P6t *\x84J\xA0
+\xA8j\x82~\x81\xBA\xA1\xD0 4
+=\x86\xA6\xA1\xE8 \xF4F\xC1dX\x96\x84a-\xD8\xB6\x86]a_x; '\xC1Yp |.\x87k\xE1sp|\xBE\x8F\xC3 \xF85\xBC\x8C(\x8A\x86\x92Ai\xA0\x8CQ\xB6(T0*\xC5F\xEDE\xA0\xCAP\xB5\xA8VTj \xF5 \xC5A-\xA2>\xA1\xB1h*\x9A\x8E\xD6@\x9B\xA1\x9D\xD0~h&: \xBD]\x84\xAE@7\xA2;\xD0\xFD\xE8\xE8i\xF4\xFA\x86\x82\x91\xC0\xA8aL1Θ@L& \x93\x8F)\xC3\xD4c\xDA1\xB70\xE3\x98Y\xCC
+\x8B\xA5a\x95\xB0FX'l6\xBB[\x84=\x85m\xC3\xF6bG\xB13\xD8e '\x8ASÙ\xE3<p \
+. www 7\x86\x9B\xC5}ē\xF0\xD2x]\xBC>\xCF\xC2\xE7\xE2\xCB\xF0\xCD\xF8k\xF81\xFC ~\x8D\xC0GP \x98<\xE1\x84LB1\xA1\x8E\xD0C\xB8O\x98%\xAC\xF9\x89JDs\xA2/1\x96\xB8\x9FXNl%\xDE"NߓH$Y\x92 ɋC\xCA!\x95\x93.\x90I\x9F\xC8dU\xB2-9\x84\x9CJ>Ln \xF7\x92 \x93\xDFS(E\x8A%\x98\x92B9Li\xA2ܤ<\xA7|\xE4\xA1\xF2h\xF28\xF3\x84\xF3\xEC\xE3\xA9\xE4\xE9\xE0\xE3y\xC3K\xE0U\xE0\xB5\xE6\xDD\xC1\x9B\xC5[\xC6{\x89\xF7>\xEF" \x81O\x91ϖ\x8F\xC1\xB7\x97\xAF\x92\xAF\x9Bo\x92o\x99\x9Fʯ\xC3\xEF\xC1\x9F\xC0_\xC4\xDF\xCC?\xC8?/\x80P\xB0\xC88+pS`\x86\x8A\xA2\xCAQm\xA9L\xEAj \xF5uV+\xA8$\xE8,+X(x^pXpIH@H_\xC8_(C\xA8R\xE8\xAA\x87\x86\xA2)Ҝi\xF1\xB4b\xDAE\xDA\x{DCF0}\xA4\xB0\xB5p\x84\xF0!\xE1V\xE11\xE1Uq+\x91\x91\x916\x91q\x91ϢtQ{\xD18ѣ\xA2\x9D\xA2\xCF\xC4\xD0b\xAAb^b\xE9b\xA7\xC5n\x89-\x8A \x8A\x9B\x893\xC5 \xC4/\x8A?\x91\x80%T%\xBC%vK\x9C\x95\x92X\x96\x94\x92t\x94L\x94<)ySrQ\x8A&e%+U*uMjA\x9A*m! #]*}]\xFA]\x88nM\x8F\xA7\x97\xD3\xFB\xE9K22N2\xA9252\xC32k\xB2J\xB2~\xB2\xB9\xB2m\xB2\xCF\xE4\x88r\xC6r\x91r\xA5r}rK\xF2\xD2\xF2\xEE\xF2\xD9\xF2-\xF2O
+\xC6
+\xD1
+'V\x95*v*\xCE+\x89(9+e)\xB5(M)S\x94-\x95\x93\x94k\x95 \xAA`U\x8CU\xE2TN\xA9\x8C\xA8ª\xAAѪ\x95\xAA\xF7\xD5`5C\xB5\xB5Sj\xA3\xEAuu\x96z\xAD\xFA\xA4Y\xC3Z#M\xA3EcZ\x93\xA6香\xAB٩\xF9FK^+X\xEB\xA8ր\xD67m\xEDx\xED:\xED\xA7::.:\xB9:=:\xEFtUu\x99\xBA\x95\xBA\xF5(zz\xFB\xF4\xBA\xF4\xDE\xEA\xAB\xE9G\xE8\x9F\xD6d@5p78h\xD0g\xF0\xD5\xD0Ȑm\xD8j\xB8`$ojTe4i,h\xECi\d|\xC7cbc\xB2\xCF\xE4\x8A\xC9'SC\xD3Ӌ\xA6\x99i\x98ř5\x9B\xCDoQ\xDA\xB1\xA5nˌ\xB9\xAC9üƜcA\xB7\xB58c\xC1\xB1\x94\xB1dX\xD6Z\xBE\xB0\x92\xB3
+\xB7\xAA\xB7\x9A\xB3V\xB1\x8E\xB5>g\xFD\xC6Fۆm\xD3n\xB3jkj\xBBǶ\xD7e\xE7hW`7l/`\xEFg_a\xFF\xDCA\xD6!ʡ\xC5a\xC9\xD1\xC0q\xB7c\xAF\xC6\xC9\xD5\xE9\xA8Ӥ\xB3\xA43ӹ\xC9y\xC9\xC5\xC8e\x8FK\xBF+\xD9\xD5ǵ\xC2\x{1456EA}ۭ\xC7 vwq?\xE6>\xB5Ua+kk\xA7\xF0p\xF68\xE6\xF1\xCCS\xC93\xC9\xF3W/\xAC\x97\xA7W\xA5\xD7Ko \xEFl\xEF \xAA\xCFN\x9Ff\x9F_\xDFbߧ~\xCA~\xA9~}\xFE\xBC\xFE!\xFEM\xFE\xABv%\x9C@\xAD\xC0=\x81\xF7\x82Ăb\x82\xBA\x82q\xC1\xFE\xC1\xF5\xC1\xCB\xDB\xEC\xB7 \xDF6b\x92 2\xB1]i{\xC6\xF6\xC1 b;\xE2w\\xDDɻ\x93\xB1\xF3R(&4 \xB49\xF4 ÃQ\xCBXs\xAB
+[b\xDA2O0_\x87[\x85\x97\x86/D\x98G\x94D\xCCE\x9AG\x96D\xCEG\x99G \x8BZ\x88\xB6\x8C.\x8B^\x8C\xB1\x8D\xA9\x88y\xEB[ \xBB\xE7\xD7\xB7 ߖ\x80OM\xE8f \xB0\xE2X\xFD\xBB\xA4ve\xECMTK\xCCO\xE4$\x99& OZb\xBB\xB2듡\xE4\xED\xC9])\x82\xC8\xCFu(U9\xF5\x87\xD4\xE94\x8B\xB4ʴ\x8F\xE9\xFE\xE9\x972\xF83XC\x99\xAA\x99\x872\xE7\xB2 \xB2~ލ\xDE\xCD\xDCݗ-\x93\xBD?{z\x8F\x{15E6BD}\xD0ް\xBD}\xFB\xE4\xF6\xE5\xED\x9B\xCDq\xCCi\xDCO\xDC \xB7\xFF\xB7\\xEDܒ\xDC\xF4\xE4I\xE6\xE5\xE4\xCD\xFC\xE0\xF8CK>O>;\xF2\xA0\xD9\xC1\xEA \xD1?\xC6\xFC8|H\xEF\xD0\xC9C\xDF
+\xC2 \xEEj\x96~)b\xDD\xFDI\xE7\xA7\xF2\x9F\xD6G .6,>}{\x84ud\xE2\xA8\xE5\xD1\xC6\xFE\x92\xAC\x92\x99c\xEE\xC7:J\xE9\xA5\xA5 \x8E\xEF<>X\xA6_V}\x82x"\xF5\xA7ܭ\xBC\xEB\xA4\xFC\xC9#'\xBFTDW\x8CW\xDAT\xB6UIT \xAAZ=~j\xEC\xB4\xD5\xE9\xD6j\xC9\xEA\xC2\xEA\xCFgb\xCE<\xAAq\xAC\xE9\xA8U\xAC-;\x8B=\x9Bv\xF6e\x9D\xDD\xC0\xCF\xC6?7Ջ\xD5\xD6m`5p\xBD\x{36CC69A}\x9A%\x9A\x8B[\xE0\x96Ԗ\x85s!\xE7F\xCE\xEFj\xD5h\xADi\xA3\xB5^ R/\xBC\xFA%\x{11724B}\xAE\xFB._j\xBD\xACp\xB9\xAA\x9D\xDA^\xD0udv,uFwr\xBA\x82\xBAF\xBB]\xBA\xFBz\xCCz\xDA\xD5\xFC\xB5\xE1\x8A̕ʫBW\x8B\xAF\xAF\xE5][\xBF\x9Eu}\xB97\xB1w\xF1Fԍ\x99\xBE\x9D}Oo\xDE|\xD8\xEF\xD5?|\xCB\xF5֝\xDB\xB7oX\\xBFc~\xE7ʠ\xE9`\xF7]㻝\xF7 \xEFu \xB5\xFFf\xF0[\xFB\xB0\xE1p\xC7}\xA3\xFB]#&#=\xA3[F\xAF\x8DY\x8E\xDDx`\xF7\xE0\xF6C\xE7\x87\xF7Ʒ\x8E\x8FN\xF8M<\x9A \x99\xE4<
+4\xFF8\xFE\xF1\xDB'iO֞\xE6La\xA6
+\x9E\xF1=+{.\xF1\xBC\xF6w\x95\xDF\xDB8\x86\x9C\xAB\xD3v\xD3C/|^<\x9Daμ\xFE#\xF9\x8F/\xB3y/)/\xCB\xE6\xA4\xE7\x9A\xE6u\xE7\xAF,8,\x8C\xBC\xDA\xF6j\xF6u\xE2\xEB\xB5\xC5\xFC?\xF9\xFF\xACz\xA3\xFC\xE6\xF2_V
+-.;e\xBF]W\xF4^\xF4}\xC3\xFD}˞\xCB\xCFWV\xD6V >\x8A~l\xFCd\xFCi\xE0s\xC0繵\xF4/\xB8/\xE5_U\xBE\xF6|s\xFD6\xB5\x9E\xB0\xBE\x9E\xC8`36\xB4
+i\xE1\xC8H \xDE5 @ B\xB4\xC3\xA2\xB9x65\xD9F\xB4\xA9#\xE6*\xAEs\xED\xBFxS\xB7mD h\xB0\xC0/ \xB7^ N#\xAE\x800\xE9\xB9r\xD2\xD7
+\xC0zz\xDF \x99\xE1Zr\xA4\x9E\xEE@d6"M>\xAE\xAF\xBF\x97 \xD7\xC0W\xF6\xFA\xFAک\xF5\xF5\xAFu \xA0 Л\xB4\xA9\xB9\xD9X> \xCE\xF0pip\xB8(\x87\xDB\xFF\xD3\xFE\xBB\xB8\xA2
+endstream
+endobj
+9 0 obj
+2561
+endobj
+7 0 obj
+[ /ICCBased 8 0 R ]
+endobj
+3 0 obj
+<< /Type /Pages /MediaBox [0 0 14 14] /Count 1 /Kids [ 2 0 R ] >>
+endobj
+10 0 obj
+<< /Type /Catalog /Pages 3 0 R >>
+endobj
+11 0 obj
+(Mac OS X 10.8.2 Quartz PDFContext)
+endobj
+12 0 obj
+(D:20121113023024Z00'00')
+endobj
+1 0 obj
+<< /Producer 11 0 R /CreationDate 12 0 R /ModDate 12 0 R >>
+endobj
+xref
+0 13
+0000000000 65535 f
+0000003454 00000 n
+0000000342 00000 n
+0000003229 00000 n
+0000000022 00000 n
+0000000323 00000 n
+0000000444 00000 n
+0000003194 00000 n
+0000000512 00000 n
+0000003174 00000 n
+0000003310 00000 n
+0000003360 00000 n
+0000003412 00000 n
+trailer
+<< /Size 13 /Root 10 0 R /Info 1 0 R /ID [ <72f7d5baa035dddcbdcfff169ed9325c>
+<72f7d5baa035dddcbdcfff169ed9325c> ] >>
+startxref
+3529
+%%EOF
Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp (134345 => 134346)
--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2012-11-13 04:03:41 UTC (rev 134345)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2012-11-13 04:05:09 UTC (rev 134346)
@@ -179,6 +179,8 @@
if (m_isVisible)
inspectorPageGroup()->preferences()->setInspectorStartsAttached(true);
+ m_page->process()->send(Messages::WebInspector::SetAttachedWindow(true), m_page->pageID());
+
platformAttach();
}
@@ -189,6 +191,8 @@
if (m_isVisible)
inspectorPageGroup()->preferences()->setInspectorStartsAttached(false);
+ m_page->process()->send(Messages::WebInspector::SetAttachedWindow(false), m_page->pageID());
+
platformDetach();
}
@@ -365,6 +369,11 @@
platformBringToFront();
}
+void WebInspectorProxy::attachAvailabilityChanged(bool available)
+{
+ platformAttachAvailabilityChanged(available);
+}
+
void WebInspectorProxy::inspectedURLChanged(const String& urlString)
{
platformInspectedURLChanged(urlString);
Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h (134345 => 134346)
--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h 2012-11-13 04:03:41 UTC (rev 134345)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h 2012-11-13 04:05:09 UTC (rev 134346)
@@ -39,6 +39,7 @@
#if PLATFORM(MAC)
#include <wtf/RetainPtr.h>
+OBJC_CLASS NSButton;
OBJC_CLASS NSWindow;
OBJC_CLASS WKWebInspectorProxyObjCAdapter;
OBJC_CLASS WKWebInspectorWKView;
@@ -153,6 +154,7 @@
void platformDidClose();
void platformBringToFront();
bool platformIsFront();
+ void platformAttachAvailabilityChanged(bool);
void platformInspectedURLChanged(const String&);
unsigned platformInspectedWindowHeight();
void platformAttach();
@@ -164,6 +166,7 @@
void didLoadInspectorPage();
void didClose();
void bringToFront();
+ void attachAvailabilityChanged(bool);
void inspectedURLChanged(const String&);
#if ENABLE(INSPECTOR_SERVER)
@@ -213,6 +216,7 @@
#if PLATFORM(MAC)
RetainPtr<WKWebInspectorWKView> m_inspectorView;
RetainPtr<NSWindow> m_inspectorWindow;
+ RetainPtr<NSButton> m_dockButton;
RetainPtr<WKWebInspectorProxyObjCAdapter> m_inspectorProxyObjCAdapter;
String m_urlString;
#elif PLATFORM(WIN)
Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.messages.in (134345 => 134346)
--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.messages.in 2012-11-13 04:03:41 UTC (rev 134345)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.messages.in 2012-11-13 04:05:09 UTC (rev 134346)
@@ -31,6 +31,7 @@
Attach()
Detach()
+ AttachAvailabilityChanged(bool available)
SetAttachedWindowHeight(unsigned height)
#if ENABLE(INSPECTOR_SERVER)
Modified: trunk/Source/WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp (134345 => 134346)
--- trunk/Source/WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp 2012-11-13 04:03:41 UTC (rev 134345)
+++ trunk/Source/WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp 2012-11-13 04:05:09 UTC (rev 134346)
@@ -188,6 +188,11 @@
notImplemented();
}
+void WebInspectorProxy::platformAttachAvailabilityChanged(bool)
+{
+ notImplemented();
+}
+
} // namespace WebKit
#endif // ENABLE(INSPECTOR)
Modified: trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp (134345 => 134346)
--- trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp 2012-11-13 04:03:41 UTC (rev 134345)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp 2012-11-13 04:05:09 UTC (rev 134346)
@@ -34,6 +34,7 @@
#include "WebProcessProxy.h"
#include <WebCore/FileSystem.h>
#include <WebCore/GtkUtilities.h>
+#include <WebCore/NotImplemented.h>
#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
#include <wtf/gobject/GOwnPtr.h>
@@ -221,6 +222,11 @@
webkitWebViewBaseSetInspectorViewHeight(WEBKIT_WEB_VIEW_BASE(m_page->viewWidget()), height);
}
+void WebInspectorProxy::platformAttachAvailabilityChanged(bool)
+{
+ notImplemented();
+}
+
} // namespace WebKit
#endif // ENABLE(INSPECTOR)
Modified: trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm (134345 => 134346)
--- trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2012-11-13 04:03:41 UTC (rev 134345)
+++ trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2012-11-13 04:05:09 UTC (rev 134346)
@@ -50,6 +50,9 @@
// The height needed to match a typical NSToolbar.
static const CGFloat windowContentBorderThickness = 55;
+// The margin from the top and right of the dock button (same as the full screen button).
+static const CGFloat dockButtonMargin = 3;
+
// WKWebInspectorProxyObjCAdapter is a helper ObjC object used as a delegate or notification observer
// for the sole purpose of getting back into the C++ code from an ObjC caller.
@@ -79,6 +82,11 @@
return self;
}
+- (IBAction)attach:(id)sender
+{
+ static_cast<WebInspectorProxy*>(_inspectorProxy)->attach();
+}
+
- (void)close
{
_inspectorProxy = 0;
@@ -117,6 +125,29 @@
@end
+@interface NSWindow (AppKitDetails)
+- (NSCursor *)_cursorForResizeDirection:(NSInteger)direction;
+@end
+
+@interface WKWebInspectorWindow : NSWindow {
+@public
+ RetainPtr<NSButton> _dockButton;
+}
+@end
+
+@implementation WKWebInspectorWindow
+
+- (NSCursor *)_cursorForResizeDirection:(NSInteger)direction
+{
+ // Don't show a resize cursor for the northeast (top right) direction if the dock button is visible.
+ // This matches what happens when the full screen button is visible.
+ if (direction == 1 && ![_dockButton isHidden])
+ return nil;
+ return [super _cursorForResizeDirection:direction];
+}
+
+@end
+
namespace WebKit {
static bool inspectorReallyUsesWebKitUserInterface(WebPreferences* preferences)
@@ -140,7 +171,7 @@
ASSERT(!m_inspectorWindow);
NSUInteger styleMask = (NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask | NSTexturedBackgroundWindowMask);
- NSWindow *window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, initialWindowWidth, initialWindowHeight) styleMask:styleMask backing:NSBackingStoreBuffered defer:NO];
+ WKWebInspectorWindow *window = [[WKWebInspectorWindow alloc] initWithContentRect:NSMakeRect(0, 0, initialWindowWidth, initialWindowHeight) styleMask:styleMask backing:NSBackingStoreBuffered defer:NO];
[window setDelegate:m_inspectorProxyObjCAdapter.get()];
[window setMinSize:NSMakeSize(minimumWindowWidth, minimumWindowHeight)];
[window setReleasedWhenClosed:NO];
@@ -149,6 +180,45 @@
WKNSWindowMakeBottomCornersSquare(window);
NSView *contentView = [window contentView];
+
+ // Create a full screen button so we can turn it into a dock button.
+ m_dockButton = [NSWindow standardWindowButton:NSWindowFullScreenButton forStyleMask:styleMask];
+ m_dockButton.get().target = m_inspectorProxyObjCAdapter.get();
+ m_dockButton.get().action = ""
+
+ // Store the dock button on the window too so it can check its visibility.
+ window->_dockButton = m_dockButton;
+
+ // Get the dock image and make it a template so the button cell effects will apply.
+ NSImage *dockImage = [[NSBundle bundleForClass:[WKWebInspectorWKView class]] imageForResource:@"Dock"];
+ [dockImage setTemplate:YES];
+
+ // Set the dock image on the button cell.
+ NSCell *dockButtonCell = m_dockButton.get().cell;
+ dockButtonCell.image = dockImage;
+
+ // Get the frame view, the superview of the content view, and its frame.
+ // This will be the superview of the dock button too.
+ NSView *frameView = contentView.superview;
+ NSRect frameViewBounds = frameView.bounds;
+ NSSize dockButtonSize = m_dockButton.get().frame.size;
+
+ ASSERT(!frameView.flipped);
+
+ // Position the dock button in the corner to match where the full screen button is normally.
+ NSPoint dockButtonOrigin;
+ dockButtonOrigin.x = NSMaxX(frameViewBounds) - dockButtonSize.width - dockButtonMargin;
+ dockButtonOrigin.y = NSMaxY(frameViewBounds) - dockButtonSize.height - dockButtonMargin;
+ m_dockButton.get().frameOrigin = dockButtonOrigin;
+
+ // Set the autoresizing mask to keep the dock button pinned to the top right corner.
+ m_dockButton.get().autoresizingMask = NSViewMinXMargin | NSViewMinYMargin;
+
+ [frameView addSubview:m_dockButton.get()];
+
+ // Hide the dock button if we can't attach.
+ m_dockButton.get().hidden = !canAttach();
+
[m_inspectorView.get() setFrame:[contentView bounds]];
[m_inspectorView.get() setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
[contentView addSubview:m_inspectorView.get()];
@@ -231,6 +301,11 @@
return m_isVisible && [m_inspectorView.get().window isMainWindow];
}
+void WebInspectorProxy::platformAttachAvailabilityChanged(bool available)
+{
+ m_dockButton.get().hidden = !available;
+}
+
void WebInspectorProxy::platformInspectedURLChanged(const String& urlString)
{
m_urlString = urlString;
Modified: trunk/Source/WebKit2/UIProcess/qt/WebInspectorProxyQt.cpp (134345 => 134346)
--- trunk/Source/WebKit2/UIProcess/qt/WebInspectorProxyQt.cpp 2012-11-13 04:03:41 UTC (rev 134345)
+++ trunk/Source/WebKit2/UIProcess/qt/WebInspectorProxyQt.cpp 2012-11-13 04:05:09 UTC (rev 134346)
@@ -81,6 +81,11 @@
notImplemented();
}
+void WebInspectorProxy::platformAttachAvailabilityChanged(bool)
+{
+ notImplemented();
+}
+
void WebInspectorProxy::platformSetAttachedWindowHeight(unsigned)
{
notImplemented();
Modified: trunk/Source/WebKit2/UIProcess/win/WebInspectorProxyWin.cpp (134345 => 134346)
--- trunk/Source/WebKit2/UIProcess/win/WebInspectorProxyWin.cpp 2012-11-13 04:03:41 UTC (rev 134345)
+++ trunk/Source/WebKit2/UIProcess/win/WebInspectorProxyWin.cpp 2012-11-13 04:05:09 UTC (rev 134346)
@@ -247,6 +247,11 @@
return false;
}
+void WebInspectorProxy::platformAttachAvailabilityChanged(bool)
+{
+ notImplemented();
+}
+
void WebInspectorProxy::platformInspectedURLChanged(const String& urlString)
{
// FIXME: this should be made localizable once WebKit2 supports it. <rdar://problem/8728860>
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (134345 => 134346)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2012-11-13 04:03:41 UTC (rev 134345)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2012-11-13 04:05:09 UTC (rev 134346)
@@ -274,6 +274,7 @@
1CA8B945127C882A00576C2B /* WebInspectorProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1CA8B943127C882A00576C2B /* WebInspectorProxyMessageReceiver.cpp */; };
1CA8B946127C882A00576C2B /* WebInspectorProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CA8B944127C882A00576C2B /* WebInspectorProxyMessages.h */; };
1CA8B954127C891500576C2B /* WebInspectorMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1C8E2DAD1278C5B200BC7BD0 /* WebInspectorMac.mm */; };
+ 1CBC945E16515ED200D68AAE /* Dock.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 1CBC945D16515ED200D68AAE /* Dock.pdf */; };
293EBEAB1627D9C9005F89F1 /* WKDOMText.h in Headers */ = {isa = PBXBuildFile; fileRef = 293EBEA91627D9C9005F89F1 /* WKDOMText.h */; settings = {ATTRIBUTES = (Public, ); }; };
293EBEAC1627D9C9005F89F1 /* WKDOMText.mm in Sources */ = {isa = PBXBuildFile; fileRef = 293EBEAA1627D9C9005F89F1 /* WKDOMText.mm */; };
29501724162A4504004A9D71 /* WKWebProcessPlugInBrowserContextControllerPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 29501723162A4504004A9D71 /* WKWebProcessPlugInBrowserContextControllerPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -1470,6 +1471,7 @@
1CA8B935127C774E00576C2B /* WebInspectorProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebInspectorProxyMac.mm; sourceTree = "<group>"; };
1CA8B943127C882A00576C2B /* WebInspectorProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebInspectorProxyMessageReceiver.cpp; sourceTree = "<group>"; };
1CA8B944127C882A00576C2B /* WebInspectorProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebInspectorProxyMessages.h; sourceTree = "<group>"; };
+ 1CBC945D16515ED200D68AAE /* Dock.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = Dock.pdf; path = Resources/Dock.pdf; sourceTree = "<group>"; };
293EBEA91627D9C9005F89F1 /* WKDOMText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDOMText.h; sourceTree = "<group>"; };
293EBEAA1627D9C9005F89F1 /* WKDOMText.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKDOMText.mm; sourceTree = "<group>"; };
29501723162A4504004A9D71 /* WKWebProcessPlugInBrowserContextControllerPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInBrowserContextControllerPrivate.h; sourceTree = "<group>"; };
@@ -2453,6 +2455,7 @@
089C1665FE841158C02AAC07 /* Resources */ = {
isa = PBXGroup;
children = (
+ 1CBC945D16515ED200D68AAE /* Dock.pdf */,
510CC84A1613C8AB00D03ED3 /* NetworkProcess */,
BC122FA51327085D00F7EAC1 /* PluginProcess */,
E1EDFD9716287AEC0039ECDA /* SharedWorkerProcess */,
@@ -5135,6 +5138,7 @@
8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */,
BC9FA522160D4A0C0054DF9A /* com.apple.WebKit.PluginProcess.sb in Resources */,
BC9FA523160D4A0F0054DF9A /* com.apple.WebProcess.sb in Resources */,
+ 1CBC945E16515ED200D68AAE /* Dock.pdf in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp (134345 => 134346)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp 2012-11-13 04:03:41 UTC (rev 134345)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp 2012-11-13 04:05:09 UTC (rev 134346)
@@ -143,6 +143,12 @@
m_page->corePage()->inspectorController()->close();
}
+void WebInspector::setAttachedWindow(bool attached)
+{
+ if (m_frontendClient)
+ m_frontendClient->setAttachedWindow(attached);
+}
+
void WebInspector::evaluateScriptForTest(long callID, const String& script)
{
m_page->corePage()->inspectorController()->evaluateForTestInFrontend(callID, script);
@@ -236,8 +242,12 @@
void WebInspector::updateDockingAvailability()
{
- if (m_frontendClient)
- m_frontendClient->setDockingUnavailable(!m_frontendClient->canAttachWindow());
+ if (!m_frontendClient)
+ return;
+
+ bool canAttachWindow = m_frontendClient->canAttachWindow();
+ WebProcess::shared().connection()->send(Messages::WebInspectorProxy::AttachAvailabilityChanged(canAttachWindow), m_page->pageID());
+ m_frontendClient->setDockingUnavailable(!canAttachWindow);
}
#if ENABLE(INSPECTOR_SERVER)
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.h (134345 => 134346)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.h 2012-11-13 04:03:41 UTC (rev 134345)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.h 2012-11-13 04:05:09 UTC (rev 134346)
@@ -59,6 +59,8 @@
void show();
void close();
+ void setAttachedWindow(bool);
+
void evaluateScriptForTest(long callID, const String& script);
void setJavaScriptProfilingEnabled(bool);
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.messages.in (134345 => 134346)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.messages.in 2012-11-13 04:03:41 UTC (rev 134345)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.messages.in 2012-11-13 04:05:09 UTC (rev 134346)
@@ -25,6 +25,7 @@
messages -> WebInspector {
Show()
Close()
+ SetAttachedWindow(bool attached)
ShowConsole()
ShowResources()
ShowMainResourceForFrame(uint64_t frameID)
