mac: Clean up a few more uses of USE_SKIA

mac: Clean up a few more uses of USE_SKIA

Likely also fixes a top-down-flipped bug with the in-process command buffer.

BUG=110881
TBR=tony

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=190469

[Nico, 2013-03-23 17:34:28]

thestig: printing/
kbr: everything else

https://codereview.chromium.org/12896006/diff/1/webkit/gpu/webgraphicscontext...
File webkit/gpu/webgraphicscontext3d_in_process_impl.h (left):

https://codereview.chromium.org/12896006/diff/1/webkit/gpu/webgraphicscontext...
webkit/gpu/webgraphicscontext3d_in_process_impl.h:20: #if !defined(OS_MACOSX)
This was very likely wrong and just wasn't updated since we switched to skia.

Is the in-process graphics context used for anything?

[Lei Zhang, 2013-03-24 22:07:39]

printing lgtm

[Ken Russell (switch to Gerrit), 2013-03-25 18:09:38]

lgtm

https://codereview.chromium.org/12896006/diff/1/webkit/gpu/webgraphicscontext...
File webkit/gpu/webgraphicscontext3d_in_process_impl.h (left):

https://codereview.chromium.org/12896006/diff/1/webkit/gpu/webgraphicscontext...
webkit/gpu/webgraphicscontext3d_in_process_impl.h:20: #if !defined(OS_MACOSX)
On 2013/03/23 17:34:28, Nico wrote:
> This was very likely wrong and just wasn't updated since we switched to skia.
> 
> Is the in-process graphics context used for anything?

No, it's unused. I thought danakj just deleted it, and that jam removed the
command-line flags. The test harnesses are using the in-process command buffer
impl at this point.

[danakj, 2013-03-25 18:25:02]

https://codereview.chromium.org/12896006/diff/1/webkit/gpu/webgraphicscontext...
File webkit/gpu/webgraphicscontext3d_in_process_impl.h (left):

https://codereview.chromium.org/12896006/diff/1/webkit/gpu/webgraphicscontext...
webkit/gpu/webgraphicscontext3d_in_process_impl.h:20: #if !defined(OS_MACOSX)
On 2013/03/25 18:09:38, kbr wrote:
> On 2013/03/23 17:34:28, Nico wrote:
> > This was very likely wrong and just wasn't updated since we switched to
skia.
> > 
> > Is the in-process graphics context used for anything?
> 
> No, it's unused. I thought danakj just deleted it, and that jam removed the
> command-line flags. The test harnesses are using the in-process command buffer
> impl at this point.

I removed support for it from the offscreen context providers, but didn't delete
the class. Guess I should then.

[commit-bot: I haz the power, 2013-03-25 19:05:44]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/thakis@chromium.org/12896006/1

[commit-bot: I haz the power, 2013-03-25 19:05:47]

Failed to apply patch for webkit/plugins/npapi/webplugin_delegate_impl_mac.mm:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file webkit/plugins/npapi/webplugin_delegate_impl_mac.mm
  Hunk #1 FAILED at 17.
  Hunk #2 FAILED at 25.
  Hunk #3 FAILED at 280.
  3 out of 3 hunks FAILED -- saving rejects to file
webkit/plugins/npapi/webplugin_delegate_impl_mac.mm.rej

Patch:       webkit/plugins/npapi/webplugin_delegate_impl_mac.mm
Index: webkit/plugins/npapi/webplugin_delegate_impl_mac.mm
diff --git a/webkit/plugins/npapi/webplugin_delegate_impl_mac.mm
b/webkit/plugins/npapi/webplugin_delegate_impl_mac.mm
index
a69edf4586a2045a9d2b8213f97ca02096def758..e8594f8f5726c9a8f2fa7afe0c20b0f1f57f74f6
100644
--- a/webkit/plugins/npapi/webplugin_delegate_impl_mac.mm
+++ b/webkit/plugins/npapi/webplugin_delegate_impl_mac.mm
@@ -17,6 +17,7 @@
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
+#include "skia/ext/skia_utils_mac.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 #include "webkit/plugins/npapi/plugin_instance.h"
@@ -25,10 +26,6 @@
 #include "webkit/plugins/npapi/webplugin.h"
 #include "webkit/plugins/npapi/webplugin_accelerated_surface_mac.h"
 
-#if defined(USE_SKIA)
-#include "skia/ext/skia_utils_mac.h"
-#endif
-
 using WebKit::WebCursorInfo;
 using WebKit::WebKeyboardEvent;
 using WebKit::WebInputEvent;
@@ -280,12 +277,8 @@ void WebPluginDelegateImpl::UpdateGeometryAndContext(
 
 void WebPluginDelegateImpl::Paint(WebKit::WebCanvas* canvas,
                                   const gfx::Rect& rect) {
-#if defined(USE_SKIA)
   gfx::SkiaBitLocker bit_locker(canvas);
   CGContextRef context = bit_locker.cgContext();
-#else
-  CGContextRef context = canvas;
-#endif
   CGPaint(context, rect);
 }

[commit-bot: I haz the power, 2013-03-25 19:16:10]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/thakis@chromium.org/12896006/8001

[commit-bot: I haz the power, 2013-03-25 19:16:14]

Presubmit check for 12896006-8001 failed and returned exit status 1.

INFO:root:Found 9 file(s).

Running presubmit commit checks ...
Running /b/commit-queue/workdir/chromium/PRESUBMIT.py

** Presubmit ERRORS **
Missing LGTM from an OWNER for these files:
    webkit/glue/webkit_glue.cc

[Nico, 2013-03-25 19:19:56]

tony: webkit/OWNERS tbr

[commit-bot: I haz the power, 2013-03-25 19:21:27]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/thakis@chromium.org/12896006/8001

[tony, 2013-03-25 19:24:13]

LGTM

[commit-bot: I haz the power, 2013-03-25 20:11:27]

Sorry for I got bad news for ya.
Compile failed with a clobber build on mac_rel.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_rel&nu...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-03-25 20:11:50]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/thakis@chromium.org/12896006/4003

[Nico, 2013-03-25 20:26:55]

Committed patchset #3 manually as r190469 (presubmit successful).

[Nico, 2013-03-28 17:41:23]

On Mon, Mar 25, 2013 at 11:25 AM, <danakj@chromium.org> wrote:

>
> https://codereview.chromium.**org/12896006/diff/1/webkit/**
>
gpu/webgraphicscontext3d_in_**process_impl.h<https://codereview.chromium.org/12896006/diff/1/webkit/gpu/webgraphicscontext3d_in_process_impl.h>
> File webkit/gpu/**webgraphicscontext3d_in_**process_impl.h (left):
>
> https://codereview.chromium.**org/12896006/diff/1/webkit/**
>
gpu/webgraphicscontext3d_in_**process_impl.h#oldcode20<https://codereview.chromium.org/12896006/diff/1/webkit/gpu/webgraphicscontext3d_in_process_impl.h#oldcode20>
> webkit/gpu/**webgraphicscontext3d_in_**process_impl.h:20: #if
> !defined(OS_MACOSX)
> On 2013/03/25 18:09:38, kbr wrote:
>
>> On 2013/03/23 17:34:28, Nico wrote:
>> > This was very likely wrong and just wasn't updated since we switched
>>
> to skia.
>
>> >
>> > Is the in-process graphics context used for anything?
>>
>
>  No, it's unused. I thought danakj just deleted it, and that jam
>>
> removed the
>
>> command-line flags. The test harnesses are using the in-process
>>
> command buffer
>
>> impl at this point.
>>
>
> I removed support for it from the offscreen context providers, but
> didn't delete the class. Guess I should then.
>

(filed https://code.google.com/p/chromium/issues/detail?id=224665 for this)


>
>
https://codereview.chromium.**org/12896006/<https://codereview.chromium.org/1...
>